detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-15 14:27:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'moench' of https://github.com/slsdetectorgroup/slsDetectorPackage into moench

Browse Source
This commit is contained in:
bergamaschi
2020-04-17 17:24:01 +02:00
parent 5710dda12a a510010b27
commit 8096d4078c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsReceiverSoftware/src/Listener.cpp
View File

@ -64,9 +64,11 @@ Listener::Listener(int ind, detectorType dtype, Fifo*& f, runStatus* s,
Listener::~Listener() { Listener::~Listener() {
if (udpSocket) delete udpSocket; if (udpSocket) {
sem_post(&semaphore_socket); delete udpSocket;
sem_destroy(&semaphore_socket); sem_post(&semaphore_socket);
sem_destroy(&semaphore_socket);
}
if (carryOverPacket) delete [] carryOverPacket; if (carryOverPacket) delete [] carryOverPacket;
if (listeningPacket) delete [] listeningPacket; if (listeningPacket) delete [] listeningPacket;
ThreadObject::DestroyThread(); ThreadObject::DestroyThread();
@ -228,7 +230,9 @@ void Listener::ShutDownUDPSocket() {
FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber; FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber;
fflush(stdout); fflush(stdout);
//delete socket at stoplistening //delete socket at stoplistening
sem_wait(&semaphore_socket); if (runningFlag) {
sem_wait(&semaphore_socket);
}
delete udpSocket; delete udpSocket;
udpSocket = 0; udpSocket = 0;
sem_destroy(&semaphore_socket); sem_destroy(&semaphore_socket);