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

Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-24 16:06:00 +02:00
parent 960dc5c62f
commit 2d52058a55
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -63,13 +63,18 @@ public:
return;
// create publisher
socketDescriptor = zmq_socket (contextDescriptor, ZMQ_PULL);
socketDescriptor = zmq_socket (contextDescriptor, ZMQ_SUB);
if (socketDescriptor == NULL) {
PrintError ();
Close ();
}
//Socket Options provided above
// an empty string implies receiving any messages
if ( zmq_setsockopt(socketDescriptor, ZMQ_SUBSCRIBE, "", 0)) {
PrintError ();
Close();
}
//ZMQ_LINGER default is already -1 means no messages discarded. use this options if optimizing required
//ZMQ_SNDHWM default is 0 means no limit. use this to optimize if optimizing required
// eg. int value = -1;
@ -104,7 +109,7 @@ public:
if (contextDescriptor == NULL)
return;
// create publisher
socketDescriptor = zmq_socket (contextDescriptor, ZMQ_PUSH);
socketDescriptor = zmq_socket (contextDescriptor, ZMQ_PUB);
if (socketDescriptor == NULL) {
PrintError ();
Close ();

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "1102ff107a9d19583f85fde2b7eddbe7e9b50715"
//#define SVNREV 0x653
#define SVNREPUUID "ec1b8333034e4a09d819b2317994813435c7159f"
//#define SVNREV 0x656
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x653
#define SVNDATE 0x20170818
#define SVNREV 0x656
#define SVNDATE 0x20170824
//