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

removed pointer to shared memory in some multi functions

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-10 14:18:47 +02:00
parent 2cd0841ea3
commit fd7060ef6c
2 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -78,13 +78,8 @@ template <typename RT, typename... CT>
std::vector<RT> multiSlsDetector::serialCall(RT (slsDetector::*somefunc)(CT...), CT... Args) std::vector<RT> multiSlsDetector::serialCall(RT (slsDetector::*somefunc)(CT...), CT... Args)
{ {
std::vector<RT> result; std::vector<RT> result;
for (auto& d: detectors) { for (auto& d: detectors)
result.push_back((d.get()->*somefunc)(Args...)); result.push_back((d.get()->*somefunc)(Args...));
/*
if ((*this)[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
*/
}
return result; return result;
} }
@ -92,17 +87,11 @@ template <typename RT, typename... CT>
std::vector<RT> multiSlsDetector::parallelCall(RT (slsDetector::*somefunc)(CT...), CT... Args) std::vector<RT> multiSlsDetector::parallelCall(RT (slsDetector::*somefunc)(CT...), CT... Args)
{ {
std::vector<std::future<RT>> futures; std::vector<std::future<RT>> futures;
for (auto &d : detectors) { for (auto &d : detectors)
futures.push_back(std::async(std::launch::async, somefunc, d.get(), Args...)); futures.push_back(std::async(std::launch::async, somefunc, d.get(), Args...));
/*
if ((*this)[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
*/
}
std::vector<RT> result; std::vector<RT> result;
for (auto& i : futures) for (auto& i : futures)
result.push_back(i.get()); result.push_back(i.get());
return result; return result;
} }
@ -290,23 +279,22 @@ int64_t multiSlsDetector::getId(idMode mode, int detPos) {
} }
slsDetector* multiSlsDetector::getSlsDetector(int detPos) { // slsDetector* multiSlsDetector::getSlsDetector(int detPos) {
return detectors[detPos].get(); // return detectors[detPos].get();
} // }
// slsDetector *multiSlsDetector::operator()(int detPos) const {
// return detectors[detPos].get();
// }
slsDetector *multiSlsDetector::operator()(int detPos) const { // slsDetector* multiSlsDetector::operator[](int detPos) const {
return detectors[detPos].get(); // //Providing access to detectors with range checking
} // //throw exception if out of range
// if (detPos >= 0 && detPos < (int)detectors.size())
slsDetector* multiSlsDetector::operator[](int detPos) const { // return detectors[detPos].get();
//Providing access to detectors with range checking // else
//throw exception if out of range // throw(std::range_error("Detector does not exist"));
if (detPos >= 0 && detPos < (int)detectors.size()) // }
return detectors[detPos].get();
else
throw(std::range_error("Detector does not exist"));
}
void multiSlsDetector::freeSharedMemory(int multiId, int detPos) { void multiSlsDetector::freeSharedMemory(int multiId, int detPos) {
// single // single
@ -318,22 +306,20 @@ void multiSlsDetector::freeSharedMemory(int multiId, int detPos) {
// multi // multi
// get number of detectors // get number of detectors
int numDetectors = 0; int numDetectors = 0;
SharedMemory* shm = new SharedMemory(multiId, -1); auto shm = SharedMemory(multiId, -1);
// get number of detectors from multi shm // get number of detectors from multi shm
if (shm->IsExisting()) { if (shm.IsExisting()) {
sharedMultiSlsDetector* mdet = (sharedMultiSlsDetector*)shm->OpenSharedMemory( sharedMultiSlsDetector* mdet = (sharedMultiSlsDetector*)shm.OpenSharedMemory(
sizeof(sharedMultiSlsDetector)); sizeof(sharedMultiSlsDetector));
numDetectors = mdet->numberOfDetectors; numDetectors = mdet->numberOfDetectors;
shm->UnmapSharedMemory(mdet); shm.UnmapSharedMemory(mdet);
shm->RemoveSharedMemory(); shm.RemoveSharedMemory();
} }
delete shm;
for (int i = 0; i < numDetectors; ++i) { for (int i = 0; i < numDetectors; ++i) {
SharedMemory* shm = new SharedMemory(multiId, i); auto shm = SharedMemory(multiId, i);
shm->RemoveSharedMemory(); shm.RemoveSharedMemory();
delete shm;
} }
} }

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -237,16 +237,16 @@ public:
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns pointer to sls detector object * @returns pointer to sls detector object
*/ */
slsDetector* getSlsDetector(int detPos = -1); // slsDetector* getSlsDetector(int detPos = -1);
/** /**
* Accessing the sls detector from the multi list using position * Accessing the sls detector from the multi list using position
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns slsDetector object * @returns slsDetector object
*/ */
slsDetector *operator()(int detPos = -1) const; // slsDetector *operator()(int detPos = -1) const;
slsDetector* operator[](int detPos) const; // slsDetector* operator[](int detPos) const;
/** /**
* Free shared memory from the command line * Free shared memory from the command line
* avoiding creating the constructor classes and mapping * avoiding creating the constructor classes and mapping