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

Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings

Browse Source
This commit is contained in:
maliakal_d
2018-07-18 12:29:19 +02:00
parent 6bb7195a2c
commit 40c96b5562
28 changed files with 99 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -481,7 +481,7 @@ void DataProcessor::PadMissingPackets(char* buf) {
uint32_t fifohsize = generalData->fifoBufferHeaderSize;
uint32_t corrected_dsize = dsize - ((pperFrame * dsize) - generalData->imageSize);
for (int pnum = 0; pnum < pperFrame; ++pnum) {
for (unsigned int pnum = 0; pnum < pperFrame; ++pnum) {
// not missing packet
if (pmask[pnum])

7
slsReceiverSoftware/src/HDF5File.cpp
View File

@ -157,9 +157,9 @@ int HDF5File::CreateFile(uint64_t fnum) {
if (dataspace == NULL)
cprintf(RED,"Got nothing!\n");
if(!silentMode)
if(!silentMode) {
FILE_LOG(logINFO) << *udpPortNumber << ": HDF5 File created: " << currentFileName;
}
return OK;
}
@ -225,8 +225,9 @@ int HDF5File::CreateMasterFile(bool en, uint32_t size,
virtualfd = 0;
masterFileName = HDF5FileStatic::CreateMasterFileName(filePath,
fileNamePrefix, *fileIndex);
if(!silentMode)
if(!silentMode) {
FILE_LOG(logINFO) << "Master File: " << masterFileName;
}
pthread_mutex_lock(&Mutex);
int ret = HDF5FileStatic::CreateMasterDataFile(masterfd, masterFileName,
*overWriteEnable,

1
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -658,7 +658,6 @@ int UDPStandardImplementation::restreamStop() {
void UDPStandardImplementation::SetLocalNetworkParameters() {
char command[255];
// to increase Max length of input packet queue
int max_back_log;

8
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2680,7 +2680,7 @@ int slsReceiverTCPIPInterface::set_udp_socket_buffer_size() {
}
//get
retval=receiverBase->getUDPSocketBufferSize();
if(index >= 0 && ((retval != index) || (receiverBase->getActualUDPSocketBufferSize() != (index*2)))) {
if(index >= 0 && ((retval != index) || ((int)receiverBase->getActualUDPSocketBufferSize() != (index*2)))) {
ret = FAIL;
strcpy(mess, "Could not set UDP Socket buffer size (No CAP_NET_ADMIN privileges?)\n");
FILE_LOG(logERROR) << mess;
@ -2810,7 +2810,8 @@ int slsReceiverTCPIPInterface::check_version_compatibility() {
sprintf(mess,"This client is incompatible.\n"
"Client's receiver API Version: (0x%llx). Receiver API Version: (0x%llx).\n"
"Incompatible, update client!\n",
client_requiredVersion, rx_apiVersion);
(long long unsigned int)client_requiredVersion,
(long long unsigned int)rx_apiVersion);
FILE_LOG(logERROR) << mess;
}
@ -2820,7 +2821,8 @@ int slsReceiverTCPIPInterface::check_version_compatibility() {
sprintf(mess,"This receiver is incompatible.\n"
"Receiver Version: (0x%llx). Client's receiver API Version: (0x%llx).\n"
"Incompatible, update receiver!\n",
rx_version, client_requiredVersion);
(long long unsigned int)rx_version,
(long long unsigned int)client_requiredVersion);
FILE_LOG(logERROR) << mess;
}
else FILE_LOG(logINFO) << "Compatibility with Client: Successful";