client and receiver: silent mode put into shared memory, works properly now

2025-06-22 17:47:59 +02:00 · 2018-08-15 19:51:04 +02:00
parent 87e8333dfd
commit 830f92dedc
19 changed files with 89 additions and 109 deletions
--- a/slsReceiverSoftware/include/DataProcessor.h
+++ b/slsReceiverSoftware/include/DataProcessor.h
@ -37,6 +37,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param fp pointer to frame padding enable
 	 * @param act pointer to activated
 	 * @param depaden pointer to deactivated padding enable
+	 * @param sm pointer to silent mode
 	 * @param dataReadycb pointer to data ready call back function
 	 * @param dataModifyReadycb pointer to data ready call back function with modified
 	 * @param pDataReadycb pointer to arguments of data ready call back function. To write/stream a smaller size of processed data, change this value (only smaller value is allowed).
@ -44,7 +45,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	DataProcessor(int ind, detectorType dtype, Fifo*& f, fileFormat* ftype,
 			bool fwenable, bool* dsEnable, bool* gpEnable, uint32_t* dr,
 						uint32_t* freq, uint32_t* timer,
-						bool* fp, bool* act, bool* depaden,
+						bool* fp, bool* act, bool* depaden, bool* sm,
 						void (*dataReadycb)(char*, char*, uint32_t, void*),
 				        void (*dataModifyReadycb)(char*, char*, uint32_t &, void*),
 						void *pDataReadycb);
@ -202,11 +203,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	void SetPixelDimension();

-    /**
-     * Set Silent Mode
-     * @param mode 1 sets 0 unsets
-     */
-    void SetSilentMode(bool mode);



@ -342,6 +338,11 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	/** Deactivated padding enable */
 	bool* deactivatedPaddingEnable;

+    /** Silent Mode */
+    bool* silentMode;
+
+	/** frame padding */
+	bool* framePadding;

 	//acquisition start
 	/** Aquisition Started flag */
@ -368,12 +369,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	uint64_t currentFrameIndex;


-    /** Silent Mode */
-    bool silentMode;
-
-	/** frame padding */
-	bool* framePadding;
-
 	//call back
    /**
     * Call back for raw data
@ -385,7 +380,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
    void (*rawDataReadyCallBack)(char*,
            char*, uint32_t, void*);

-
    /**
     * Call back for raw data (modified)
     * args to raw data ready callback are
--- a/slsReceiverSoftware/include/DataStreamer.h
+++ b/slsReceiverSoftware/include/DataStreamer.h
@ -27,8 +27,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param fi pointer to file index
 	 * @param fd flipped data enable for x and y dimensions
 	 * @param ajh additional json header
+	 * @param sm pointer to silent mode
 	 */
-	DataStreamer(int ind, Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi, int* fd, char* ajh);
+	DataStreamer(int ind, Fifo*& f, uint32_t* dr, int* sEnable,
+			uint64_t* fi, int* fd, char* ajh, bool* sm);

 	/**
 	 * Destructor
@ -104,11 +106,6 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	int RestreamStop();

-    /**
-     * Set Silent Mode
-     * @param mode 1 sets 0 unsets
-     */
-    void SetSilentMode(bool mode);

 private:

@ -181,6 +178,16 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	/** Pointer to file index */
 	uint64_t* fileIndex;

+	/** flipped data across both dimensions enable */
+	int* flippedData;
+
+	/** additional json header */
+	char* additionJsonHeader;
+
+    /** Silent Mode */
+    bool* silentMode;
+
+
 	/** Aquisition Started flag */
 	bool acquisitionStartedFlag;

@ -199,13 +206,5 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	/** Complete buffer used for roi, eg. shortGotthard */
 	char* completeBuffer;

-	/** flipped data across both dimensions enable */
-	int* flippedData;
-
-	/** additional json header */
-	char* additionJsonHeader;
-
-    /** Silent Mode */
-    bool silentMode;
 };

--- a/slsReceiverSoftware/include/File.h
+++ b/slsReceiverSoftware/include/File.h
@ -211,7 +211,7 @@ class File : private virtual slsReceiverDefs {
 	uint32_t* udpPortNumber;

 	/** Silent Mode */
-	bool silentMode;
+	bool* silentMode;

 };

--- a/slsReceiverSoftware/include/HDF5FileStatic.h
+++ b/slsReceiverSoftware/include/HDF5FileStatic.h
@ -534,6 +534,7 @@ public:
 	/**
 	 * Create virtual file
 	 * (in C because H5Pset_virtual doesnt exist yet in C++)
+	 * @param virtualFileName virtual file name
 	 * @param fd virtual file handle
 	 * @param masterFileName master file name
 	 * @param fpath file path
@ -556,6 +557,7 @@ public:
 	 * @returns 0 for success and 1 for fail
 	 */
 	static int CreateVirtualDataFile(
+			string virtualFileName,
 			hid_t& fd, string masterFileName,
 			char* fpath, char* fnameprefix, uint64_t findex, bool frindexenable,
 			int dindex, int numunits,
@ -566,10 +568,6 @@ public:
 			vector <const char*> parameterNames,
 			vector <DataType> parameterDataTypes)
 	{
-		//virtual names
-		string virtualFileName = CreateVirtualFileName(fpath, fnameprefix, findex);
-		FILE_LOG(logINFO) << "Virtual File: " << virtualFileName;
-
 		//file
 		hid_t dfal = H5Pcreate (H5P_FILE_ACCESS);
 		if (dfal < 0)
--- a/slsReceiverSoftware/include/Listener.h
+++ b/slsReceiverSoftware/include/Listener.h
@ -35,11 +35,12 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param fdp frame discard policy
 	 * @param act pointer to activated
 	 * @param depaden pointer to deactivated padding enable
+	 * @param sm pointer to silent mode
 	 */
 	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,
-			frameDiscardPolicy* fdp, bool* act, bool* depaden);
+			frameDiscardPolicy* fdp, bool* act, bool* depaden, bool* sm);

 	/**
 	 * Destructor
@ -131,12 +132,6 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	void ShutDownUDPSocket();

-    /**
-     * Set Silent Mode
-     * @param mode 1 sets 0 unsets
-     */
-    void SetSilentMode(bool mode);
-
    /**
     * Create & closes a dummy UDP socket
     * to set & get actual buffer size
@ -253,6 +248,9 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/** Deactivated padding enable */
 	bool* deactivatedPaddingEnable;

+    /** Silent Mode */
+    bool* silentMode;
+
 	/** x coord hardcoded as 1D or 2d,
 	 * if detector does not send them yet or
 	 * missing packets/deactivated (eiger/jungfrau sends 2d pos) **/
@ -313,8 +311,5 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {

 	/** number of images for statistic */
 	uint32_t numFramesStatistic;
-
-    /** Silent Mode */
-    bool silentMode;
 };

--- a/slsReceiverSoftware/include/UDPBaseImplementation.h
+++ b/slsReceiverSoftware/include/UDPBaseImplementation.h
@ -273,7 +273,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 * Get Silent Mode
 	 * @return silent mode
 	 */
-	uint32_t getSilentMode() const;
+	bool getSilentMode() const;

 	/**
 	 * Get activate
@ -540,9 +540,9 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	//***receiver parameters***
 	/**
 	 * Set Silent Mode
-	 * @param i silent mode. 1 sets, 0 unsets
+	 * @param i silent mode. true sets, false unsets
 	 */
-	void setSilentMode(const uint32_t i);
+	void setSilentMode(const bool i);

 	/*************************************************************************
 	 * Behavioral functions***************************************************
@ -801,7 +801,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	char additionalJsonHeader[MAX_STR_LENGTH];

 	//***receiver parameters***
-	uint32_t silentMode;
+	bool silentMode;



--- a/slsReceiverSoftware/include/UDPInterface.h
+++ b/slsReceiverSoftware/include/UDPInterface.h
@ -361,7 +361,7 @@ class UDPInterface {
 	 * Get Silent Mode
 	 * @return silent mode
 	 */
-	virtual uint32_t getSilentMode() const = 0;
+	virtual bool getSilentMode() const = 0;

 	/**
 	 * Get activate
@ -629,9 +629,9 @@ class UDPInterface {
 	//***receiver parameters***
 	/**
 	 * Set Silent Mode
-	 * @param i silent mode. 1 sets, 0 unsets
+	 * @param i silent mode. true sets, false unsets
 	 */
-	virtual void setSilentMode(const uint32_t i) = 0;
+	virtual void setSilentMode(const bool i) = 0;


 	/*************************************************************************
--- a/slsReceiverSoftware/include/UDPStandardImplementation.h
+++ b/slsReceiverSoftware/include/UDPStandardImplementation.h
@ -122,11 +122,6 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 	 */
 	int setFifoDepth(const uint32_t i);

-	/**
-	 * Set Silent Mode
-	 * @param i silent mode. 1 sets, 0 unsets
-	 */
-	void setSilentMode(const uint32_t i);

 	/**
 	 * Set receiver type (and corresponding detector variables in derived STANDARD class)