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

restored comments, cleanup

Browse Source
This commit is contained in:
Fröjd Lars Erik 2025-03-19 21:59:30 +01:00 committed by Dhanya Thattil
parent a230c95b0e
commit daf5cb3369
4 changed files with 136 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -13,8 +13,6 @@ set(PROJECT_VERSION ${PROJECT_VERSION_STRING})
add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
cmake_policy(SET CMP0074 NEW)
@ -31,9 +29,6 @@ include(FetchContent)
option(SLS_FETCH_ZMQ_FROM_GITHUB "Fetch zmq from github" OFF)
option(SLS_FETCH_PYBIND11_FROM_GITHUB "Fetch pybind11 from github" OFF)
if(${SKBUILD})
message(STATUS "Building with scikit-build")
endif()
if(SLS_FETCH_ZMQ_FROM_GITHUB)
# Opt in to pull down a zmq version from github instead of
@ -202,7 +197,7 @@ endif()
# to control options for the libraries
if(NOT TARGET slsProjectOptions)
add_library(slsProjectOptions INTERFACE)
# target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
endif()
if (NOT TARGET slsProjectWarnings)

1
conda-recipes/main-library/build.sh
View File

@ -25,5 +25,4 @@ echo "Building using: ${NCORES} cores"
cmake --build . -- -j${NCORES}
cmake --build . --target install
export SLSDETNAME=automated_tests
CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1

35
conda-recipes/main-library/copy_lib.sh
View File

@ -1,23 +1,22 @@
# # SPDX-License-Identifier: LGPL-3.0-or-other
# # Copyright (C) 2021 Contributors to the SLS Detector Package
# SPDX-License-Identifier: LGPL-3.0-or-other
# Copyright (C) 2021 Contributors to the SLS Detector Package
# mkdir -p $PREFIX/lib
# mkdir -p $PREFIX/bin
# mkdir -p $PREFIX/include/sls
# # mkdir $PREFIX/include/slsDetectorPackage
mkdir -p $PREFIX/lib
mkdir -p $PREFIX/bin
mkdir -p $PREFIX/include/sls
# #Shared and static libraries
# cp build/install/lib/* $PREFIX/lib/
#Shared and static libraries
cp build/install/lib/* $PREFIX/lib/
# #Binaries
# cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
# cp build/install/bin/sls_detector_acquire_zmq $PREFIX/bin/.
# cp build/install/bin/sls_detector_get $PREFIX/bin/.
# cp build/install/bin/sls_detector_put $PREFIX/bin/.
# cp build/install/bin/sls_detector_help $PREFIX/bin/.
# cp build/install/bin/slsReceiver $PREFIX/bin/.
# cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
#Binaries
cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
cp build/install/bin/sls_detector_acquire_zmq $PREFIX/bin/.
cp build/install/bin/sls_detector_get $PREFIX/bin/.
cp build/install/bin/sls_detector_put $PREFIX/bin/.
cp build/install/bin/sls_detector_help $PREFIX/bin/.
cp build/install/bin/slsReceiver $PREFIX/bin/.
cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
# cp build/install/include/sls/* $PREFIX/include/sls
# cp -rv build/install/share $PREFIX
cp build/install/include/sls/* $PREFIX/include/sls
cp -rv build/install/share $PREFIX

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

@ -17,155 +17,155 @@ struct Data {
constexpr int shm_id = 10;
// TEST_CASE("Create SharedMemory read and write", "[detector]") {
TEST_CASE("Create SharedMemory read and write", "[detector]") {
// SharedMemory<Data> shm(shm_id, -1);
// shm.createSharedMemory();
// CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
// std::to_string(shm_id));
SharedMemory<Data> shm(shm_id, -1);
shm.createSharedMemory();
CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id));
// shm()->x = 3;
// shm()->y = 5.7;
// strcpy_safe(shm()->mess, "Some string");
shm()->x = 3;
shm()->y = 5.7;
strcpy_safe(shm()->mess, "Some string");
// CHECK(shm()->x == 3);
// CHECK(shm()->y == 5.7);
// CHECK(std::string(shm()->mess) == "Some string");
CHECK(shm()->x == 3);
CHECK(shm()->y == 5.7);
CHECK(std::string(shm()->mess) == "Some string");
// shm.unmapSharedMemory();
// shm.removeSharedMemory();
shm.unmapSharedMemory();
shm.removeSharedMemory();
// CHECK(shm.exists() == false);
// }
CHECK(shm.exists() == false);
}
// TEST_CASE("Open existing SharedMemory and read", "[detector]") {
TEST_CASE("Open existing SharedMemory and read", "[detector]") {
// {
// SharedMemory<double> shm(shm_id, -1);
// shm.createSharedMemory();
// *shm() = 5.3;
// }
{
SharedMemory<double> shm(shm_id, -1);
shm.createSharedMemory();
*shm() = 5.3;
}
// SharedMemory<double> shm2(shm_id, -1);
// shm2.openSharedMemory(true);
// CHECK(*shm2() == 5.3);
SharedMemory<double> shm2(shm_id, -1);
shm2.openSharedMemory(true);
CHECK(*shm2() == 5.3);
// shm2.removeSharedMemory();
// }
shm2.removeSharedMemory();
}
// TEST_CASE("Creating a second shared memory with the same name throws",
// "[detector]") {
TEST_CASE("Creating a second shared memory with the same name throws",
"[detector]") {
// SharedMemory<double> shm0(shm_id, -1);
// SharedMemory<double> shm1(shm_id, -1);
SharedMemory<double> shm0(shm_id, -1);
SharedMemory<double> shm1(shm_id, -1);
// shm0.createSharedMemory();
// CHECK_THROWS(shm1.createSharedMemory());
// shm0.removeSharedMemory();
// }
shm0.createSharedMemory();
CHECK_THROWS(shm1.createSharedMemory());
shm0.removeSharedMemory();
}
// TEST_CASE("Open two shared memories to the same place", "[detector]") {
TEST_CASE("Open two shared memories to the same place", "[detector]") {
// // Create the first shared memory
// SharedMemory<Data> shm(shm_id, -1);
// shm.createSharedMemory();
// shm()->x = 5;
// CHECK(shm()->x == 5);
// Create the first shared memory
SharedMemory<Data> shm(shm_id, -1);
shm.createSharedMemory();
shm()->x = 5;
CHECK(shm()->x == 5);
// // Open the second shared memory with the same name
// SharedMemory<Data> shm2(shm_id, -1);
// shm2.openSharedMemory(true);
// CHECK(shm2()->x == 5);
// CHECK(shm.getName() == shm2.getName());
// Open the second shared memory with the same name
SharedMemory<Data> shm2(shm_id, -1);
shm2.openSharedMemory(true);
CHECK(shm2()->x == 5);
CHECK(shm.getName() == shm2.getName());
// // Check that they still point to the same place
// shm2()->x = 7;
// CHECK(shm()->x == 7);
// Check that they still point to the same place
shm2()->x = 7;
CHECK(shm()->x == 7);
// // Remove only needs to be done once since they refer
// // to the same memory
// shm2.removeSharedMemory();
// CHECK(shm.exists() == false);
// CHECK(shm2.exists() == false);
// }
// Remove only needs to be done once since they refer
// to the same memory
shm2.removeSharedMemory();
CHECK(shm.exists() == false);
CHECK(shm2.exists() == false);
}
// TEST_CASE("Move SharedMemory", "[detector]") {
TEST_CASE("Move SharedMemory", "[detector]") {
// SharedMemory<Data> shm(shm_id, -1);
// CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
// std::to_string(shm_id));
// shm.createSharedMemory();
// shm()->x = 9;
SharedMemory<Data> shm(shm_id, -1);
CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id));
shm.createSharedMemory();
shm()->x = 9;
// SharedMemory<Data> shm2(shm_id + 1, -1);
// shm2 = std::move(shm); // shm is now a moved from object!
SharedMemory<Data> shm2(shm_id + 1, -1);
shm2 = std::move(shm); // shm is now a moved from object!
// CHECK(shm2()->x == 9);
// REQUIRE_THROWS(
// shm()); // trying to access should throw instead of returning a nullptr
// CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") +
// std::to_string(shm_id));
// shm2.removeSharedMemory();
// }
CHECK(shm2()->x == 9);
REQUIRE_THROWS(
shm()); // trying to access should throw instead of returning a nullptr
CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id));
shm2.removeSharedMemory();
}
// TEST_CASE("Create several shared memories", "[detector]") {
// constexpr int N = 5;
// std::vector<SharedMemory<int>> v;
// v.reserve(N);
// for (int i = 0; i != N; ++i) {
// v.emplace_back(shm_id + i, -1);
// CHECK(v[i].exists() == false);
// v[i].createSharedMemory();
// *v[i]() = i;
// CHECK(*v[i]() == i);
// }
TEST_CASE("Create several shared memories", "[detector]") {
constexpr int N = 5;
std::vector<SharedMemory<int>> v;
v.reserve(N);
for (int i = 0; i != N; ++i) {
v.emplace_back(shm_id + i, -1);
CHECK(v[i].exists() == false);
v[i].createSharedMemory();
*v[i]() = i;
CHECK(*v[i]() == i);
}
// for (int i = 0; i != N; ++i) {
// CHECK(*v[i]() == i);
// CHECK(v[i].getName() == std::string("/slsDetectorPackage_detector_") +
// std::to_string(i + shm_id));
// }
for (int i = 0; i != N; ++i) {
CHECK(*v[i]() == i);
CHECK(v[i].getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(i + shm_id));
}
// for (int i = 0; i != N; ++i) {
// v[i].removeSharedMemory();
// CHECK(v[i].exists() == false);
// }
// }
for (int i = 0; i != N; ++i) {
v[i].removeSharedMemory();
CHECK(v[i].exists() == false);
}
}
// TEST_CASE("Create create a shared memory with a tag") {
// SharedMemory<int> shm(0, -1, "ctbdacs");
// REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs");
// }
TEST_CASE("Create create a shared memory with a tag") {
SharedMemory<int> shm(0, -1, "ctbdacs");
REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs");
}
// TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") {
TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") {
// // if SLSDETNAME is already set we unset it but
// // save the value
// std::string old_slsdetname;
// if (getenv(SHM_ENV_NAME))
// old_slsdetname = getenv(SHM_ENV_NAME);
// unsetenv(SHM_ENV_NAME);
// setenv(SHM_ENV_NAME, "myprefix", 1);
// if SLSDETNAME is already set we unset it but
// save the value
std::string old_slsdetname;
if (getenv(SHM_ENV_NAME))
old_slsdetname = getenv(SHM_ENV_NAME);
unsetenv(SHM_ENV_NAME);
setenv(SHM_ENV_NAME, "myprefix", 1);
// SharedMemory<int> shm(0, -1, "ctbdacs");
// REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_myprefix_ctbdacs");
SharedMemory<int> shm(0, -1, "ctbdacs");
REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_myprefix_ctbdacs");
// // Clean up after us
// if (old_slsdetname.empty())
// unsetenv(SHM_ENV_NAME);
// else
// setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1);
// }
// Clean up after us
if (old_slsdetname.empty())
unsetenv(SHM_ENV_NAME);
else
setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1);
}
// TEST_CASE("map int64 to int32 throws") {
// SharedMemory<int32_t> shm(shm_id, -1);
// shm.createSharedMemory();
// *shm() = 7;
TEST_CASE("map int64 to int32 throws") {
SharedMemory<int32_t> shm(shm_id, -1);
shm.createSharedMemory();
*shm() = 7;
// SharedMemory<int64_t> shm2(shm_id, -1);
// REQUIRE_THROWS(shm2.openSharedMemory(true));
SharedMemory<int64_t> shm2(shm_id, -1);
REQUIRE_THROWS(shm2.openSharedMemory(true));
// shm.removeSharedMemory();
// }
shm.removeSharedMemory();
}
} // namespace sls