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

merge conflict

Browse Source
This commit is contained in:
maliakal_d 2019-03-14 12:41:37 +01:00
commit cb687d805e
5 changed files with 2911 additions and 1029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -37,6 +37,8 @@ option (SLS_USE_GUI "GUI" OFF)
option (SLS_USE_TESTS "TESTS" ON) option (SLS_USE_TESTS "TESTS" ON)
option (SLS_USE_INTEGRATION_TESTS "Integration Tests" ON) option (SLS_USE_INTEGRATION_TESTS "Integration Tests" ON)
option(SLS_USE_SANITIZER OFF)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
#Testing for minimum version for compilers #Testing for minimum version for compilers
@ -61,12 +63,10 @@ endif()
#set (CMAKE_CXX_STANDARD_REQUIRED ON) #set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ")
# set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread") if(SLS_USE_SANITIZER)
# set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefined")
#set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefined") set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefiend")
#set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefiend") endif()
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG}")
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

3912
catch/catch.hpp
View File

File diff suppressed because it is too large Load Diff

10
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -460,12 +460,11 @@ void slsDetector::connectDataError() {
setErrorMask((getErrorMask()) | (CANNOT_CONNECT_TO_RECEIVER)); setErrorMask((getErrorMask()) | (CANNOT_CONNECT_TO_RECEIVER));
} }
int slsDetector::sendModule(sls_detector_module *myMod) { int slsDetector::sendModule(sls_detector_module *myMod, sls::ClientSocket& client) {
TLogLevel level = logDEBUG1; TLogLevel level = logDEBUG1;
FILE_LOG(level) << "Sending Module"; FILE_LOG(level) << "Sending Module";
int ts = 0; int ts = 0;
int n = 0; int n = 0;
auto client = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->controlPort);
n = client.sendData(&(myMod->serialnumber), sizeof(myMod->serialnumber)); n = client.sendData(&(myMod->serialnumber), sizeof(myMod->serialnumber));
ts += n; ts += n;
FILE_LOG(level) << "Serial number sent. " << n << " bytes. serialno: " << myMod->serialnumber; FILE_LOG(level) << "Serial number sent. " << n << " bytes. serialno: " << myMod->serialnumber;
@ -510,8 +509,7 @@ int slsDetector::sendModule(sls_detector_module *myMod) {
return ts; return ts;
} }
int slsDetector::receiveModule(sls_detector_module *myMod) { int slsDetector::receiveModule(sls_detector_module *myMod, sls::ClientSocket& client) {
auto client = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->controlPort);
int ts = 0; int ts = 0;
ts += client.receiveData(&(myMod->serialnumber), sizeof(myMod->serialnumber)); ts += client.receiveData(&(myMod->serialnumber), sizeof(myMod->serialnumber));
ts += client.receiveData(&(myMod->nchan), sizeof(myMod->nchan)); ts += client.receiveData(&(myMod->nchan), sizeof(myMod->nchan));
@ -3900,7 +3898,7 @@ int slsDetector::setModule(sls_detector_module module, int tb) {
if (detector_shm()->onlineFlag == ONLINE_FLAG) { if (detector_shm()->onlineFlag == ONLINE_FLAG) {
auto client = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->controlPort); auto client = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->controlPort);
client.sendData(&fnum, sizeof(fnum)); client.sendData(&fnum, sizeof(fnum));
sendModule(&module); sendModule(&module, client);
client.receiveData(&ret, sizeof(ret)); client.receiveData(&ret, sizeof(ret));
// handle ret // handle ret
@ -3950,7 +3948,7 @@ slsDetectorDefs::sls_detector_module *slsDetector::getModule() {
if (ret == FAIL) { if (ret == FAIL) {
setErrorMask((getErrorMask()) | (OTHER_ERROR_CODE)); setErrorMask((getErrorMask()) | (OTHER_ERROR_CODE));
} else { } else {
receiveModule(myMod); receiveModule(myMod, client);
} }
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1672,14 +1672,14 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
* @param myMod module structure to send * @param myMod module structure to send
* @returns number of bytes sent to the detector * @returns number of bytes sent to the detector
*/ */
int sendModule(sls_detector_module *myMod); int sendModule(sls_detector_module *myMod, sls::ClientSocket& client);
/** /**
* Receive a sls_detector_module structure over socket * Receive a sls_detector_module structure over socket
* @param myMod module structure to receive * @param myMod module structure to receive
* @returns number of bytes received from the detector * @returns number of bytes received from the detector
*/ */
int receiveModule(sls_detector_module *myMod); int receiveModule(sls_detector_module *myMod, sls::ClientSocket& client);
/** /**
* Get MAC from the receiver using udpip and * Get MAC from the receiver using udpip and

2
slsSupportLib/include/DataSocket.h
View File

@ -12,7 +12,7 @@ class DataSocket {
virtual ~DataSocket(); virtual ~DataSocket();
DataSocket &operator=(DataSocket &&move) noexcept; DataSocket &operator=(DataSocket &&move) noexcept;
void swap(DataSocket &other) noexcept; void swap(DataSocket &other) noexcept;
DataSocket(DataSocket const &) = delete; DataSocket(const DataSocket &) = delete;
DataSocket &operator=(DataSocket const &) = delete; DataSocket &operator=(DataSocket const &) = delete;
int getSocketId() const { int getSocketId() const {
return socketId_; return socketId_;