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

CMakeLists.txt

@@ -26,8 +26,12 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ")
 
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
+# set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
-set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
+# set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+
+
 
 find_package(Qt4)
 find_package(Qwt 6)

slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h

@@ -20,7 +20,7 @@ class multiSlsDetectorClient  {
 public:
 	multiSlsDetectorClient(int argc, char *argv[], int action, multiSlsDetector *myDetector=NULL) {	\
 		std::string answer;					      									\
-		multiSlsDetectorCommand *myCmd;					      					\
+		// multiSlsDetectorCommand *myCmd;					      					
 		int id = -1, pos = -1, iv = 0;			      							\
 		bool verify = true, update = true;										\
 		int del = 0;					      									\
@@ -122,18 +122,19 @@ public:
 			std::cout << "position is out of bounds." << std::endl;				\
 			return;																\
 		}																		\
-		// call multi detector command line
+					
-		myCmd=new multiSlsDetectorCommand(myDetector);							\
+		try {			
-		try {																	\
+			// call multi detector command line
-			answer=myCmd->executeLine(argc, argv, action, pos);					\
+			multiSlsDetectorCommand myCmd(myDetector);																\
+			answer=myCmd.executeLine(argc, argv, action, pos);					\
 		} catch (const SlsDetectorPackageExceptions & e) {								\
 			/*std::cout << e.GetMessage() << std::endl;	*/									\
-			delete myCmd;														\
+
 			if (del) delete myDetector;											\
 			return;																\
 		} catch (...) {															\
 			std::cout << " caught exception" << std::endl;								\
-			delete myCmd;														\
+											\
 			if (del) delete myDetector;											\
 			return;																\
 		}																		\
@@ -141,7 +142,7 @@ public:
 			std::cout << argv[0] << " " ;											\
 		}																		\
 		std::cout << answer<< std::endl;													\
-		delete myCmd;															\
+													\
 		if (del) delete myDetector;												\
 	};
 

slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp

@@ -1,5 +1,6 @@
 #include "slsDetectorCommand.h"
 #include "multiSlsDetector.h"
+#include "string_utils.h"
 
 #include <cstdlib>
 #include <fstream>

slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp

@@ -1,46 +1,33 @@
-#include "multiSlsDetectorClient.h"
 #include "gitInfoLib.h"
+#include "multiSlsDetectorClient.h"
+#include <cstdlib>
 
-
+int main(int argc, char *argv[]) {
-#include <stdlib.h>
+    for (int i = 1; i < argc; ++i) {
-using namespace std;
+        if (!(strcmp(argv[i], "--version")) || !(strcmp(argv[i], "-v"))) {
-
+            int64_t tempval = GITDATE;
-int main(int argc, char *argv[])
+            std::cout << argv[0] << " " << GITBRANCH << " (0x" << std::hex << tempval << ")" << std::endl;
-  
+            return 0;
-{
+        }
-	for (int i = 1; i < argc; ++i ) {
+    }
-		if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) {
-			int64_t tempval = GITDATE;
-			cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
-			return 0;
-		}
-	}
 
 #ifdef PUT
-  int action=slsDetectorDefs::PUT_ACTION;
+    int action = slsDetectorDefs::PUT_ACTION;
 #endif
-    
+
 #ifdef GET
-  int action=slsDetectorDefs::GET_ACTION;
+    int action = slsDetectorDefs::GET_ACTION;
 #endif
-    
 
 #ifdef READOUT
-  int action=slsDetectorDefs::READOUT_ACTION;
+    int action = slsDetectorDefs::READOUT_ACTION;
 #endif
-    
 
 #ifdef HELP
-  int action=slsDetectorDefs::HELP_ACTION;
+    int action = slsDetectorDefs::HELP_ACTION;
 #endif
 
-  multiSlsDetectorClient *cl;
+    if (argc > 1)
-  if (argc>1)
+        argv++;
-    cl=new multiSlsDetectorClient(argc-1, argv+1, action);
+    multiSlsDetectorClient(argc - 1, argv, action);
-  else
-    cl=new multiSlsDetectorClient(argc-1, argv, action);
-
-  delete cl;
 }
-
-  

slsReceiverSoftware/src/Listener.cpp

@@ -64,9 +64,12 @@ Listener::Listener(int ind, detectorType dtype, Fifo* f, runStatus* s,
 
 
 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 (listeningPacket) delete [] listeningPacket;
 	ThreadObject::DestroyThread();