From 82884370b5237c4d9bcc0298877500b1f1502a3a Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 18 Oct 2016 14:05:05 +0200 Subject: [PATCH] back --- slsReceiverSoftware/src/UDPStandardImplementation.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 85d14ab52..f9e38ec03 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -1673,8 +1673,7 @@ void UDPStandardImplementation::startDataCallback(){ //socket details void *context = zmq_ctx_new(); void *zmqsocket = zmq_socket(context, ZMQ_PUSH); // create a publisher - /*int val = -1;*/ - int val = 4; + int val = -1; zmq_setsockopt(zmqsocket, ZMQ_LINGER, &val,sizeof(val)); // wait for the unsent packets before closing socket //val = 10; //zmq_setsockopt(zmqsocket,ZMQ_SNDHWM,&val,sizeof(val)); //set SEND HIGH WATER MARK (8-9ms slower) @@ -1754,7 +1753,7 @@ void UDPStandardImplementation::startDataCallback(){ } - /* + //send final header //update frame details #ifdef DEBUG @@ -1767,7 +1766,7 @@ void UDPStandardImplementation::startDataCallback(){ zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); //send final data zmq_send (zmqsocket, "end", 3, 0); - */ + pthread_mutex_lock(&statusMutex); dataCallbackThreadsMask^=(1<