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

merge fix

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-20 09:17:42 +02:00
parent 266506e67f
commit 0cd9261332
3 changed files with 16 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/include/UDPInterface.h
View File

@ -502,13 +502,6 @@ class UDPInterface {
virtual int setActivate(int enable = -1) = 0; virtual int setActivate(int enable = -1) = 0;
/**
* Activate / Deactivate Receiver
* If deactivated, receiver will write dummy packets 0xFF
* (as it will receive nothing from detector)
*/
virtual int setActivate(int enable = -1) = 0;
//***callback functions*** //***callback functions***
/** /**
* Call back for start acquisition * Call back for start acquisition

29
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1531,7 +1531,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
int index = 0; int index = 0;
if(totalWritingPacketCount[ithread]){ if(totalWritingPacketCount[ithread]){
index = frameIndex[ithread]; index = frameIndex[ithread];
cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl; cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
} }
//create file name //create file name
@ -2626,18 +2626,21 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
fseek(sfilefd[ithread],0,0); fseek(sfilefd[ithread],0,0);
fwrite((void*)fileHeader[ithread], 1, FILE_HEADER_SIZE, sfilefd[ithread]); fwrite((void*)fileHeader[ithread], 1, FILE_HEADER_SIZE, sfilefd[ithread]);
} }
cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl;
//<< "Packet Loss:" << if(totalWritingPacketCount[ithread]){
//setw(4)<<fixed << setprecision(4) << cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
//dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/ //<< "Packet Loss:" <<
// (double)(currentFrameNumber-1-previousFrameNumber))*100.000) //setw(4)<<fixed << setprecision(4) <<
//<< "%\t" //dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
cout << "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - // (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
totalPacketsInFile[ithread]) //<< "%\t"
<< "\tCurrentFrameNumber:" << currentFrameNumber[ithread] cout << "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
<< "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread] totalPacketsInFile[ithread])
//<< "\tIndex:" << dec << index << "\tCurrentFrameNumber:" << currentFrameNumber[ithread]
<< endl; << "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
//<< "\tIndex:" << dec << index
<< endl;
}
closeFile(ithread); closeFile(ithread);
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
writerThreadsMask^=(1<<ithread); writerThreadsMask^=(1<<ithread);

69
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2861,75 +2861,6 @@ int slsReceiverTCPIPInterface::set_fifo_depth() {
int slsReceiverTCPIPInterface::set_activate() {
ret=OK;
int retval=-1;
int enable;
strcpy(mess,"Could not activate/deactivate\n");
// receive arguments
if(socket->ReceiveDataOnly(&enable,sizeof(enable)) < 0 ){
strcpy(mess,"Error reading from socket\n");
cprintf(RED,"%s",mess);
ret = FAIL;
}
// execute action if the arguments correctly arrived
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
if (ret==OK) {
if (lockStatus==1 && socket->differentClients==1){
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL;
}
if(ret!=FAIL){
if (receiverBase == NULL){
strcpy(mess,SET_RECEIVER_ERR_MESSAGE);
cprintf(RED,"%s",mess);
ret=FAIL;
}else if(receiverBase->getStatus()==RUNNING){
strcpy(mess,"Cannot activate/deactivate while status is running\n");
cprintf(RED,"%s",mess);
ret=FAIL;
}else{
if(enable != -1)
receiverBase->setActivate(enable);
retval = receiverBase->getActivate();
if(enable >= 0 && retval != enable){
sprintf(mess,"Tried to set activate to %d, but returned %d\n",enable,retval);
ret = FAIL;
cprintf(RED,"%s",mess);
}
}
}
}
#endif
#ifdef VERYVERBOSE
if(ret!=FAIL)
cout << "Activate: " << retval << endl;
else
cout << mess << endl;
#endif
if(ret==OK && socket->differentClients){
FILE_LOG(logDEBUG) << "Force update";
ret=FORCE_UPDATE;
}
// send answer
socket->SendDataOnly(&ret,sizeof(ret));
if(ret==FAIL){
cprintf(RED,"%s\n",mess);
socket->SendDataOnly(mess,sizeof(mess));
}
socket->SendDataOnly(&retval,sizeof(retval));
//return ok/fail
return ret;
}
int slsReceiverTCPIPInterface::set_activate() { int slsReceiverTCPIPInterface::set_activate() {
ret=OK; ret=OK;