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

minor

Browse Source
This commit is contained in:
Erik Frojdh 2019-03-12 11:52:13 +01:00
parent 3b2c734efd
commit 48e4cec56f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1968,8 +1968,6 @@ class multiSlsDetector : public virtual slsDetectorDefs,
/** Shared Memory object */ /** Shared Memory object */
SharedMemory<sharedMultiSlsDetector> sharedMemory{0,-1}; SharedMemory<sharedMultiSlsDetector> sharedMemory{0,-1};
/** Shared memory structure */
sharedMultiSlsDetector *thisMultiDetector {nullptr};
/** pointers to the slsDetector structures */ /** pointers to the slsDetector structures */
std::vector<std::unique_ptr<slsDetector>> detectors; std::vector<std::unique_ptr<slsDetector>> detectors;

8
slsDetectorSoftware/tests/test-SharedMemory.cpp
View File

@ -25,14 +25,17 @@ TEST_CASE("Create SharedMemory read and write") {
shm.UnmapSharedMemory(); shm.UnmapSharedMemory();
shm.RemoveSharedMemory(); shm.RemoveSharedMemory();
CHECK(shm.IsExisting() == false);
} }
TEST_CASE("Open existing SharedMemory and read") { TEST_CASE("Open existing SharedMemory and read") {
{
SharedMemory<double> shm(0, -1); SharedMemory<double> shm(0, -1);
shm.CreateSharedMemory(); shm.CreateSharedMemory();
*shm() = 5.3; *shm() = 5.3;
shm.UnmapSharedMemory(); }
SharedMemory<double> shm2(0, -1); SharedMemory<double> shm2(0, -1);
shm2.OpenSharedMemory(); shm2.OpenSharedMemory();
@ -41,7 +44,7 @@ TEST_CASE("Open existing SharedMemory and read") {
shm2.RemoveSharedMemory(); shm2.RemoveSharedMemory();
} }
TEST_CASE("Two shared memories with the same name throws") { TEST_CASE("Creating a second shared memory with the same name throws") {
SharedMemory<double> shm0(0, -1); SharedMemory<double> shm0(0, -1);
SharedMemory<double> shm1(0, -1); SharedMemory<double> shm1(0, -1);
@ -69,7 +72,6 @@ TEST_CASE("Open two shared memories to the same place") {
shm2()->x = 7; shm2()->x = 7;
CHECK(shm()->x == 7); CHECK(shm()->x == 7);
//Remove only needs to be done once since they refer //Remove only needs to be done once since they refer
//to the same memory //to the same memory
shm2.RemoveSharedMemory(); shm2.RemoveSharedMemory();