detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer

Browse Source
This commit is contained in:
lopez_c 2017-05-01 12:21:07 +02:00
commit f937b8ca5d
5 changed files with 177 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/Makefile
View File

@ -69,14 +69,14 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC)
%.o : %.cpp %.h Makefile %.o : %.cpp %.h Makefile
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread -lrt $(LIBZMQ) #$(FLAGS) $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) #$(FLAGS)
package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
$(DESTDIR)/libSlsDetector.so: $(OBJS) $(DESTDIR)/libSlsDetector.so: $(OBJS)
$(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -lpthread -lrt $(LIBZMQ) $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ)
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
mv libSlsDetector.so $(DESTDIR) mv libSlsDetector.so $(DESTDIR)

76
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6186,8 +6186,6 @@ int slsDetector::configureMAC(){
int fnum=F_CONFIGURE_MAC,fnum2=F_RECEIVER_SHORT_FRAME; int fnum=F_CONFIGURE_MAC,fnum2=F_RECEIVER_SHORT_FRAME;
char mess[MAX_STR_LENGTH]=""; char mess[MAX_STR_LENGTH]="";
char arg[6][50]={"","","","","",""}; char arg[6][50]={"","","","","",""};
char cword[50]="", *pcword;
string sword;
int retval=-1; int retval=-1;
@ -6232,50 +6230,74 @@ int slsDetector::configureMAC(){
std::cout<< "IP/MAC Addresses valid "<< std::endl; std::cout<< "IP/MAC Addresses valid "<< std::endl;
#endif #endif
//converting IPaddress to hex.
pcword = strtok (arg[0],"."); {
while (pcword != NULL) { //converting IPaddress to hex
sprintf(arg[0],"%02x",atoi(pcword)); stringstream ss(arg[0]);
strcat(cword,arg[0]); char cword[50]="";
pcword = strtok (NULL, "."); bzero(cword, 50);
string s;
while (getline(ss, s, '.')) {
sprintf(cword,"%s%02x",cword,atoi(s.c_str()));
} }
bzero(arg[0], 50);
strcpy(arg[0],cword); strcpy(arg[0],cword);
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"receiver udp ip:"<<arg[0]<<"."<<std::endl; std::cout<<"receiver udp ip:"<<arg[0]<<"."<<std::endl;
#endif #endif
//converting MACaddress to hex. }
sword.assign(arg[1]);
strcpy(arg[1],""); {
stringstream sstr(sword); //converting MACaddress to hex
while(getline(sstr,sword,':')) stringstream ss(arg[1]);
strcat(arg[1],sword.c_str()); char cword[50]="";
bzero(cword, 50);
string s;
while (getline(ss, s, ':')) {
sprintf(cword,"%s%s",cword,s.c_str());
}
bzero(arg[1], 50);
strcpy(arg[1],cword);
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"receiver mac:"<<arg[1]<<"."<<std::endl; std::cout<<"receiver mac:"<<arg[1]<<"."<<std::endl;
#endif #endif
}
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"receiver udp port:"<<arg[2]<<"."<<std::endl; std::cout<<"receiver udp port:"<<arg[2]<<"."<<std::endl;
#endif #endif
//converting server MACaddress to hex.
sword.assign(arg[3]); {
strcpy(arg[3],""); stringstream ss(arg[3]);
stringstream ssstr(sword); char cword[50]="";
while(getline(ssstr,sword,':')) bzero(cword, 50);
strcat(arg[3],sword.c_str()); string s;
while (getline(ss, s, ':')) {
sprintf(cword,"%s%s",cword,s.c_str());
}
bzero(arg[3], 50);
strcpy(arg[3],cword);
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"detecotor mac:"<<arg[3]<<"."<<std::endl; std::cout<<"detecotor mac:"<<arg[3]<<"."<<std::endl;
#endif #endif
//converting IPaddress to hex.
strcpy(cword,"");
pcword = strtok (arg[4],".");
while (pcword != NULL) {
sprintf(arg[4],"%02x",atoi(pcword));
strcat(cword,arg[4]);
pcword = strtok (NULL, ".");
} }
{
//converting IPaddress to hex
stringstream ss(arg[4]);
char cword[50]="";
bzero(cword, 50);
string s;
while (getline(ss, s, '.')) {
sprintf(cword,"%s%02x",cword,atoi(s.c_str()));
}
bzero(arg[4], 50);
strcpy(arg[4],cword); strcpy(arg[4],cword);
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"detector ip:"<<arg[4]<<"."<<std::endl; std::cout<<"detector ip:"<<arg[4]<<"."<<std::endl;
#endif #endif
}
#ifdef VERBOSE #ifdef VERBOSE
std::cout<<"receiver udp port2:"<<arg[5]<<"."<<std::endl; std::cout<<"receiver udp port2:"<<arg[5]<<"."<<std::endl;
#endif #endif

2
slsDetectorSoftware/slsDetectorClient/Makefile
View File

@ -13,7 +13,7 @@ INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFuncti
LIBDIR?=../ LIBDIR?=../
LIBS?= -L$(LIBDIR) -lSlsDetector LIBS?= -L$(LIBDIR) -lSlsDetector
LDFLAG= -L/usr/lib64/ -lpthread LDFLAG= -L/usr/lib64/ -pthread
DESTDIR ?= bin DESTDIR ?= bin

2
slsDetectorSoftware/slsDetectorClient/Makefile.x04sa
View File

@ -2,7 +2,7 @@ CFLAGS= -DC_ONLY
FLAGS=-DVERBOSE FLAGS=-DVERBOSE
INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis
LIBS= -L../slsDetectorSoftware/ LIBS= -L../slsDetectorSoftware/
LDFLAG= -lSlsDetector -lpthread LDFLAG= -lSlsDetector -pthread
EPICSFLAGS=-DEPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom EPICSFLAGS=-DEPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom

20
slsDetectorSoftware/threadFiles/Makefile
View File

@ -2,20 +2,20 @@ OBJPATH=bin/obj
EXAMPLEPATH=bin/example EXAMPLEPATH=bin/example
all: all:
g++ CondVar.cpp -lpthread -c -g -o $(OBJPATH)/CondVar.o g++ CondVar.cpp -pthread -c -g -o $(OBJPATH)/CondVar.o
g++ Mutex.cpp -lpthread -c -g -o $(OBJPATH)/Mutex.o g++ Mutex.cpp -pthread -c -g -o $(OBJPATH)/Mutex.o
#g++ Task.cpp -lpthread -c -g -o $(OBJPATH)/Task.o #g++ Task.cpp -pthread -c -g -o $(OBJPATH)/Task.o
g++ ThreadPool.cpp -lpthread -c -g -o $(OBJPATH)/ThreadPool.o g++ ThreadPool.cpp -pthread -c -g -o $(OBJPATH)/ThreadPool.o
g++ Multi.cpp -lpthread -c -g -o $(OBJPATH)/Multi.o g++ Multi.cpp -pthread -c -g -o $(OBJPATH)/Multi.o
#g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/Task.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -lpthread -I . -g -o $(EXAMPLEPATH)threadpool_test #g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/Task.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -pthread -I . -g -o $(EXAMPLEPATH)threadpool_test
g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -lpthread -I . -g -o $(EXAMPLEPATH)threadpool_test g++ $(OBJPATH)/CondVar.o $(OBJPATH)/Mutex.o $(OBJPATH)/ThreadPool.o threadpool_test.cpp Single.cpp Multi.cpp -pthread -I . -g -o $(EXAMPLEPATH)threadpool_test
#all: #all:
# g++ threadpool.cpp -lpthread -fpic -c -o bin/obj/threadpool.o # g++ threadpool.cpp -pthread -fpic -c -o bin/obj/threadpool.o
# g++ -L./bin bin/obj/threadpool.o -lpthread threadpool_test.cpp -o bin/example/threadpool_test # g++ -L./bin bin/obj/threadpool.o -pthread threadpool_test.cpp -o bin/example/threadpool_test
#threadpool: #threadpool:
# g++ threadpool.cpp -lpthread -fpic -c -o bin/obj/threadpool.o # g++ threadpool.cpp -pthread -fpic -c -o bin/obj/threadpool.o
# g++ -shared -fPIC bin/obj/threadpool.o -o bin/lib/libthreadpool.so # g++ -shared -fPIC bin/obj/threadpool.o -o bin/lib/libthreadpool.so
#example: #example:
# g++ -L./bin/lib -lthreadpool threadpool_test.cpp -o threadpool_test # g++ -L./bin/lib -lthreadpool threadpool_test.cpp -o threadpool_test