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

receiver bug fixaffecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t

Browse Source
This commit is contained in:
maliakal_d
2019-03-04 11:02:10 +01:00
parent d7ce5fedfd
commit a1a95ebb20
11 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/include/Listener.h
View File

@ -39,7 +39,7 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
*/
Listener(int ind, detectorType dtype, Fifo*& f, runStatus* s,
uint32_t* portno, char* e, uint64_t* nf, uint32_t* dr,
uint32_t* us, uint32_t* as, uint32_t* fpf,
uint64_t* us, uint64_t* as, uint32_t* fpf,
frameDiscardPolicy* fdp, bool* act, bool* depaden, bool* sm);
/**
@ -138,7 +138,7 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
* @param s UDP socket buffer size to be set
* @return OK or FAIL of dummy socket creation
*/
int CreateDummySocketForUDPSocketBufferSize(uint32_t s);
int CreateDummySocketForUDPSocketBufferSize(uint64_t s);
/**
* Set hard coded (calculated but not from detector) row and column
@ -231,10 +231,10 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
uint32_t* dynamicRange;
/** UDP Socket Buffer Size */
uint32_t* udpSocketBufferSize;
uint64_t* udpSocketBufferSize;
/** actual UDP Socket Buffer Size (double due to kernel bookkeeping) */
uint32_t* actualUDPSocketBufferSize;
uint64_t* actualUDPSocketBufferSize;
/** frames per file */
uint32_t* framesPerFile;

10
slsReceiverSoftware/include/UDPBaseImplementation.h
View File

@ -313,14 +313,14 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
* Get UDP Socket Buffer Size
* @return UDP Socket Buffer Size
*/
uint32_t getUDPSocketBufferSize() const;
uint64_t getUDPSocketBufferSize() const;
/** (not saved in client shared memory)
* Get actual UDP Socket Buffer Size
* @return actual UDP Socket Buffer Size
*/
uint32_t getActualUDPSocketBufferSize() const;
uint64_t getActualUDPSocketBufferSize() const;
/*************************************************************************
* Setters ***************************************************************
@ -651,7 +651,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
* @param s UDP Socket Buffer Size
* @return OK or FAIL if dummy socket could be created
*/
int setUDPSocketBufferSize(const uint32_t s);
int setUDPSocketBufferSize(const uint64_t s);
/*
* Restream stop dummy packet from receiver
@ -760,9 +760,9 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/** Server UDP Port Number*/
uint32_t udpPortNum[MAX_NUMBER_OF_LISTENING_THREADS];
/** udp socket buffer size */
uint32_t udpSocketBufferSize;
uint64_t udpSocketBufferSize;
/** actual UDP Socket Buffer Size (halved due to kernel bookkeeping) */
uint32_t actualUDPSocketBufferSize;
uint64_t actualUDPSocketBufferSize;
//***file parameters***
/** File format */

6
slsReceiverSoftware/include/UDPInterface.h
View File

@ -404,13 +404,13 @@ class UDPInterface {
* Get UDP Socket Buffer Size
* @return UDP Socket Buffer Size
*/
virtual uint32_t getUDPSocketBufferSize() const = 0;
virtual uint64_t getUDPSocketBufferSize() const = 0;
/** (not saved in client shared memory)
* Get actual UDP Socket Buffer Size
* @return actual UDP Socket Buffer Size
*/
virtual uint32_t getActualUDPSocketBufferSize() const = 0;
virtual uint64_t getActualUDPSocketBufferSize() const = 0;
/*************************************************************************
* Setters ***************************************************************
@ -743,7 +743,7 @@ class UDPInterface {
* @param s UDP Socket Buffer Size
* @return OK or FAIL if dummy socket could be created
*/
virtual int setUDPSocketBufferSize(const uint32_t s) = 0;
virtual int setUDPSocketBufferSize(const uint64_t s) = 0;
/*
* Restream stop dummy packet from receiver

2
slsReceiverSoftware/include/UDPStandardImplementation.h
View File

@ -184,7 +184,7 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
* @param s UDP Socket Buffer Size
* @return OK or FAIL if dummy socket could be created
*/
int setUDPSocketBufferSize(const uint32_t s);
int setUDPSocketBufferSize(const uint64_t s);
/**
* Restream stop dummy packet from receiver