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

Improved sharedPage initalization error reporting, added \todo note about sharedPage assignment operator.

Browse source
This commit is contained in:
Thulinma 2014-07-29 14:41:15 +02:00
parent 9b798275ea
commit 48bc30045e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/shared_memory.cpp
View file

@ -238,6 +238,7 @@ namespace IPC {
///\brief Assignment operator ///\brief Assignment operator
void sharedPage::operator =(sharedPage & rhs) { void sharedPage::operator =(sharedPage & rhs) {
init(rhs.name, rhs.len, rhs.master); init(rhs.name, rhs.len, rhs.master);
/// \todo This is bad. The assignment operator changes the rhs value? What the hell?
rhs.master = false;//Make sure the memory does not get unlinked rhs.master = false;//Make sure the memory does not get unlinked
} }
@ -268,11 +269,12 @@ namespace IPC {
} while (i < 10 && !handle && autoBackoff); } while (i < 10 && !handle && autoBackoff);
} }
if (!handle) { if (!handle) {
DEBUG_MSG(DLVL_FAIL, "%s for page %s failed: %s", (master ? "CreateFileMapping" : "OpenFileMapping"), name.c_str(), strerror(errno)); FAIL_MSG("%s for page %s failed: %s", (master ? "CreateFileMapping" : "OpenFileMapping"), name.c_str(), strerror(errno));
return; return;
} }
mapped = (char *)MapViewOfFile(handle, FILE_MAP_ALL_ACCESS, 0, 0, 0); mapped = (char *)MapViewOfFile(handle, FILE_MAP_ALL_ACCESS, 0, 0, 0);
if (!mapped) { if (!mapped) {
FAIL_MSG("MapViewOfFile for page %s failed: %s", name.c_str(), strerror(errno));
return; return;
} }
#else #else
@ -291,16 +293,16 @@ namespace IPC {
} }
} }
if (handle == -1) { if (handle == -1) {
DEBUG_MSG(DLVL_FAIL, "shm_open for page %s failed: %s", name.c_str(), strerror(errno)); FAIL_MSG("shm_open for page %s failed: %s", name.c_str(), strerror(errno));
return; return;
} }
if (master) { if (master) {
if (ftruncate(handle, 0) < 0) { if (ftruncate(handle, 0) < 0) {
DEBUG_MSG(DLVL_FAIL, "truncate to zero for page %s failed: %s", name.c_str(), strerror(errno)); FAIL_MSG("truncate to zero for page %s failed: %s", name.c_str(), strerror(errno));
return; return;
} }
if (ftruncate(handle, len) < 0) { if (ftruncate(handle, len) < 0) {
DEBUG_MSG(DLVL_FAIL, "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;
} }
} else { } else {
@ -313,6 +315,7 @@ namespace IPC {
} }
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) {
FAIL_MSG("mmap for page %s failed: %s", name.c_str(), strerror(errno));
mapped = 0; mapped = 0;
return; return;
} }