detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 05:47:14 +02:00
Code Issues Actions Packages Releases Activity

only construct shared memory from a type with exact size

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-13 17:43:48 +01:00
parent 9a08c85b2a
commit d21ceb0e75
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/sharedMemory/SharedMemory.h
View File

@ -121,25 +121,21 @@ class SharedMemory {
* throws a SharedMemoryException exception on failure to create, ftruncate or map * throws a SharedMemoryException exception on failure to create, ftruncate or map
* @param sz of shared memory * @param sz of shared memory
*/ */
void CreateSharedMemory(size_t sz = 0) { void CreateSharedMemory() {
if (sz == 0) {
sz = sizeof(T);
}
fd = shm_open(name.c_str(), O_CREAT | O_TRUNC | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR); fd = shm_open(name.c_str(), O_CREAT | O_TRUNC | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
if (fd < 0) { if (fd < 0) {
FILE_LOG(logERROR) << "Create shared memory " << name << " failed: " << strerror(errno); FILE_LOG(logERROR) << "Create shared memory " << name << " failed: " << strerror(errno);
throw SharedMemoryException(); throw SharedMemoryException();
} }
if (ftruncate(fd, sz) < 0) { if (ftruncate(fd, sizeof(T)) < 0) {
FILE_LOG(logERROR) << "Create shared memory " << name << " failed at ftruncate: " << strerror(errno); FILE_LOG(logERROR) << "Create shared memory " << name << " failed at ftruncate: " << strerror(errno);
close(fd); close(fd);
RemoveSharedMemory(); RemoveSharedMemory();
throw SharedMemoryException(); throw SharedMemoryException();
} }
shared_struct = MapSharedMemory(sz); shared_struct = MapSharedMemory();
FILE_LOG(logINFO) << "Shared memory created " << name; FILE_LOG(logINFO) << "Shared memory created " << name;
} }
@ -148,18 +144,14 @@ class SharedMemory {
* throws a SharedMemoryException exception on failure to open or map * throws a SharedMemoryException exception on failure to open or map
* @param sz of shared memory * @param sz of shared memory
*/ */
void OpenSharedMemory(size_t sz = 0) { void OpenSharedMemory() {
if (sz == 0) {
sz = sizeof(T);
}
fd = shm_open(name.c_str(), O_RDWR, 0); fd = shm_open(name.c_str(), O_RDWR, 0);
if (fd < 0) { if (fd < 0) {
FILE_LOG(logERROR) << "Open existing shared memory " << name << " failed: " << strerror(errno); FILE_LOG(logERROR) << "Open existing shared memory " << name << " failed: " << strerror(errno);
throw SharedMemoryException(); throw SharedMemoryException();
} }
shared_struct = MapSharedMemory(sz); shared_struct = MapSharedMemory();
} }
/** /**
@ -251,14 +243,14 @@ class SharedMemory {
* @param sz of shared memory * @param sz of shared memory
*/ */
T *MapSharedMemory(size_t sz) { T *MapSharedMemory() {
void *addr = mmap(nullptr, sz, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); void *addr = mmap(nullptr, sizeof(T), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
FILE_LOG(logERROR) << "Mapping shared memory " << name << " failed: " << strerror(errno); FILE_LOG(logERROR) << "Mapping shared memory " << name << " failed: " << strerror(errno);
close(fd); close(fd);
throw SharedMemoryException(); throw SharedMemoryException();
} }
shmSize = sz; shmSize = sizeof(T);
close(fd); close(fd);
return (T *)addr; return (T *)addr;
} }