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

resolved client side memory leak caused from gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-03-04 16:24:03 +01:00
parent 24b9402e52
commit cdd18182a8
4 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -475,10 +475,10 @@ void* postProcessing::processData(int delflag) {
}
if (fdata) {
cout << "delete fdata "<< endl;
//cout << "delete fdata "<< endl;
delete [] fdata;
cout << "delete done "<< endl;
fdata = NULL;
//cout << "delete done "<< endl;
}
}
//receiver
@ -535,6 +535,8 @@ void* postProcessing::processData(int delflag) {
#ifdef VERY_VERY_DEBUG
cout << "currentfIndex:" << currentfIndex << endl;
#endif
/** IF detector acquisition is done, let the acquire() thread know to finish up and force join thread */
if(acquiringDone > 0){
#ifdef VERY_VERY_DEBUG
@ -579,6 +581,7 @@ void* postProcessing::processData(int delflag) {
//get data
strcpy(currentfName,"");
pthread_mutex_lock(&mg);
//int* receiverData = new int [getTotalNumberOfChannels()];
int* receiverData = readFrameFromReceiver(currentfName,currentfIndex);
pthread_mutex_unlock(&mg);
@ -599,7 +602,13 @@ void* postProcessing::processData(int delflag) {
}*/
//not garbage frame
if (currentfIndex >= 0) {
if(currentfIndex < 0){
#ifdef VERY_VERY_DEBUG
cout<<"****Detector returned mismatched indices/garbage or acquisition is over. Trying again.***"<<endl;
#endif
if(receiverData)
delete [] receiverData;
}else{
#ifdef VERY_VERY_DEBUG
cout<<"GOT data"<<endl;
#endif
@ -622,11 +631,6 @@ void* postProcessing::processData(int delflag) {
#endif
}
}
#ifdef VERY_VERY_DEBUG
else{
cout<<"****Detector returned mismatched indices/garbage or acquisition is over. Trying again.***"<<endl;
}
#endif
}
}
}