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

fixed linking issue in arping and shm test (#659)

Browse Source 
Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
This commit is contained in:
Erik Fröjdh 2023-02-14 14:49:00 +01:00 committed by GitHub
parent 7c047cab4a
commit 0251aa9e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ TEST_CASE("Move SharedMemory", "[detector]") {
shm2 = std::move(shm); // shm is now a moved from object! shm2 = std::move(shm); // shm is now a moved from object!
CHECK(shm2()->x == 9); CHECK(shm2()->x == 9);
CHECK(shm() == nullptr); REQUIRE_THROWS(shm()); // trying to access should throw instead of returning a nullptr
CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") + CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id)); std::to_string(shm_id));
shm2.removeSharedMemory(); shm2.removeSharedMemory();

4
slsReceiverSoftware/src/Arping.cpp
View File

@ -85,8 +85,8 @@ void Arping::ProcessExecution() {
if (!error.empty()) { if (!error.empty()) {
LOG(logERROR) << error; LOG(logERROR) << error;
} }
const auto interval = std::chrono::seconds(60);
std::this_thread::sleep_for(std::chrono::seconds(timeIntervalSeconds)); std::this_thread::sleep_for(interval);
} }
} }

1
slsReceiverSoftware/src/Arping.h
View File

@ -36,7 +36,6 @@ class Arping {
std::vector<std::string>(MAX_NUMBER_OF_LISTENING_THREADS); std::vector<std::string>(MAX_NUMBER_OF_LISTENING_THREADS);
std::atomic<bool> runningFlag{false}; std::atomic<bool> runningFlag{false};
std::atomic<pid_t> childPid{0}; std::atomic<pid_t> childPid{0};
static const int timeIntervalSeconds = 60;
}; };
} // namespace sls } // namespace sls