diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index d6a102201..a10e07649 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -103,8 +103,8 @@ enum communicationProtocol{ nsent(0), total_sent(0)// sender (client): where to? ip { - memset(&serverAddress, 0, sizeof(sockaddr_in)); - memset(&clientAddress, 0, sizeof(sockaddr_in)); + //memset(&serverAddress, 0, sizeof(sockaddr_in)); + //memset(&clientAddress, 0, sizeof(sockaddr_in)); // serverAddress = {0}; // clientAddress = {0}; // strcpy(hostname,host_ip_or_name); @@ -162,8 +162,8 @@ enum communicationProtocol{ nsent(0), total_sent(0) { - memset(&serverAddress, 0, sizeof(sockaddr_in)); - memset(&clientAddress, 0, sizeof(sockaddr_in)); + //memset(&serverAddress, 0, sizeof(sockaddr_in)); + // memset(&clientAddress, 0, sizeof(sockaddr_in)); // serverAddress = {0}; // clientAddress = {0}; /* // you can specify an IP address: */ diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index 9f1b765fd..e7ee3fe22 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -1564,7 +1564,7 @@ void UDPStandardImplementation::startReadout(){ //wait so that all packets which take time has arrived usleep(5000); /********************************************/ - //usleep(10000000); + //usleep(1000000); //usleep(2000000); pthread_mutex_lock(&status_mutex); @@ -1860,9 +1860,9 @@ int UDPStandardImplementation::startWriting(){ //cout<<"writer gonna pop from fifo:"<pop(wbuf[i]); numpackets = (uint16_t)(*((uint16_t*)wbuf[i])); -//#ifdef VERYDEBUG +#ifdef VERYDEBUG cout << ithread << " numpackets:" << dec << numpackets << "for fifo :"<< i << endl; -//#endif +#endif } #ifdef VERYDEBUG @@ -2109,9 +2109,9 @@ int i; #endif pthread_mutex_unlock(&(status_mutex)); -//#ifdef VERYDEBUG +#ifdef VERYDEBUG cout << ithread << ": Frames listened to " << dec << ((totalListeningFrameCount[ithread]*numListeningThreads)/packetsPerFrame) << endl; -//#endif +#endif //waiting for all listening threads to be done, to print final count of frames listened to if(ithread == 0){