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

two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-20 16:28:48 +01:00
parent a1bd54b16b
commit c097dfc8b3
18 changed files with 474 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp
View File

@ -33,7 +33,6 @@ int receiverInterface::sendString(int fnum, char retval[], char arg[]){
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
dataSocket->Disconnect();
return ret;
}
@ -54,7 +53,6 @@ int receiverInterface::sendUDPDetails(int fnum, char retval[], char arg[3][MAX_S
}
else
dataSocket->ReceiveDataOnly(retval,MAX_STR_LENGTH);
dataSocket->Disconnect();
return ret;
}
@ -72,7 +70,6 @@ int receiverInterface::sendInt(int fnum, int &retval, int arg){
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -90,7 +87,6 @@ int receiverInterface::getInt(int fnum, int &retval){
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -109,7 +105,6 @@ int receiverInterface::sendInt(int fnum, int64_t &retval, int64_t arg){
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -128,7 +123,6 @@ int receiverInterface::sendIntArray(int fnum, int64_t &retval, int64_t arg[2]){
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -141,7 +135,6 @@ int receiverInterface::getInt(int fnum, int64_t &retval){
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -153,7 +146,6 @@ int receiverInterface::getLastClientIP(int fnum, char retval[]){
dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
dataSocket->ReceiveDataOnly(retval,sizeof(retval));
dataSocket->Disconnect();
return ret;
}
@ -169,7 +161,6 @@ int receiverInterface::executeFunction(int fnum,char mess[]){
dataSocket->ReceiveDataOnly(mess,MAX_STR_LENGTH);
std::cout<< "Receiver returned error: " << mess << std::endl;
}
dataSocket->Disconnect();
return ret;
}