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

moved initDetectorStructure into initSharedMemory

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-10 17:41:13 +02:00
parent fd7060ef6c
commit 5f6f276f70
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -65,9 +65,7 @@ multiSlsDetector::~multiSlsDetector() {
void multiSlsDetector::setupMultiDetector(bool verify, bool update) { void multiSlsDetector::setupMultiDetector(bool verify, bool update) {
if (initSharedMemory(verify)) initSharedMemory(verify);
// shared memory just created, so initialize the structure
initializeDetectorStructure();
initializeMembers(verify); initializeMembers(verify);
if (update) if (update)
updateUserdetails(); updateUserdetails();
@ -391,9 +389,9 @@ std::string multiSlsDetector::getUserDetails() {
* pre: sharedMemory=0, thisMultiDetector = 0, detectors.size() = 0 * pre: sharedMemory=0, thisMultiDetector = 0, detectors.size() = 0
* exceptions are caught in calling function, shm unmapped and deleted * exceptions are caught in calling function, shm unmapped and deleted
*/ */
bool multiSlsDetector::initSharedMemory(bool verify) { void multiSlsDetector::initSharedMemory(bool verify) {
size_t sz = sizeof(sharedMultiSlsDetector); size_t sz = sizeof(sharedMultiSlsDetector);
bool created = false;
try { try {
// shared memory object with name // shared memory object with name
@ -402,7 +400,7 @@ bool multiSlsDetector::initSharedMemory(bool verify) {
//create //create
if (!sharedMemory->IsExisting()) { if (!sharedMemory->IsExisting()) {
thisMultiDetector = (sharedMultiSlsDetector*)sharedMemory->CreateSharedMemory(sz); thisMultiDetector = (sharedMultiSlsDetector*)sharedMemory->CreateSharedMemory(sz);
created = true; initializeDetectorStructure();
} }
// open and verify version // open and verify version
else { else {
@ -427,8 +425,6 @@ bool multiSlsDetector::initSharedMemory(bool verify) {
} }
throw; throw;
} }
return created;
} }

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1594,7 +1594,7 @@ private:
* @param update true to update last user pid, date etc * @param update true to update last user pid, date etc
* @returns true if shared memory was created in this call, else false * @returns true if shared memory was created in this call, else false
*/ */
bool initSharedMemory(bool verify = true); void initSharedMemory(bool verify = true);
/** /**
* Initialize detector structure for the shared memory just created * Initialize detector structure for the shared memory just created