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

udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-13 15:34:53 +00:00
parent d205e79106
commit 1882454cf3
7 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -538,13 +538,22 @@ int slsReceiverFuncs::setup_udp(){
}
else{
strcpy(eth,temp.c_str());
if (strchr(eth,'.')!=NULL) {
strcpy(eth,"");
ret = FAIL;
}
cout<<"eth:"<<eth<<endl;
slsReceiverList->setEthernetInterface(eth);
//get mac address from ethernet interface
temp = genericSocket::nameToMac(eth);
if(temp=="00:00:00:00:00:00"){
if (ret != FAIL)
temp = genericSocket::nameToMac(eth);
if ((temp=="00:00:00:00:00:00") || (ret == FAIL)){
ret = FAIL;
strcpy(mess,"failed to get mac adddress to listen to\n");
cout << "mess:" << mess << endl;
}
else{
strcpy(retval,temp.c_str());
@ -817,43 +826,50 @@ int slsReceiverFuncs::read_frame(){
}else{
//for full frames
while(count<20){
while(count<10){
//get frame
slsReceiverList->readFrame(fName,&raw);
if (raw != NULL){
index=(int)(*(int*)raw);
index2= (int)(*((int*)((char*)(raw+onebuffersize))));
memcpy(origVal,raw,bufferSize);
raw=NULL;
//cout<<"funcs\tindex:"<<index<<"\tindex2:"<<index2<<endl;
//1 odd, 1 even
if((index%2)!=index2%2){
//ideal situation (should be odd, even(index+1))
if(index%2){
memcpy(retval,((char*) origVal)+4, onedatasize);
memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
break;
}
//swap to even,odd
if(index2%2){
memcpy((((char*)retval)+onedatasize),((char*) origVal)+4, onedatasize);
memcpy(retval, ((char*) origVal)+10+onedatasize, onedatasize);
index=index2;
break;
}
}
strcpy(mess,"could not read frame due to more than 20 mismatched indices\n");
if (raw == NULL){
count = -1;
break;
}
index=(int)(*(int*)raw);
index2= (int)(*((int*)((char*)(raw+onebuffersize))));
memcpy(origVal,raw,bufferSize);
raw=NULL;
//cout<<"funcs\tindex:"<<index<<"\tindex2:"<<index2<<endl;
//1 odd, 1 even
if((index%2)!=index2%2){
//ideal situation (should be odd, even(index+1))
if(index%2){
memcpy(retval,((char*) origVal)+4, onedatasize);
memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
break;
}
//swap to even,odd
if(index2%2){
memcpy((((char*)retval)+onedatasize),((char*) origVal)+4, onedatasize);
memcpy(retval, ((char*) origVal)+10+onedatasize, onedatasize);
index=index2;
break;
}
}
strcpy(mess,"could not read frame due to more than 20 mismatched indices\n");
usleep(100000);
count++;
}
if(count==20){
cout << "same type: index:" << index << "\tindex2:" << index2 << endl;
if ((count==20) || (count == -1)){
if (count == -20)
cout << "same type: index:" << index << "\tindex2:" << index2 << endl;
else
cout << "no data to read for gui" << endl;
/**send garbage with -1 index to try again*/
index = startIndex;
memcpy(retval,((char*) origVal)+4, onedatasize);