git-svn-id: svn://db.shs.com.ru/pip@447 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -119,18 +119,18 @@ bool PISharedMemory::openDevice() {
|
|||||||
PRIVATE->name = ("/pip_shm_" + path()).toByteArray();
|
PRIVATE->name = ("/pip_shm_" + path()).toByteArray();
|
||||||
PRIVATE->name.push_back(0);
|
PRIVATE->name.push_back(0);
|
||||||
int fd = shm_open((const char *)PRIVATE->name.data(), m, 0777);
|
int fd = shm_open((const char *)PRIVATE->name.data(), m, 0777);
|
||||||
//piCout << "try open" << PICoutManipulators::Hex << fd;
|
piCoutObj << "try open" << PICoutManipulators::Hex << fd;
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
//piCoutObj << "shm_open error," << errorString();
|
piCoutObj << "shm_open error," << errorString();
|
||||||
fd = shm_open((const char *)PRIVATE->name.data(), m | O_CREAT, 0777);
|
fd = shm_open((const char *)PRIVATE->name.data(), m | O_CREAT, 0777);
|
||||||
//piCout << "try create" << PICoutManipulators::Hex << (m | O_CREAT) << fd;
|
piCoutObj << "try create" << PICoutManipulators::Hex << (m | O_CREAT) << fd;
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
piCoutObj << "shm_open error," << errorString();
|
piCoutObj << "shm_open error," << errorString();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
PRIVATE->owner = true;
|
PRIVATE->owner = true;
|
||||||
ftruncate(fd, dsize);
|
ftruncate(fd, dsize);
|
||||||
//piCout << "created" << fd;
|
piCoutObj << "created" << fd;
|
||||||
}
|
}
|
||||||
m = PROT_WRITE;
|
m = PROT_WRITE;
|
||||||
if (!isWriteable()) m = PROT_READ;
|
if (!isWriteable()) m = PROT_READ;
|
||||||
@@ -140,7 +140,7 @@ bool PISharedMemory::openDevice() {
|
|||||||
piCoutObj << "mmap error," << errorString();
|
piCoutObj << "mmap error," << errorString();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//piCout << "opened" << PRIVATE->data;
|
piCoutObj << "opened" << PRIVATE->data;
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ bool PISharedMemory::closeDevice() {
|
|||||||
if (PRIVATE->map) CloseHandle(PRIVATE->map);
|
if (PRIVATE->map) CloseHandle(PRIVATE->map);
|
||||||
#endif
|
#endif
|
||||||
#ifdef LINUX
|
#ifdef LINUX
|
||||||
//piCout << "close" << PIString(PRIVATE->name) << PRIVATE->data;
|
piCoutObj << "close" << PIString(PRIVATE->name) << PRIVATE->data;
|
||||||
if (PRIVATE->data) munmap(PRIVATE->data, dsize);
|
if (PRIVATE->data) munmap(PRIVATE->data, dsize);
|
||||||
if (PRIVATE->owner) {
|
if (PRIVATE->owner) {
|
||||||
//if (!PRIVATE->name.isEmpty()) {
|
//if (!PRIVATE->name.isEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user