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

almost

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-15 12:16:08 +02:00
parent 3ed738b949
commit 7d86e62045
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -450,10 +450,12 @@ void UDPStandardImplementation::setFileName(const char c[]){
createDataCallbackThreads(true);
zmqThreadStarted = false;
}
cout<<"***datacallback threads destroyed"<<endl;
numberofDataCallbackThreads = MAX_NUMBER_OF_LISTENING_THREADS;
if(createDataCallbackThreads() == FAIL){
cprintf(BG_RED,"Error: Could not create data callback threads\n");
}
cout<<"data call back threads created"<<endl;
}
@ -1684,7 +1686,7 @@ void UDPStandardImplementation::startDataCallback(){cprintf(MAGENTA,"start data
/**suing this in clientzmq_msg_more,
* in serve use zmq_msg_send (&message, sender, ZMQ_SNDMORE); and 0 for last packet, but better to check lengt*/
zmq_send (zmqsocket, "end", 3, 0);
cprintf(BLUE,"sent done\n");
pthread_mutex_lock(&statusMutex);
dataCallbackThreadsMask^=(1<<ithread);
@ -1740,6 +1742,7 @@ void UDPStandardImplementation::startDataCallback(){cprintf(MAGENTA,"start data
}/*--end of loop for each buffer (inner loop)*/
//free resources
usleep(1000*1000);
delete[] buffer;
zmq_unbind(zmqsocket, hostName);
zmq_close(zmqsocket);

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -877,10 +877,8 @@ int slsReceiverTCPIPInterface::stop_receiver(){
else{
if(receiverBase->getStatus()==RUNNING || receiverBase->getStatus()==TRANSMITTING){
receiverBase->stopReceiver();
cout<<"receiver stopped"<<endl;
}
s = receiverBase->getStatus();
cout<<"to stop, receiver status:"<<s<<endl;
if(s==IDLE)
ret = OK;
else{