hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed ERROR message when force-saving connector list to shared memory.

Browse source
This commit is contained in:
Thulinma 2019-05-22 15:16:38 +02:00
parent 8d17d5f6c4
commit 42da518d5f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/controller/controller_connectors.cpp
View file

@ -23,12 +23,18 @@ namespace Controller {
static std::map<std::string, pid_t> currentConnectors; ///<The currently running connectors. static std::map<std::string, pid_t> currentConnectors; ///<The currently running connectors.
/// Updates the shared memory page with active connectors /// Updates the shared memory page with active connectors
void saveActiveConnectors(){ void saveActiveConnectors(bool forceOverride){
IPC::sharedPage f("MstCnns", 4096, true, false); IPC::sharedPage f("MstCnns", 4096, forceOverride, false);
if (!f.mapped){
if (!forceOverride){
saveActiveConnectors(true);
return;
}
if (!f.mapped){ if (!f.mapped){
FAIL_MSG("Could not store connector data!"); FAIL_MSG("Could not store connector data!");
return; return;
} }
}
memset(f.mapped, 0, 32); memset(f.mapped, 0, 32);
Util::RelAccX A(f.mapped, false); Util::RelAccX A(f.mapped, false);
A.addField("cmd", RAX_128STRING); A.addField("cmd", RAX_128STRING);

2
src/controller/controller_connectors.h
View file

@ -9,7 +9,7 @@ namespace Controller {
bool CheckProtocols(JSON::Value & p, const JSON::Value & capabilities); bool CheckProtocols(JSON::Value & p, const JSON::Value & capabilities);
/// Updates the shared memory page with active connectors /// Updates the shared memory page with active connectors
void saveActiveConnectors(); void saveActiveConnectors(bool forceOverride = false);
/// Reads active connectors from the shared memory pages /// Reads active connectors from the shared memory pages
void loadActiveConnectors(); void loadActiveConnectors();