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

Fixed shared memory master-mode re-opens causing SIGBUS errors in other parts

Browse source
This commit is contained in:
Thulinma 2017-12-10 18:21:43 +01:00
parent 90ce2e0b4c
commit c69adc26b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/shared_memory.cpp
View file

@ -459,10 +459,6 @@ namespace IPC {
return; return;
} }
if (master) { if (master) {
if (ftruncate(handle, 0) < 0) {
FAIL_MSG("truncate to zero for page %s failed: %s", name.c_str(), strerror(errno));
return;
}
if (ftruncate(handle, len) < 0) { if (ftruncate(handle, len) < 0) {
FAIL_MSG("truncate to %lld for page %s failed: %s", len, name.c_str(), strerror(errno)); FAIL_MSG("truncate to %lld for page %s failed: %s", len, name.c_str(), strerror(errno));
return; return;
@ -474,6 +470,10 @@ namespace IPC {
return; return;
} }
len = buffStats.st_size; len = buffStats.st_size;
if (!len){
mapped = 0;
return;
}
} }
mapped = (char *)mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, handle, 0); mapped = (char *)mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, handle, 0);
if (mapped == MAP_FAILED) { if (mapped == MAP_FAILED) {