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

Added support for varying sizes of shared memory in Windows, by prepending them with their length.

Browse source
This commit is contained in:
Thulinma 2015-01-27 13:17:11 +01:00
parent 99692008a7
commit f31552e37a
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/shared_memory.cpp
View file

@ -227,7 +227,8 @@ namespace IPC {
void sharedPage::unmap() { void sharedPage::unmap() {
if (mapped && len) { if (mapped && len) {
#ifdef __CYGWIN__ #ifdef __CYGWIN__
UnmapViewOfFile(mapped); //under Cygwin, the mapped location is shifted by 4 to contain the page size.
UnmapViewOfFile(mapped-4);
#else #else
munmap(mapped, len); munmap(mapped, len);
#endif #endif
@ -279,7 +280,8 @@ namespace IPC {
if (name.size()) { if (name.size()) {
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if (master) { if (master) {
handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len, name.c_str()); //Under cygwin, all pages are 4 bytes longer than claimed.
handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len+4, name.c_str());
} else { } else {
int i = 0; int i = 0;
do { do {
@ -299,6 +301,14 @@ namespace IPC {
FAIL_MSG("MapViewOfFile for page %s failed: %s", name.c_str(), strerror(errno)); FAIL_MSG("MapViewOfFile for page %s failed: %s", name.c_str(), strerror(errno));
return; return;
} }
//Under cygwin, the extra 4 bytes contain the real size of the page.
if (master){
((unsigned int*)mapped)[0] = len_;
}else{
len = ((unsigned int*)mapped)[0];
}
//Now shift by those 4 bytes.
mapped += 4;
#else #else
handle = shm_open(name.c_str(), (master ? O_CREAT | O_EXCL : 0) | O_RDWR, ACCESSPERMS); handle = shm_open(name.c_str(), (master ? O_CREAT | O_EXCL : 0) | O_RDWR, ACCESSPERMS);
if (handle == -1) { if (handle == -1) {