changed the start and stop receiver error messages to be displayed to the client and not jsus recever

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/commonFiles/error_defs.h

@@ -26,15 +26,19 @@ using namespace std;
 #define COULDNOT_SET_CONTROL_PORT			0x2000000000000000ULL
 #define COULDNOT_SET_STOP_PORT				0x1000000000000000ULL
 #define COULDNOT_SET_DATA_PORT				0x0800000000000000ULL
+#define FILE_PATH_DOES_NOT_EXIST			0x0400000000000000ULL
+#define COULDNOT_CREATE_UDP_SOCKET			0x0200000000000000ULL
+#define COULDNOT_CREATE_FILE				0x0100000000000000ULL
 
 
 
 #define COULD_NOT_CONFIGURE_MAC				0x0000000000000001ULL
 #define COULDNOT_SET_NETWORK_PARAMETER		0x0000000000000002ULL
 #define COULDNOT_SET_ROI					0x0000000000000004ULL
-#define FILE_PATH_DOES_NOT_EXIST			0x0000000000000008ULL
-#define RECEIVER_READ_FREQUENCY				0x0000000000000010ULL
-#define SETTINGS_NOT_SET					0x0000000000000020ULL
+#define RECEIVER_READ_FREQUENCY				0x0000000000000008ULL
+#define SETTINGS_NOT_SET					0x0000000000000010ULL
+#define COULDNOT_START_RECEIVER				0x0000000000000020ULL // default error like starting threads
+#define COULDNOT_STOP_RECEIVER				0x0000000000000040ULL
 
 /** @short class returning all error messages for error mask */
 class errorDefs {
@@ -68,6 +72,16 @@ public:
 		if(slsErrorMask&COULDNOT_SET_DATA_PORT)
 			retval.append("Could not set receiver port\n");
 
+		if(slsErrorMask&FILE_PATH_DOES_NOT_EXIST)
+			retval.append("Path to Output Directory does not exist\n");
+
+		if(slsErrorMask&COULDNOT_CREATE_UDP_SOCKET)
+			retval.append("Could not create UDP socket to start receiver\n");
+
+		if(slsErrorMask&COULDNOT_CREATE_FILE)
+			retval.append("Could not create file to start receiver.\nCheck permissions of output directory\n");
+
+
 
 
 		if(slsErrorMask&COULD_NOT_CONFIGURE_MAC)
@@ -79,15 +93,19 @@ public:
 		if(slsErrorMask&COULDNOT_SET_ROI)
 			retval.append("Could not set the exact region of interest. Verify ROI set by detector.\n");
 
-		if(slsErrorMask&FILE_PATH_DOES_NOT_EXIST)
-			retval.append("Path to Output Directory does not exist.\n");
-
 		if(slsErrorMask&RECEIVER_READ_FREQUENCY)
 			retval.append("Could not set receiver read frequency.\n");
 
 		if(slsErrorMask&SETTINGS_NOT_SET)
 			retval.append("Could not set settings.\n");
 
+		if(slsErrorMask&COULDNOT_START_RECEIVER)
+			retval.append("Could not start receiver.\n");
+
+		if(slsErrorMask&COULDNOT_STOP_RECEIVER)
+			retval.append("Could not stop receiver.\n");
+
+
 		return retval;
 
 	}

slsDetectorSoftware/slsDetector/slsDetector.cpp

@@ -5938,15 +5938,24 @@ int slsDetector::setFileIndex(int i) {
 int slsDetector::startReceiver(){
 	int fnum=F_START_RECEIVER;
 	int ret = FAIL;
+	char mess[MAX_STR_LENGTH] = "";
 
 	if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) {
 #ifdef VERBOSE
 		std::cout << "Starting Receiver " << std::endl;
 #endif
 		if (connectData() == OK)
-			ret=thisReceiver->executeFunction(fnum);
+			ret=thisReceiver->executeFunction(fnum,mess);
 		if(ret==FORCE_UPDATE)
 			ret=updateReceiver();
+		else if (ret == FAIL){
+			if(strstr(mess,"UDP")!=NULL)
+				setErrorMask((getErrorMask())|(COULDNOT_CREATE_UDP_SOCKET));
+			else if(strstr(mess,"file")!=NULL)
+				setErrorMask((getErrorMask())|(COULDNOT_CREATE_FILE));
+			else
+				setErrorMask((getErrorMask())|(COULDNOT_START_RECEIVER));
+		}
 	}
 	if(ret==OK)
 		ret=detectorSendToReceiver(true);
@@ -5960,6 +5969,7 @@ int slsDetector::startReceiver(){
 int slsDetector::stopReceiver(){
 	int fnum=F_STOP_RECEIVER;
 	int ret = FAIL;
+	char mess[] = "";
 
 	detectorSendToReceiver(false);
 
@@ -5968,9 +5978,11 @@ int slsDetector::stopReceiver(){
 		std::cout << "Stopping Receiver " << std::endl;
 #endif
 		if (connectData() == OK)
-			ret=thisReceiver->executeFunction(fnum);
+			ret=thisReceiver->executeFunction(fnum,mess);
 		if(ret==FORCE_UPDATE)
 			ret=updateReceiver();
+		else if (ret == FAIL)
+			setErrorMask((getErrorMask())|(COULDNOT_STOP_RECEIVER));
 	}
 
 	return ret;
@@ -6080,13 +6092,14 @@ int slsDetector::getReceiverCurrentFrameIndex(){
 int slsDetector::resetFramesCaught(){
 	int fnum=F_RESET_FRAMES_CAUGHT;
 	int ret = FAIL;
+	char mess[] = "";
 
 	if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) {
 #ifdef VERBOSE
 		std::cout << "Reset Frames Caught by Receiver" << std::endl;
 #endif
 		if (connectData() == OK)
-			ret=thisReceiver->executeFunction(fnum);
+			ret=thisReceiver->executeFunction(fnum,mess);
 		if(ret==FORCE_UPDATE)
 			ret=updateReceiver();
 	}

slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp

@@ -266,8 +266,7 @@ void  slsDetectorUtils::acquire(int delflag){
 	    		break;
 	    	}
 	    	//start receiver
-	    	startReceiver();
-	    	if(setReceiverOnline()==OFFLINE_FLAG){
+	    	if((startReceiver() == FAIL) || (setReceiverOnline()==OFFLINE_FLAG)){
 	    		stopReceiver();
 	    		pthread_mutex_unlock(&mg);
 	    		break;

slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp

@@ -21,7 +21,7 @@
 using namespace std;
 
 FILE* slsReceiverFunctionList::sfilefd(NULL);
-int slsReceiverFunctionList::listening_thread_running(0);
+int slsReceiverFunctionList::receiver_threads_running(0);
 
 slsReceiverFunctionList::slsReceiverFunctionList(detectorType det,bool moenchwithGotthardTest):
 						myDetectorType(det),
@@ -39,6 +39,8 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det,bool moenchwit
 						acquisitionIndex(0),
 						framesInFile(0),
 						prevframenum(0),
+						listening_thread_running(0),
+						writing_thread_running(0),
 						status(IDLE),
 						latestData(NULL),
 						udpSocket(NULL),
@@ -106,6 +108,8 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det,bool moenchwit
 	if(withGotthard)
 		cout << "Testing MOENCH Receiver with GOTTHARD Detector" << endl;
 
+
+	pthread_mutex_init(&status_mutex,NULL);
 }
 
 
@@ -200,52 +204,100 @@ void slsReceiverFunctionList::resetTotalFramesCaught(){
 
 
 
-int slsReceiverFunctionList::startReceiver(){
+int slsReceiverFunctionList::startReceiver(char message[]){
 #ifdef VERBOSE
 	cout << "Starting Receiver" << endl;
 #endif
 	cout << endl;
 
 	int err = 0;
-	if(!listening_thread_running){
+	if(!receiver_threads_running){
 #ifdef VERBOSE
 		cout << "Starting new acquisition threadddd ...." << endl;
 #endif
-		listening_thread_running=1;
+		//change status
+		while(1){
+			if(!pthread_mutex_trylock(&(status_mutex))){
+				status = IDLE;
+				listening_thread_running = 0;
+				writing_thread_running = 0;
+				receiver_threads_running = 1;
+				pthread_mutex_unlock(&(status_mutex));
+				break;
+			}
+		}
 
+		// creating listening thread----------
+		err = pthread_create(&listening_thread, NULL,startListeningThread, (void*) this);
+		if(err){
+			//change status
+			while(1){
+				if(!pthread_mutex_trylock(&(status_mutex))){
+					status = IDLE;
+					listening_thread_running = 0;
+					receiver_threads_running = 0;
+					pthread_mutex_unlock(&(status_mutex));
+					break;
+				}
+			}
+			sprintf(message,"Cant create listening thread. Status:%d\n",status);
+			cout << endl << message << endl;
+			return FAIL;
+		}
+		//wait till udp socket created
+		while(!listening_thread_running);
+		if(listening_thread_running!=1){
+			strcpy(message,"Could not create UDP Socket.\n");
+			return FAIL;
+		}
+#ifdef VERBOSE
+				cout << "Listening thread created successfully." << endl;
+#endif
 
-		// creating writing thread
+		// creating writing thread----------
+		err = 0;
 		err = pthread_create(&writing_thread, NULL,startWritingThread, (void*) this);
 		if(err){
-			listening_thread_running=0;
+			//change status
+			while(1){
+				if(!pthread_mutex_trylock(&(status_mutex))){
 					status = IDLE;
-			cout << "Cant create writing thread. Status:" << status << endl << endl;
+					writing_thread_running = 0;
+					receiver_threads_running = 0;
+					pthread_mutex_unlock(&(status_mutex));
+					break;
+				}
+			}
+			//stop listening thread
+			pthread_join(listening_thread,NULL);
+			sprintf(message,"Cant create writing thread. Status:%d\n",status);
+			cout << endl << message << endl;
+			return FAIL;
+		}
+		//wait till file is created
+		while(!writing_thread_running);
+		if(writing_thread_running!=1){
+			sprintf(message,"Could not create file %s.\n",savefilename);
 			return FAIL;
 		}
 #ifdef VERBOSE
 		cout << "Writing thread created successfully." << endl;
 #endif
 
-		// creating listenign thread
-		err = 0;
-		err = pthread_create(&listening_thread, NULL,startListeningThread, (void*) this);
-		if(err){
-			listening_thread_running=0;
-			status = IDLE;
-			//stop writing thread
-			pthread_join(writing_thread,NULL);
-			cout << endl << "Cant create listening thread. Status:" << status << endl << endl;
-			return FAIL;
+
+		//change status----------
+		while(1){
+			if(!pthread_mutex_trylock(&(status_mutex))){
+				status = RUNNING;
+				pthread_mutex_unlock(&(status_mutex));
+				break;
+			}
 		}
-
-		while(status!=RUNNING);
-#ifdef VERBOSE
-		cout << "Listening thread created successfully." << endl;
-#endif
-
 		cout << "Threads created successfully." << endl;
 
 
+
+
 		struct sched_param tcp_param, listen_param, write_param;
 		int policy= SCHED_RR;
 
@@ -280,22 +332,31 @@ int slsReceiverFunctionList::stopReceiver(){
 	cout << "Stopping Receiver" << endl;
 #endif
 
-	if(listening_thread_running){
+	if(receiver_threads_running){
 #ifdef VERBOSE
 		cout << "Stopping new acquisition threadddd ...." << endl;
 #endif
 		//stop listening thread
-		listening_thread_running=0;
+		while(1){
+			if(!pthread_mutex_trylock(&(status_mutex))){
+				receiver_threads_running=0;
+				pthread_mutex_unlock(&(status_mutex));
+				break;
+			}
+		}
 		if(udpSocket) udpSocket->ShutDownSocket();
 		pthread_join(listening_thread,NULL);
-		status = IDLE;
-
-		//stop writing thread
 		pthread_join(writing_thread,NULL);
 	}
-	cout << "Receiver Stoppped.\nStatus:" << status << endl;
-
-
+	//change status
+	while(1){
+		if(!pthread_mutex_trylock(&(status_mutex))){
+			status = IDLE;
+			pthread_mutex_unlock(&(status_mutex));
+			break;
+		}
+	}
+	cout << "Receiver Stopped.\nStatus:" << status << endl;
 	return OK;
 }
 
@@ -320,7 +381,6 @@ int slsReceiverFunctionList::startListening(){
 #ifdef VERYVERBOSE
 	cout << "In startListening()\n");
 #endif
-
 	int rc;
 
 	measurementStarted = false;
@@ -349,13 +409,26 @@ int slsReceiverFunctionList::startListening(){
 #ifdef VERBOSE
 			std::cout<< "Could not create UDP socket "<< server_port  << std::endl;
 #endif
+			while(1){
+				if(!pthread_mutex_trylock(&(status_mutex))){
+					listening_thread_running = -1;
+					pthread_mutex_unlock(&(status_mutex));
+					break;
+				}
+			}
 			break;
 		}
 
 
 
-		while (listening_thread_running) {
-			status = RUNNING;
+		while (receiver_threads_running) {
+			while(1){
+				if(!pthread_mutex_trylock(&(status_mutex))){
+					listening_thread_running = 1;
+					pthread_mutex_unlock(&(status_mutex));
+					break;
+				}
+			}
 			if (!fifofree->isEmpty()) {
 				fifofree->pop(buffer);
 
@@ -388,7 +461,7 @@ int slsReceiverFunctionList::startListening(){
 
 
 				//so that it doesnt write the last frame twice
-				if(listening_thread_running){
+				if(receiver_threads_running){
 					//s.assign(buffer);
 					if(fifo->isFull())
 						;//cout<<"**********************FIFO FULLLLLLLL************************"<<endl;
@@ -402,15 +475,21 @@ int slsReceiverFunctionList::startListening(){
 				}
 			}
 		}
-	} while (listening_thread_running);
-	listening_thread_running=0;
+	} while (receiver_threads_running);
+	while(1){
+		if(!pthread_mutex_trylock(&(status_mutex))){
+			receiver_threads_running=0;
 			status = IDLE;
+			pthread_mutex_unlock(&(status_mutex));
+			break;
+		}
+	}
 
 	//Close down any open socket descriptors
 	udpSocket->Disconnect();
 
 #ifdef VERBOSE
-	cout << "listening_thread_running:" << listening_thread_running << endl;
+	cout << "receiver_threads_running:" << receiver_threads_running << endl;
 #endif
 
 	return 0;
@@ -470,7 +549,7 @@ int slsReceiverFunctionList::startWriting(){
 
 
 	cout << "Ready!" << endl;
-	while(listening_thread_running || (!fifo->isEmpty())){
+	while(receiver_threads_running || (!fifo->isEmpty())){
 
 		//start a new file
 		if ((framesInFile == maxFramesPerFile)  || (strlen(savefilename) == 0)){
@@ -488,6 +567,13 @@ int slsReceiverFunctionList::startWriting(){
 
 				if (NULL == (sfilefd = fopen((const char *) (savefilename), "w"))){
 					cout << "Error: Could not create file " << savefilename << endl;
+					while(1){
+						if(!pthread_mutex_trylock(&(status_mutex))){
+							writing_thread_running = -1;
+							pthread_mutex_unlock(&(status_mutex));
+							break;
+						}
+					}
 					break;
 				}
 
@@ -512,6 +598,14 @@ int slsReceiverFunctionList::startWriting(){
 				}
 			}
 
+			while(1){
+				if(!pthread_mutex_trylock(&(status_mutex))){
+					writing_thread_running = 1;
+					pthread_mutex_unlock(&(status_mutex));
+					break;
+				}
+			}
+
 			//if(prevframenum != 0){
 			if(framesCaught){
 				prevframenum = currframenum;
@@ -567,7 +661,7 @@ int slsReceiverFunctionList::startWriting(){
 						frameFactor = nFrameToGui-1;
 						//catch nth frame: gui ready to copy data
 						while(guiData==NULL){
-							if(!listening_thread_running)
+							if(!receiver_threads_running)
 								break;
 							usleep(10000);
 							guiDataReady=0;
@@ -580,7 +674,7 @@ int slsReceiverFunctionList::startWriting(){
 
 						//catch nth frame: wait for gui to take data
 						while(guiData==latestData){
-							if(!listening_thread_running)
+							if(!receiver_threads_running)
 								break;
 							usleep(100000);
 						}
@@ -598,7 +692,14 @@ int slsReceiverFunctionList::startWriting(){
 			usleep(50000);
 		}
 	}
-	listening_thread_running = 0;
+
+	while(1){
+		if(!pthread_mutex_trylock(&(status_mutex))){
+			receiver_threads_running=0;
+			pthread_mutex_unlock(&(status_mutex));
+			break;
+		}
+	}
 	cout << "Total Frames Caught:"<< totalFramesCaught << endl;
 
 

slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h

@@ -144,9 +144,10 @@ public:
 
 	/**
 	 * Starts Receiver - starts to listen for packets
+	 * @param message is the error message if there is an error
 	 * Returns success
 	 */
-	int startReceiver();
+	int startReceiver(char message[]);
 
 	/**
 	 * Stops Receiver - stops listening for packets
@@ -263,6 +264,15 @@ private:
 	/** thread writing packets */
 	pthread_t   writing_thread;
 
+	/** mutex for locking variable used by different threads */
+	pthread_mutex_t status_mutex;
+
+	/** listening thread running */
+	int listening_thread_running;
+
+	/** writing thread running */
+	int writing_thread_running;
+
 	/** status of receiver */
 	runStatus status;
 
@@ -383,8 +393,8 @@ public:
 	/** File Descriptor */
 	static FILE *sfilefd;
 
-	/** if the listening thread is running*/
-	static int listening_thread_running;
+	/** if the receiver threads are running*/
+	static int receiver_threads_running;
 
 
 	/**

slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp

@@ -30,12 +30,12 @@ slsReceiverFuncs::~slsReceiverFuncs() {
 
 slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
 		myDetectorType(GOTTHARD),
-		socket(NULL),
 		ret(OK),
 		lockStatus(0),
 		shortFrame(-1),
 		packetsPerFrame(GOTTHARD_PACKETS_PER_FRAME),
-		withGotthard(0){
+		withGotthard(0),
+		socket(NULL){
 
 	int port_no = DEFAULT_PORTNO+2;
 	ifstream infile;
@@ -348,7 +348,7 @@ int slsReceiverFuncs::M_nofunc(){
 void slsReceiverFuncs::closeFile(int p){
 
 
-	if(slsReceiverFunctionList::listening_thread_running)
+	if(slsReceiverFunctionList::receiver_threads_running)
 		fclose(slsReceiverFunctionList::sfilefd);
 
 
@@ -670,7 +670,6 @@ int slsReceiverFuncs::setup_udp(){
 
 int slsReceiverFuncs::start_receiver(){
 	ret=OK;
-
 	strcpy(mess,"Could not start receiver\n");
 
 	// execute action if the arguments correctly arrived
@@ -686,7 +685,7 @@ int slsReceiverFuncs::start_receiver(){
 	}
 	*/
 	else if(slsReceiverList->getStatus()!=RUNNING)
-		ret=slsReceiverList->startReceiver();
+		ret=slsReceiverList->startReceiver(mess);
 #endif
 
 	if(ret==OK && socket->differentClients){

slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp

@@ -117,15 +117,13 @@ int receiverInterface::getLastClientIP(int fnum, char retval[]){
 
 
 
-int receiverInterface::executeFunction(int fnum){
-
+int receiverInterface::executeFunction(int fnum,char mess[]){
 	int ret = slsDetectorDefs::FAIL;
-	char mess[100] = "";
 
 	dataSocket->SendDataOnly(&fnum,sizeof(fnum));
 	dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
 	if (ret==slsDetectorDefs::FAIL){
-		dataSocket->ReceiveDataOnly(mess,sizeof(mess));
+		dataSocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
 		std::cout<< "Receiver returned error: " << mess << std::endl;
 	}
 	dataSocket->Disconnect();

slsDetectorSoftware/slsReceiverInterface/receiverInterface.h

@@ -97,9 +97,10 @@ public:
 	/**
 	 * Send a function number to execute function
 	 * @param fnum function enum to determine which function to execute
+	 * @param mess return error message
 	 * \returns success of operation
 	 */
-	int executeFunction(int fnum);
+	int executeFunction(int fnum,char mess[]);
 
 	//here one should implement the funcs listed in