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

removed zmq threads from client and made it receive packets via for loop

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-22 11:05:42 +01:00
parent 0ed9ee0e5d
commit 394526a9c3
5 changed files with 244 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5730,7 +5730,7 @@ int slsDetector::setUDPConnection(){
int ret = FAIL;
int fnum = F_SETUP_RECEIVER_UDP;
char args[3][MAX_STR_LENGTH];
char args[3][MAX_STR_LENGTH]={"","",""};
char retval[MAX_STR_LENGTH]="";
//called before set up
@ -5806,7 +5806,7 @@ int slsDetector::configureMAC(){
int ret=FAIL;
int fnum=F_CONFIGURE_MAC,fnum2=F_RECEIVER_SHORT_FRAME;
char mess[MAX_STR_LENGTH]="";
char arg[6][50];
char arg[6][50]={"","","","","",""};
char cword[50]="", *pcword;
string sword;
int retval=-1;
@ -7141,7 +7141,7 @@ int slsDetector::setReceiverTCPSocket(string const name, int const receiver_port
string slsDetector::setFilePath(string s) {
int fnum = F_SET_RECEIVER_FILE_PATH;
int ret = FAIL;
char arg[MAX_STR_LENGTH];
char arg[MAX_STR_LENGTH]="";
char retval[MAX_STR_LENGTH] = "";
struct stat st;
@ -7192,7 +7192,7 @@ string slsDetector::setFilePath(string s) {
string slsDetector::setFileName(string s) {
int fnum=F_SET_RECEIVER_FILE_NAME;
int ret = FAIL;
char arg[MAX_STR_LENGTH];
char arg[MAX_STR_LENGTH]="";
char retval[MAX_STR_LENGTH]="";
if(!s.empty()){

6
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1586,11 +1586,11 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int resetFramesCaught();
/**
* Create Receiving Data Threads
* @param destroy is true to destroy all the threads
* Create Receiving Data Sockets
* @param destroy is true to destroy all the sockets
* @return OK or FAIL
*/
int createReceivingDataThreads(bool destroy = false){return 0;};
int createReceivingDataSockets(bool destroy = false){return 0;};
/** Reads frames from receiver through a constant socket

6
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -656,11 +656,11 @@ virtual int getReceiverCurrentFrameIndex()=0;
virtual int resetFramesCaught()=0;
/**
* Create Receiving Data Threads
* @param destroy is true to destroy all the threads
* Create Receiving Data Sockets
* @param destroy is true to destroy all the sockets
* @return OK or FAIL
*/
virtual int createReceivingDataThreads(bool destroy = false)=0;
virtual int createReceivingDataSockets(bool destroy = false)=0;
/** Reads frames from receiver through a constant socket