From d3c807975ff8a984de790c7f8519d38c26ee3df8 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 12 Apr 2018 15:50:27 +0200
Subject: [PATCH] adding a semaphore to handle end of acq

---
 slsReceiverSoftware/include/Listener.h |  3 +++
 slsReceiverSoftware/src/Listener.cpp   | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/slsReceiverSoftware/include/Listener.h b/slsReceiverSoftware/include/Listener.h
index 217ea41e8..33c15d61c 100644
--- a/slsReceiverSoftware/include/Listener.h
+++ b/slsReceiverSoftware/include/Listener.h
@@ -293,6 +293,9 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/** if the udp socket is connected */
 	bool udpSocketAlive;
 
+    /** Semaphore to synchonize deleting udp socket */
+    sem_t semaphore_socket;
+
 
 	// for print progress during acqusition
 	/** number of packets for statistic */
diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp
index 2ec7c9254..6847f3f84 100644
--- a/slsReceiverSoftware/src/Listener.cpp
+++ b/slsReceiverSoftware/src/Listener.cpp
@@ -60,12 +60,13 @@ Listener::Listener(detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno,
 	}
 	NumberofListeners++;
 	FILE_LOG(logDEBUG) << "Number of Listeners: " << NumberofListeners;
-
 }
 
 
 Listener::~Listener() {
 	if (udpSocket) delete udpSocket;
+	sem_post(&semaphore_socket);
+    sem_destroy(&semaphore_socket);
 	if (carryOverPacket) delete [] carryOverPacket;
 	if (listeningPacket) delete [] listeningPacket;
 	ThreadObject::DestroyThread();
@@ -230,6 +231,7 @@ int Listener::CreateUDPSockets() {
 		return FAIL;
 	}
 	udpSocketAlive = true;
+    sem_init(&semaphore_socket,1,0);
 	return OK;
 }
 
@@ -242,6 +244,10 @@ void Listener::ShutDownUDPSocket() {
 		FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber;
 		fflush(stdout);
 		//delete socket at stoplistening
+	    sem_wait(&semaphore_socket);
+        delete udpSocket;
+        udpSocket = 0;
+	    sem_destroy(&semaphore_socket);
 	}
 }
 
@@ -311,10 +317,8 @@ void Listener::StopListening(char* buf) {
 	(*((uint32_t*)buf)) = DUMMY_PACKET_VALUE;
 	fifo->PushAddress(buf);
 	StopRunning();
-	if (udpSocket) {
-		delete udpSocket;
-		udpSocket = 0;
-	}
+
+	 sem_post(&semaphore_socket);
 #ifdef VERBOSE
 	cprintf(GREEN,"%d: Listening Packets (%u) : %llu\n", index, *udpPortNumber, numPacketsCaught);
 	cprintf(GREEN,"%d: Listening Completed\n", index);