From bf7da5f4939d5fd265e37f408b11c3a7ab22c79f Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 13 Nov 2012 08:38:18 +0000
Subject: [PATCH] closeDataFile is only for gotthard and included lock for
 socket while using receiver

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../MySocketTCP/genericSocket.h               | 197 +++++++++---------
 .../slsDetector/slsDetector.cpp               |   2 +-
 .../slsDetector/slsDetectorUtils.cpp          |  49 +++--
 .../slsDetectorAnalysis/fileIO.cpp            |   4 +-
 .../slsDetectorAnalysis/postProcessing.cpp    |  19 +-
 .../slsReceiver/slsReceiverFunctionList.c     |   2 +-
 .../slsReceiver/slsReceiver_funcs.c           |   3 +-
 7 files changed, 153 insertions(+), 123 deletions(-)

diff --git a/slsDetectorSoftware/MySocketTCP/genericSocket.h b/slsDetectorSoftware/MySocketTCP/genericSocket.h
index b380cd181..829d3a606 100644
--- a/slsDetectorSoftware/MySocketTCP/genericSocket.h
+++ b/slsDetectorSoftware/MySocketTCP/genericSocket.h
@@ -89,6 +89,10 @@ enum communicationProtocol{
  genericSocket(const char* const host_ip_or_name, unsigned short int const port_number, communicationProtocol p) : 
    portno(port_number), protocol(p), is_a_server(0), socketDescriptor(-1),file_des(-1), packet_size(DEFAULT_PACKET_SIZE)// sender (client): where to? ip 
    { 
+	  pthread_mutex_t mp1 = PTHREAD_MUTEX_INITIALIZER;
+	  mp=mp1;
+	  pthread_mutex_init(&mp, NULL);
+
      strcpy(hostname,host_ip_or_name);
      struct hostent *hostInfo = gethostbyname(host_ip_or_name);
      if (hostInfo == NULL){
@@ -237,92 +241,96 @@ enum communicationProtocol{
  /** @short etablishes connection; disconnect should always follow
 	 \returns 1 if error
      */
-     int  Connect(){
+     int  Connect(){//cout<<"connect"<<endl;
 
-       if(file_des>0) return file_des;
+     if(file_des>0) return file_des;
 
-       if(is_a_server && protocol==TCP){ //server tcp; the server will wait for the clients connection
-	 if (socketDescriptor>0) {
-	   if ((file_des = accept(socketDescriptor,(struct sockaddr *) &clientAddress, &clientAddress_length)) < 0) {
-	     cerr << "Error: with server accept, connection refused"<<endl;
-	     switch(errno) {
-	     case EWOULDBLOCK:
-	       printf("ewouldblock eagain\n");
-	       break;
-	     case EBADF:
-	       printf("ebadf\n");
-	       break;
-	     case ECONNABORTED:
-	       printf("econnaborted\n");
-	       break;
-	     case EFAULT:
-	       printf("efault\n");
-	       break;
-	     case EINTR:
-	       printf("eintr\n");
-	       break;
-	     case EINVAL:
-	       printf("einval\n");
-	       break;
-	     case EMFILE: 
-	       printf("emfile\n");
-	       break;
-	     case ENFILE:
-	       printf("enfile\n");
-	       break;
-	     case ENOTSOCK:
-	       printf("enotsock\n");
-	       break;
-	     case EOPNOTSUPP:
-	       printf("eOPNOTSUPP\n");
-	       break;
-	     case ENOBUFS:
-	       printf("ENOBUFS\n");
-	       break;
-	     case ENOMEM:
-	       printf("ENOMEM\n");
-	       break;
-	     case ENOSR:
-	       printf("ENOSR\n");
-	       break;
-	     case EPROTO:
-	       printf("EPROTO\n");
-	       break;
-	     default:
-	       printf("unknown error\n");
-	     }
-	     socketDescriptor=-1;
-	   } 
+     if(is_a_server && protocol==TCP){ //server tcp; the server will wait for the clients connection
+    	 if (socketDescriptor>0) {
+    		 if ((file_des = accept(socketDescriptor,(struct sockaddr *) &clientAddress, &clientAddress_length)) < 0) {
+    			 cerr << "Error: with server accept, connection refused"<<endl;
+    			 switch(errno) {
+    			 case EWOULDBLOCK:
+    				 printf("ewouldblock eagain\n");
+    				 break;
+    			 case EBADF:
+    				 printf("ebadf\n");
+    				 break;
+    			 case ECONNABORTED:
+    				 printf("econnaborted\n");
+    				 break;
+    			 case EFAULT:
+    				 printf("efault\n");
+    				 break;
+    			 case EINTR:
+    				 printf("eintr\n");
+    				 break;
+    			 case EINVAL:
+    				 printf("einval\n");
+    				 break;
+    			 case EMFILE:
+    				 printf("emfile\n");
+    				 break;
+    			 case ENFILE:
+    				 printf("enfile\n");
+    				 break;
+    			 case ENOTSOCK:
+    				 printf("enotsock\n");
+    				 break;
+    			 case EOPNOTSUPP:
+    				 printf("eOPNOTSUPP\n");
+    				 break;
+    			 case ENOBUFS:
+    				 printf("ENOBUFS\n");
+    				 break;
+    			 case ENOMEM:
+    				 printf("ENOMEM\n");
+    				 break;
+    			 case ENOSR:
+    				 printf("ENOSR\n");
+    				 break;
+    			 case EPROTO:
+    				 printf("EPROTO\n");
+    				 break;
+    			 default:
+    				 printf("unknown error\n");
+    			 }
+    			 socketDescriptor=-1;
+    		 }
 #ifdef VERY_VERBOSE
-	   else 
-	     cout << "client connected "<< file_des << endl;
+    		 else
+    			 cout << "client connected "<< file_des << endl;
 #endif
-	   
-	 }
-	 // file_des = socketDescriptor;
-	 
-#ifdef VERY_VERBOSE
-	 cout << "fd " << file_des  << endl; 
-#endif
-       } else {  
-	 if (socketDescriptor<=0)
-	   socketDescriptor = socket(AF_INET, getProtocol(),0);  
-	 //    SetTimeOut(10);
-	 if (socketDescriptor < 0){
-	   cerr << "Can not create socket "<<endl;
-	   file_des = socketDescriptor;
-	 } else {
-	   
-	   if(connect(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
-	     cerr << "Can not connect to socket "<<endl;
-	     file_des = -1;
-	   } else
-	     file_des = socketDescriptor;
-	 }
-	 
-       }
 
-       return file_des;
+    	 }
+    	 // file_des = socketDescriptor;
+
+#ifdef VERY_VERBOSE
+    	 cout << "fd " << file_des  << endl;
+#endif
+     } else {
+    	 if (socketDescriptor<=0)
+    		 socketDescriptor = socket(AF_INET, getProtocol(),0);
+    	 //    SetTimeOut(10);
+    	 if (socketDescriptor < 0){
+    		 cerr << "Can not create socket "<<endl;
+    		 file_des = socketDescriptor;
+    	 } else {
+
+    		 if(connect(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
+    			 cerr << "Can not connect to socket "<<endl;
+    			 file_des = -1;
+    		 } else{
+    			 file_des = socketDescriptor;
+    			 /*cout<<"locking"<<endl;
+    			 pthread_mutex_lock(&mp);
+    			 cout<<"locked"<<endl;*/
+    		 }
+    	 }
+
+     }
+
+     return file_des;
      }
 
 
@@ -330,17 +338,20 @@ enum communicationProtocol{
 
      /** @short free connection */
      void Disconnect(){
-       
-       if(file_des>=0){ //then was open
-	 if(is_a_server){ 
-	   close(file_des);
-	 }
-	 else { 
-      close(socketDescriptor);
-      socketDescriptor=-1;
-	 } 
-	 file_des=-1;
-       }
+
+    	 if(file_des>=0){ //then was open
+    		 if(is_a_server){
+    			 close(file_des);
+    		 }
+    		 else {
+    			 close(socketDescriptor);
+    			 socketDescriptor=-1;
+    		 }
+    		 file_des=-1;
+    		 /*cout<<"unlocking"<<endl;
+    		 pthread_mutex_unlock(&mp);
+    		 cout<<"unlocked"<<endl;*/
+    	 }
      }; 
 
 
@@ -580,6 +591,6 @@ enum communicationProtocol{
 
   int file_des;
 
-
+  pthread_mutex_t mp;
 };
 #endif
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 6f2d2ce81..eec9180ad 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -5715,7 +5715,7 @@ int* slsDetector::readFrameFromReceiver(){
 					std::cout<< "Received "<< n << " data bytes" << std::endl;
 #endif
 					if (n!=thisDetector->dataBytes+HEADERLENGTH) {
-						std::cout<<endl<< "wrong data size received: received " << n << " but expected " << thisDetector->dataBytes+HEADERLENGTH << std::endl;
+						std::cout<<endl<< "wrong data size received: received " << n << " but expected from receiver " << thisDetector->dataBytes+HEADERLENGTH << std::endl;
 						ret=FAIL;
 						delete [] origVal;
 						delete [] retval;
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index 2b31ce330..50243daca 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -240,21 +240,26 @@ void  slsDetectorUtils::acquire(int delflag){
 	    }
 
 	    if(receiver){
-	    	 //send receiver file name
-	    	 pthread_mutex_lock(&mp);
-	    	 createFileName();
-	    	  pthread_mutex_unlock(&mp);
-	    	 setFileName(fileIO::getFileName());
-	    	 if(setReceiverOnline()==OFFLINE_FLAG){
-	    		 stopReceiver();
-	    		 break;
-	    	 }
-	    	 //start receiver
-	    	 startReceiver();
-	    	 if(setReceiverOnline()==OFFLINE_FLAG){
-	    		 stopReceiver();
-	    		 break;
-	    	 }
+	    	//send receiver file name
+	    	pthread_mutex_lock(&mp);
+	    	createFileName();
+	    	pthread_mutex_unlock(&mp);
+
+	    	pthread_mutex_lock(&mg);
+	    	setFileName(fileIO::getFileName());
+	    	if(setReceiverOnline()==OFFLINE_FLAG){
+	    		stopReceiver();
+	    		pthread_mutex_unlock(&mg);
+	    		break;
+	    	}
+	    	//start receiver
+	    	startReceiver();
+	    	if(setReceiverOnline()==OFFLINE_FLAG){
+	    		stopReceiver();
+	    		pthread_mutex_unlock(&mg);
+	    		break;
+	    	}
+	    	pthread_mutex_unlock(&mg);
 	    }
 
 	    startAndReadAll();
@@ -290,6 +295,8 @@ void  slsDetectorUtils::acquire(int delflag){
 	  } else
 	    break;
 
+
+	  pthread_mutex_lock(&mg);
 	  if(setReceiverOnline()==OFFLINE_FLAG){
 	  // wait until data processing thread has finished the data
 
@@ -303,12 +310,16 @@ void  slsDetectorUtils::acquire(int delflag){
 	    usleep(100000);
 	  }
 
-	  if((*correctionMask)&(1<<WRITE_FILE))
-		  closeDataFile();
+	  if (getDetectorsType()==GOTTHARD)
+		  if((*correctionMask)&(1<<WRITE_FILE))
+			  closeDataFile();
 
 	  }else{
 		 while(stopReceiver()!=OK);
 	  }
+	  pthread_mutex_unlock(&mg);
+
+
 
 	  pthread_mutex_lock(&mp);
 	  if (*stoppedFlag==0) {
@@ -382,14 +393,14 @@ void  slsDetectorUtils::acquire(int delflag){
 
 
 
-
+	  pthread_mutex_lock(&mg);
 #ifdef VERBOSE
   cout << "findex incremented " << endl;
 #endif
   if(*correctionMask&(1<<WRITE_FILE))
     IncrementFileIndex();
   setFileIndex(fileIO::getFileIndex());
-
+  pthread_mutex_unlock(&mg);
 
 
     if (measurement_finished)
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
index 0913f8ffe..fb3e0b41a 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
@@ -119,10 +119,10 @@ return 0;
 
 
 
-int fileIO::closeDataFile() {fflush(stdout);
+int fileIO::closeDataFile() {cout<<"closing datafile: filfd:"<<filefd<<endl;
   if (filefd)
       fclose(filefd);
-    filefd=NULL;
+    filefd=NULL; cout<<"closed data file"<<endl;
     return 0;
 }
 
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index fed207d12..e08a888b7 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -13,8 +13,8 @@ postProcessing::postProcessing(): expTime(NULL), ang(NULL), val(NULL), err(NULL)
   pthread_mutex_t mp1 = PTHREAD_MUTEX_INITIALIZER;
   mp=mp1;
   pthread_mutex_init(&mp, NULL);  
-  //  mg=mp1;
-  // pthread_mutex_init(&mg, NULL);
+  mg=mp1;
+  pthread_mutex_init(&mg, NULL);
   //cout << "reg callback "<< endl;
   dataReady = 0;
   pCallbackArg = 0; 
@@ -99,10 +99,10 @@ void postProcessing::processFrame(int *myData, int delflag) {
      cout << "writing raw data " << endl;
      
 #endif
-     if (getDetectorsType()==MYTHEN){
+     if (getDetectorsType()==MYTHEN){cout<<"gonna write datafile"<<endl;
     // if (fdata) {
        //uses static function?!?!?!?
-       writeDataFile (fname+string(".raw"),fdata, NULL, NULL, 'i');
+       writeDataFile (fname+string(".raw"),fdata, NULL, NULL, 'i');cout<<"finished writing datafile"<<endl;
      } else {
        writeDataFile ((void*)myData, frameIndex);
      }
@@ -375,19 +375,28 @@ void* postProcessing::processData(int delflag) {
 	}
 	//receiver
 	else{
+		  pthread_mutex_lock(&mg);
 		int prevCaught=getCurrentFrameIndex();
+		 pthread_mutex_unlock(&mg);
+
 		int caught=0;
 		while(1){
 			if (checkJoinThread()) break;
 			usleep(200000);
+
+			  pthread_mutex_lock(&mg);
 			caught=getCurrentFrameIndex();
+			 pthread_mutex_unlock(&mg);
+
 			incrementProgress(caught-prevCaught);
 			prevCaught=caught;
 			if (checkJoinThread()) break;
 			//if(progress_call)
 			//	progress_call(getCurrentProgress(),pProgressCallArg);
-
+			  pthread_mutex_lock(&mg);
 			int* receiverData =  readFrameFromReceiver();
+			 pthread_mutex_unlock(&mg);
+
 			if(!receiverData)
 				return 0;
 			fdata=decodeData(receiverData);
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c
index 075c4b9dd..ece04472f 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c
@@ -398,7 +398,7 @@ char* readFrame(){
 
 	// memcpy(sendbuffer,buffer ,sizeof(buffer));
 
-	while (((int)*((int*)buffer))%2==0) ;//usleep(20000);
+	while (((int)*((int*)buffer))%2==0) {printf("checking\n");fflush(stdout);}//usleep(20000);
 
 		// memcpy(sendbuffer,buffer ,sizeof(buffer));
 
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.c b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.c
index c7fd2c618..e30d1dda7 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.c
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.c
@@ -449,7 +449,7 @@ int get_frames_caught(int file_des) {
 
 
 
-int get_frame_index(int file_des) {printf("Getting frame Index\n");fflush(stdout);
+int get_frame_index(int file_des) {
 	int ret=OK;
 	int n=0;
 	int retval=-1;
@@ -467,7 +467,6 @@ int get_frame_index(int file_des) {printf("Getting frame Index\n");fflush(stdout
 	/* send answer */
 	n = sendDataOnly(file_des,&ret,sizeof(ret));
 	n = sendDataOnly(file_des,&retval,sizeof(retval));
-	printf("returnrdf:%d\n",retval);
 	/*return ok/fail*/
 	return ret;
 }