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

trying

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-31 14:36:13 +01:00
parent 63d9e3ca5f
commit e030a79aba
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/include/genericSocket.h
View File

@ -584,7 +584,6 @@ enum communicationProtocol{
int ReceiveDataOnly(void* buf,int length=0){ int ReceiveDataOnly(void* buf,int length=0){
if (buf==NULL) return -1; if (buf==NULL) return -1;
cprintf(RED,"length:%d\n",length);
total_sent=0; total_sent=0;
@ -616,16 +615,11 @@ enum communicationProtocol{
/*int k = 0;*/ /*int k = 0;*/
while(length>0){ while(length>0){
if(length<packet_size){ if(length<packet_size)
nsending = length; //works for jungfrau to read packet header nsending = length; //works for jungfrau to read packet header
cprintf(BLUE,"will read %d\n",nsending); else
}
else{
cprintf(BG_RED,"should not have been here length:%d packet_size:%d !!\n",length, packet_size);
nsending = (length>packet_size) ? packet_size:length; //works for eiger to get packets to discard image header packets nsending = (length>packet_size) ? packet_size:length; //works for eiger to get packets to discard image header packets
}
nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length); nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
cprintf(BLUE,"read %d\n",nsending);
if(nsent != nsending){ //if((nsent != nsending)){ && (nsent < packet_size)){ if(nsent != nsending){ //if((nsent != nsending)){ && (nsent < packet_size)){
if(nsent && (nsent != header_packet_size) && (nsent != -1)) if(nsent && (nsent != header_packet_size) && (nsent != -1))
cprintf(RED,"Incomplete Packet size %d\n",nsent); cprintf(RED,"Incomplete Packet size %d\n",nsent);

2
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -2142,7 +2142,7 @@ int UDPStandardImplementation::prepareAndListenBuffer(int ithread, int cSize, ch
receivedSize = oneDataSize * packetsPerFrame; receivedSize = oneDataSize * packetsPerFrame;
} }
else{cprintf(BG_RED,"for only eiger or other dets. should not be here!!\n"); else{
receivedSize = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + fifoBufferHeaderSize + cSize, (bufferSize * numberofJobsPerBuffer) - cSize); receivedSize = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + fifoBufferHeaderSize + cSize, (bufferSize * numberofJobsPerBuffer) - cSize);
//eiger returns 0 when header packet caught //eiger returns 0 when header packet caught
while(receivedSize < onePacketSize && status != TRANSMITTING) while(receivedSize < onePacketSize && status != TRANSMITTING)