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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/controller/controller.cpp
#	src/controller/controller_statistics.cpp
This commit is contained in:
Thulinma 2019-05-23 13:31:41 +02:00
commit fd927c5e39
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/controller/controller_connectors.cpp
View file

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

2
src/controller/controller_connectors.h
View file

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