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

in between

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-16 13:42:29 +02:00
parent f50f4752dd
commit b440c11a46
1 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -833,47 +833,46 @@ int UDPStandardImplementation::startReceiver(char *c){
FILE_LOG(logINFO) << "Stopping Receiver"; FILE_LOG(logINFO) << "Stopping Receiver";
//reseting variables
//RESET
//reset measurement variables
pthread_mutex_lock(&progressMutex); pthread_mutex_lock(&progressMutex);
measurementStarted = false; measurementStarted = false;
pthread_mutex_unlock(&progressMutex); pthread_mutex_unlock(&progressMutex);
//for every acquisition start (not every scan)
for(int i=0;i<numberofListeningThreads;i++)
startFrameIndex[i] = 0;
for(int i=0;i<numberofWriterThreads;i++)
frametoGuiCounter[i] = 0;
frameIndex[i] = 0;
if(!acqStarted){ if(!acqStarted){
pthread_mutex_lock(&progressMutex); pthread_mutex_lock(&progressMutex);
acquisitionIndex = 0; acquisitionIndex = 0;
pthread_mutex_unlock(&progressMutex); pthread_mutex_unlock(&progressMutex);
currentFrameNumber = 0; //has to be zero to add to startframeindex for each scan for(int i=0;i<numberofWriterThreads;i++){
frameIndex = 0; currentFrameNumber[i] = 0; //has to be zero to add to startframeindex for each scan
frameIndex[i] = 0;
}
} }
for(int i = 0; i < numberofListeningThreads; ++i) for(int i=0;i<numberofListeningThreads;i++){
startFrameIndex[i] = 0;
totalListeningFrameCount[i] = 0; totalListeningFrameCount[i] = 0;
packetsCaught = 0;
numMissingPackets = 0;
numTotMissingPackets = 0;
numTotMissingPacketsInFile = 0;
//reset file parameters
packetsInFile = 0;
if(sfilefd){
fclose(sfilefd);
sfilefd = NULL;
} }
//reset gui variables for(int i=0;i<numberofWriterThreads;i++){
guiData = NULL; frametoGuiCounter[i] = 0;
guiDataReady=0; frameIndex[i] = 0;
strcpy(guiFileName,""); numMissingPackets[i] = 0;
numTotMissingPackets[i] = 0;
numTotMissingPacketsInFile[i] = 0;
//reset file parameters
packetsInFile[i] = 0;
if(sfilefd[i]){
fclose(sfilefd[i]);
sfilefd[i] = NULL;
}
//reset gui variables
guiData[i] = NULL;
guiDataReady[i]=0;
strcpy(guiFileName[i],"");
}
pthread_mutex_lock(&writeMutex);
packetsCaught = 0;
pthread_mutex_unlock(&writeMutex);
//reset masks //reset masks
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
writerThreadsMask = 0x0; writerThreadsMask = 0x0;
@ -882,6 +881,7 @@ int UDPStandardImplementation::startReceiver(char *c){
pthread_mutex_unlock(&statusMutex); pthread_mutex_unlock(&statusMutex);
//Print Receiver Configuration //Print Receiver Configuration
if(myDetectorType != EIGER){ if(myDetectorType != EIGER){
FILE_LOG(logINFO) << "Data Compression has been " << stringEnable(dataCompressionEnable); FILE_LOG(logINFO) << "Data Compression has been " << stringEnable(dataCompressionEnable);
@ -905,31 +905,37 @@ int UDPStandardImplementation::startReceiver(char *c){
if(setupWriter() == FAIL){ if(setupWriter() == FAIL){
//stop udp socket //stop udp socket
shutDownUDPSockets(); shutDownUDPSockets();
sprintf(c,"Could not create file %s.",completeFileName); sprintf(c,"Could not create file");
//FILE_LOG(logERROR) << c; //FILE_LOG(logERROR) << c;
for(int i=0; i < numberofWriterThreads; i++) sem_post(&writerSemaphore[i]); for(int i=0; i < numberofWriterThreads; i++)
sem_post(&writerSemaphore[i]);
return FAIL; return FAIL;
} }
//For compression, just for gui purposes //For compression, just for gui purposes
if(dataCompressionEnable) if(dataCompressionEnable)
sprintf(completeFileName, "%s/%s_fxxx_%lld_xx.root", filePath,fileName,(long long int)fileIndex); sprintf(completeFileName[0], "%s/%s_fxxx_%lld_xx.root", filePath,fileName,(long long int)fileIndex);
//initialize semaphore to synchronize between writer and gui reader threads //initialize semaphore to synchronize between writer and gui reader threads
sem_init(&writerGuiSemaphore,1,0); for(int i=0;i<numberofWriterThreads;i++)
sem_init(&writerGuiSemaphore[i],1,0);
//status and thread masks //status and thread masks
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
status = RUNNING; status = RUNNING;
for(int i=0;i<numberofListeningThreads;i++) listeningThreadsMask|=(1<<i); for(int i=0;i<numberofListeningThreads;i++)
for(int i=0;i<numberofWriterThreads;i++) writerThreadsMask|=(1<<i); listeningThreadsMask|=(1<<i);
for(int i=0;i<numberofWriterThreads;i++)
writerThreadsMask|=(1<<i);
pthread_mutex_unlock(&(statusMutex)); pthread_mutex_unlock(&(statusMutex));
//start listening /writing //start listening /writing
for(int i=0;i<numberofListeningThreads;i++) sem_post(&listenSemaphore[i]); for(int i=0;i<numberofListeningThreads;i++)
for(int i=0; i < numberofWriterThreads; i++) sem_post(&writerSemaphore[i]); sem_post(&listenSemaphore[i]);
for(int i=0; i < numberofWriterThreads; i++)
sem_post(&writerSemaphore[i]);
FILE_LOG(logINFO) << "Receiver Started"; FILE_LOG(logINFO) << "Receiver Started";
FILE_LOG(logINFO) << "Status: " << runStatusType(status); FILE_LOG(logINFO) << "Status: " << runStatusType(status);