detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 01:53:29 +01:00
Code Issues Actions Packages Releases Activity

switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message

Browse Source
This commit is contained in:
maliakal_d
2019-03-15 10:00:22 +01:00
parent 7522a655df
commit 5fe7a86361
10 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/Listener.h
View File

@@ -140,7 +140,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
* @param s UDP socket buffer size to be set
* @return OK or FAIL of dummy socket creation
*/
int CreateDummySocketForUDPSocketBufferSize(uint64_t s);
int CreateDummySocketForUDPSocketBufferSize(int64_t s);
/**
* Set hard coded (calculated but not from detector) row and column
@@ -232,10 +232,10 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
uint32_t* dynamicRange;
/** UDP Socket Buffer Size */
uint64_t* udpSocketBufferSize;
int64_t* udpSocketBufferSize;
/** actual UDP Socket Buffer Size (double due to kernel bookkeeping) */
uint64_t* actualUDPSocketBufferSize;
int64_t* actualUDPSocketBufferSize;
/** frames per file */
uint32_t* framesPerFile;

10
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@@ -308,14 +308,14 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get UDP Socket Buffer Size
* @return UDP Socket Buffer Size
*/
uint64_t getUDPSocketBufferSize() const;
int64_t getUDPSocketBufferSize() const;
/** (not saved in client shared memory)
* Get actual UDP Socket Buffer Size
* @return actual UDP Socket Buffer Size
*/
uint64_t getActualUDPSocketBufferSize() const;
int64_t getActualUDPSocketBufferSize() const;
/*************************************************************************
* Setters ***************************************************************
@@ -438,7 +438,7 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* @param s UDP Socket Buffer Size
* @return OK or FAIL if dummy socket could be created
*/
int setUDPSocketBufferSize(const uint64_t s);
int setUDPSocketBufferSize(const int64_t s);
//***acquisition parameters***
@@ -805,9 +805,9 @@ private:
/** Server UDP Port Number*/
uint32_t udpPortNum[MAX_NUMBER_OF_LISTENING_THREADS];
/** udp socket buffer size */
uint64_t udpSocketBufferSize;
int64_t udpSocketBufferSize;
/** actual UDP Socket Buffer Size (halved due to kernel bookkeeping) */
uint64_t actualUDPSocketBufferSize;
int64_t actualUDPSocketBufferSize;
//***file parameters***
/** File format */