detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

log

Browse Source
This commit is contained in:
bergamaschi 2015-10-29 13:33:24 +01:00
parent eb5f481faa
commit 9b449009ff
4 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -35,7 +35,7 @@ UDPBaseImplementation::UDPBaseImplementation(){
void UDPBaseImplementation::initializeMembers(){ void UDPBaseImplementation::initializeMembers(){
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
cout << "Info: Initializing base members" << endl; FILE_LOG(logDEBUG1) << "Info: Initializing base members" << endl;
//**detector parameters*** //**detector parameters***
myDetectorType = GENERIC; myDetectorType = GENERIC;
strcpy(detHostname,""); strcpy(detHostname,"");
@ -202,7 +202,7 @@ void UDPBaseImplementation::setBottomEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
bottomEnable = b; bottomEnable = b;
FILE_LOG(logINFO) << "Bottom Enable: " << stringEnable(bottomEnable); FILE_LOG(logINFO) << "Bottom - " << stringEnable(bottomEnable) << endl;
} }
@ -216,7 +216,7 @@ void UDPBaseImplementation::setFileName(const char c[]){
} }
void UDPBaseImplementation::setFilePath(const char c[]){ void UDPBaseImplementation::setFilePath(const char c[]){
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logINFO) << __AT__ << " starting";
if(strlen(c)){ if(strlen(c)){
//check if filepath exists //check if filepath exists
@ -229,7 +229,7 @@ void UDPBaseImplementation::setFilePath(const char c[]){
} }
strcpy(filePath, c); strcpy(filePath, c);
} }
FILE_LOG(logINFO) << "File path:" << filePath; FILE_LOG(logDEBUG1) << "Info: File path:" << filePath;
} }
void UDPBaseImplementation::setFileIndex(const uint64_t i){ void UDPBaseImplementation::setFileIndex(const uint64_t i){
@ -273,7 +273,7 @@ int UDPBaseImplementation::setDataCompressionEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
dataCompressionEnable = b; dataCompressionEnable = b;
FILE_LOG(logINFO) << "Data Compression Enable: " << stringEnable(dataCompressionEnable); FILE_LOG(logINFO) << "Data Compression : " << stringEnable(dataCompressionEnable);
//overridden methods might return FAIL //overridden methods might return FAIL
return OK; return OK;

67
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -43,9 +43,9 @@ UDPStandardImplementation::UDPStandardImplementation(){
//to increase socket receiver buffer size and max length of input queue by changing kernel settings //to increase socket receiver buffer size and max length of input queue by changing kernel settings
if(system("echo $((100*1024*1024)) > /proc/sys/net/core/rmem_max")) if(system("echo $((100*1024*1024)) > /proc/sys/net/core/rmem_max"))
cout << "Warning: No root permission to change socket receiver buffer size in file /proc/sys/net/core/rmem_max" << endl; FILE_LOG(logDEBUG1) << "Warning: No root permission to change socket receiver buffer size in file /proc/sys/net/core/rmem_max" << endl;
else if(system("echo 250000 > /proc/sys/net/core/netdev_max_backlog")) else if(system("echo 250000 > /proc/sys/net/core/netdev_max_backlog"))
cout << "Warning: No root permission to change max length of input queue in file /proc/sys/net/core/netdev_max_backlog" << endl; FILE_LOG(logDEBUG1) << "Warning: No root permission to change max length of input queue in file /proc/sys/net/core/netdev_max_backlog" << endl;
/** permanent setting by heiner /** permanent setting by heiner
net.core.rmem_max = 104857600 # 100MiB net.core.rmem_max = 104857600 # 100MiB
net.core.netdev_max_backlog = 250000 net.core.netdev_max_backlog = 250000
@ -54,6 +54,7 @@ UDPStandardImplementation::UDPStandardImplementation(){
sysctl -w net.core.rmem_max=16777216 sysctl -w net.core.rmem_max=16777216
sysctl -w net.core.netdev_max_backlog=250000 sysctl -w net.core.netdev_max_backlog=250000
*/ */
cout << endl;
} }
UDPStandardImplementation::~UDPStandardImplementation(){ UDPStandardImplementation::~UDPStandardImplementation(){
@ -73,7 +74,7 @@ UDPStandardImplementation::~UDPStandardImplementation(){
void UDPStandardImplementation::deleteMembers(){ void UDPStandardImplementation::deleteMembers(){
FILE_LOG(logDEBUG1) << __AT__ << " starting"; FILE_LOG(logDEBUG1) << __AT__ << " starting";
cout << "Info: Deleting member pointers" << endl; FILE_LOG(logDEBUG1) << "Info: Deleting member pointers" << endl;
shutDownUDPSockets(); shutDownUDPSockets();
closeFile(); closeFile();
//filter //filter
@ -119,7 +120,7 @@ void UDPStandardImplementation::initializeBaseMembers(){
void UDPStandardImplementation::initializeMembers(){ void UDPStandardImplementation::initializeMembers(){
FILE_LOG(logDEBUG1) << __AT__ << " starting"; FILE_LOG(logDEBUG1) << __AT__ << " starting";
cout << "Info: Initializing members" << endl; FILE_LOG(logDEBUG1) << "Info: Initializing members" << endl;
//***detector parameters*** //***detector parameters***
frameSize = 0; frameSize = 0;
@ -256,7 +257,7 @@ int UDPStandardImplementation::setupFifoStructure(){
//eiger always listens to 1 packet at a time //eiger always listens to 1 packet at a time
if(myDetectorType == EIGER){ if(myDetectorType == EIGER){
numberofJobsPerBuffer = 1; numberofJobsPerBuffer = 1;
cout << "Info: 1 packet per buffer" << endl; FILE_LOG(logDEBUG1) << "Info: 1 packet per buffer" << endl;
} }
//else calculate best possible number of frames to listen to at a time (for fast readouts like gotthard) //else calculate best possible number of frames to listen to at a time (for fast readouts like gotthard)
@ -298,9 +299,8 @@ int UDPStandardImplementation::setupFifoStructure(){
else else
fifoSize = fifoSize/numberofJobsPerBuffer; fifoSize = fifoSize/numberofJobsPerBuffer;
} }
#ifdef VERBOSE FILE_LOG(logDEBUG1) << "Info: Fifo Depth:" << fifoSize << endl;
cout << "Info: Fifo Depth:" << fifoSize << endl;
#endif
//do not rebuild fifo structure if it is the same //do not rebuild fifo structure if it is the same
@ -315,8 +315,8 @@ int UDPStandardImplementation::setupFifoStructure(){
if(fifoFree[i]){ if(fifoFree[i]){
while(!fifoFree[i]->isEmpty()) while(!fifoFree[i]->isEmpty())
fifoFree[i]->pop(buffer[i]); fifoFree[i]->pop(buffer[i]);
#ifdef FIFO_DEBUG #ifdef FIFODEBUG
cprintf(GREEN,"%d fifostructure popped from fifofree %p\n", i, (void*)(buffer[i])); cprintf(GREEN,"Info: %d fifostructure popped from fifofree %p\n", i, (void*)(buffer[i]));
#endif #endif
delete fifoFree[i]; delete fifoFree[i];
} }
@ -338,13 +338,13 @@ int UDPStandardImplementation::setupFifoStructure(){
buffer[i]=mem0[i]; buffer[i]=mem0[i];
while (buffer[i] < (mem0[i]+(bufferSize * numberofJobsPerBuffer + HEADER_SIZE_NUM_TOT_PACKETS) * (fifoSize-1))) { while (buffer[i] < (mem0[i]+(bufferSize * numberofJobsPerBuffer + HEADER_SIZE_NUM_TOT_PACKETS) * (fifoSize-1))) {
fifoFree[i]->push(buffer[i]); fifoFree[i]->push(buffer[i]);
#ifdef FIFO_DEBUG #ifdef FIFODEBUG
cprintf(BLUE,"%d fifostructure free pushed into fifofree %p\n", i, (void*)(buffer[i])); cprintf(BLUE,"Info: %d fifostructure free pushed into fifofree %p\n", i, (void*)(buffer[i]));
#endif #endif
buffer[i] += (bufferSize * numberofJobsPerBuffer + HEADER_SIZE_NUM_TOT_PACKETS); buffer[i] += (bufferSize * numberofJobsPerBuffer + HEADER_SIZE_NUM_TOT_PACKETS);
} }
} }
cout << "Info: Fifo structure(s) reconstructed" << endl; FILE_LOG(logDEBUG1) << "Info: Fifo structure(s) reconstructed" << endl;
return OK; return OK;
} }
@ -366,7 +366,7 @@ void UDPStandardImplementation::configure(map<string, string> config_map){
b = 0; b = 0;
} }
bottomEnable = b!= 0; bottomEnable = b!= 0;
cout << "Info: Bottom Enable: " << stringEnable(bottomEnable) << endl; cout << "Info: Bottom - " << stringEnable(bottomEnable) << endl;
} }
} }
@ -376,12 +376,14 @@ void UDPStandardImplementation::configure(map<string, string> config_map){
int UDPStandardImplementation::setDataCompressionEnable(const bool b){ int UDPStandardImplementation::setDataCompressionEnable(const bool b){
FILE_LOG(logDEBUG1) << __AT__ << " starting"; FILE_LOG(logDEBUG1) << __AT__ << " starting";
if(myDetectorType != EIGER){
cout << "Info: Setting up Data Compression Enable to " << stringEnable(b); cout << "Info: Setting up Data Compression Enable to " << stringEnable(b);
#ifdef MYROOT1 #ifdef MYROOT1
cout << " WITH ROOT" << endl; cout << " WITH ROOT" << endl;
#else #else
cout << " WITHOUT ROOT" << endl; cout << " WITHOUT ROOT" << endl;
#endif #endif
}
//set data compression enable //set data compression enable
dataCompressionEnable = b; dataCompressionEnable = b;
@ -617,7 +619,7 @@ int UDPStandardImplementation::setTenGigaEnable(const bool b){
int UDPStandardImplementation::setDetectorType(const detectorType d){ int UDPStandardImplementation::setDetectorType(const detectorType d){
FILE_LOG(logDEBUG1) << __AT__ << " called"; FILE_LOG(logDEBUG1) << __AT__ << " called";
cout << "Setting receiver type ..." << endl; cout << "Info: Setting receiver type ..." << endl;
deleteMembers(); deleteMembers();
initializeBaseMembers(); initializeBaseMembers();
@ -631,7 +633,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
case EIGER: case EIGER:
case JUNGFRAUCTB: case JUNGFRAUCTB:
case JUNGFRAU: case JUNGFRAU:
cout << "Info: ***** This is a " << getDetectorType(d) << " Receiver *****" << endl; FILE_LOG(logINFO) << " ***** This is a " << getDetectorType(d) << " Receiver *****" << endl;
break; break;
default: default:
cprintf(BG_RED, "Error: This is an unknown receiver type %d\n", (int)d); cprintf(BG_RED, "Error: This is an unknown receiver type %d\n", (int)d);
@ -762,6 +764,7 @@ void UDPStandardImplementation::resetAcquisitionCount(){
int UDPStandardImplementation::startReceiver(char *c){ int UDPStandardImplementation::startReceiver(char *c){
FILE_LOG(logDEBUG1) << __AT__ << " called"; FILE_LOG(logDEBUG1) << __AT__ << " called";
cout << endl;
cout << "Info: Starting Receiver" << endl; cout << "Info: Starting Receiver" << endl;
@ -800,15 +803,16 @@ int UDPStandardImplementation::startReceiver(char *c){
//Print Receiver Configuration //Print Receiver Configuration
cout << "Info: ***Receiver Configuration***" << endl; if(myDetectorType != EIGER){
cout << "Info: Max Packets Per File:" << maxPacketsPerFile << endl;
cout << "Info: Data Compression has been " << stringEnable(dataCompressionEnable) << endl; cout << "Info: Data Compression has been " << stringEnable(dataCompressionEnable) << endl;
if(myDetectorType != EIGER)
cout << "Info: Number of Jobs Per Buffer: " << numberofJobsPerBuffer << endl; cout << "Info: Number of Jobs Per Buffer: " << numberofJobsPerBuffer << endl;
cout << "Info: Max Packets Per File:" << maxPacketsPerFile << endl;
}
if(FrameToGuiFrequency) if(FrameToGuiFrequency)
cout << "Info: Frequency of frames sent to gui" << FrameToGuiFrequency << endl; cout << "Info: requency of frames sent to gui: " << FrameToGuiFrequency << endl;
else else
cout << "Info: Random frames sent to gui" << endl; cout << "Info: Frequency of frames sent to gui: Random" << endl;
@ -895,7 +899,7 @@ void UDPStandardImplementation::stopReceiver(){
int UDPStandardImplementation::shutDownUDPSockets(){ int UDPStandardImplementation::shutDownUDPSockets(){
FILE_LOG(logDEBUG1) << __AT__ << " called"; FILE_LOG(logDEBUG1) << __AT__ << " called";
cout << "Info: Shutting down UDP Socket(s)" << endl; FILE_LOG(logDEBUG1) << "Info: Shutting down UDP Socket(s)" << endl;
for(int i=0;i<numberofListeningThreads;i++){ for(int i=0;i<numberofListeningThreads;i++){
if(udpSocket[i]){ if(udpSocket[i]){
@ -1064,7 +1068,7 @@ int UDPStandardImplementation::createListeningThreads(bool destroy){
//destroy //destroy
if(destroy){ if(destroy){
cout << "Info: Destroying Listening Thread(s)" << endl; FILE_LOG(logDEBUG) << "Info: Destroying Listening Thread(s)" << endl;
killAllListeningThreads = true; killAllListeningThreads = true;
for(int i = 0; i < numberofListeningThreads; ++i){ for(int i = 0; i < numberofListeningThreads; ++i){
@ -1075,12 +1079,12 @@ int UDPStandardImplementation::createListeningThreads(bool destroy){
killAllListeningThreads = false; killAllListeningThreads = false;
threadStarted = false; threadStarted = false;
cout << endl; cout << endl;
cout << "Info: Listening thread(s) destroyed" << endl; FILE_LOG(logDEBUG) << "Info: Listening thread(s) destroyed" << endl;
} }
//create //create
else{ else{
cout << "Info: Creating Listening Thread(s)" << endl; FILE_LOG(logDEBUG) << "Info: Creating Listening Thread(s)" << endl;
//reset current index //reset current index
currentThreadIndex = -1; currentThreadIndex = -1;
@ -1099,7 +1103,7 @@ int UDPStandardImplementation::createListeningThreads(bool destroy){
} }
cout << endl; cout << endl;
#ifdef VERBOSE #ifdef VERBOSE
cout << "Info: Listening thread(s) created successfully." << endl; FILE_LOG(logDEBUG) << "Info: Listening thread(s) created successfully." << endl;
#endif #endif
} }
@ -1590,7 +1594,7 @@ void UDPStandardImplementation::startFrameIndices(int ithread){
void UDPStandardImplementation::stopListening(int ithread, int numbytes){ void UDPStandardImplementation::stopListening(int ithread, int numbytes){
FILE_LOG(logDEBUG1) << __AT__ << " called"; FILE_LOG(logDEBUG1) << __AT__ << " called";
cout << "Info: Stop Listening. Status:" << runStatusType(status) << endl; cout << "Info: Thread " << ithread << ": Stop Listening.\nStatus:" << runStatusType(status) << endl;
//less than 1 packet size (especially for eiger), ignore the buffer (so that 2 dummy buffers are not sent with pc=0) //less than 1 packet size (especially for eiger), ignore the buffer (so that 2 dummy buffers are not sent with pc=0)
@ -1797,10 +1801,6 @@ void UDPStandardImplementation::processWritingBuffer(int ithread){
cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuf[0]),0); cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuf[0]),0);
#endif #endif
uint32_t numPackets = (uint32_t)(*((uint32_t*)wbuf[0])); uint32_t numPackets = (uint32_t)(*((uint32_t*)wbuf[0]));
cout<<"numpackets:"<<hex<<numpackets<<endl;
cout<<"dummpacketvalue"<<dummyPacketValue<<endl;
//if(numPackets < 0)
// cprintf(BG_RED,"Error: Negative packet numbers: %d for FIFO %d\n",numPackets,0);
#ifdef DEBUG4 #ifdef DEBUG4
cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, numPackets, 0); cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, numPackets, 0);
#endif #endif
@ -2213,10 +2213,7 @@ bool UDPStandardImplementation::popAndCheckEndofAcquisition(int ithread, char* w
#ifdef FIFODEBUG #ifdef FIFODEBUG
cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuffer[i]),i); cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuffer[i]),i);
#endif #endif
int val = (uint32_t)(*((uint32_t*)wbuffer[i])); nP[i] = (uint32_t)(*((uint32_t*)wbuffer[i]));
if(val < 0)
cprintf(BG_RED,"Error: Negative packet numbers: %d for FIFO %d\n",val,i);
nP[i] = abs(val);
#ifdef DEBUG4 #ifdef DEBUG4
cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, nP[i], i); cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, nP[i], i);
#endif #endif

2
slsReceiverSoftware/src/main.cpp
View File

@ -75,7 +75,7 @@ int main(int argc, char *argv[]) {
//start tcp server thread //start tcp server thread
if(user->start() == slsReceiverDefs::OK){ if(user->start() == slsReceiverDefs::OK){
cout << "DONE!" << endl; FILE_LOG(logDEBUG1) << "DONE!" << endl;
string str; string str;
cin>>str; cin>>str;
//wait and look for an exit keyword //wait and look for an exit keyword

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -125,14 +125,14 @@ int slsReceiverTCPIPInterface::setPortNumber(int pn){
int slsReceiverTCPIPInterface::start(){ int slsReceiverTCPIPInterface::start(){
cout << "Creating TCP Server Thread" << endl; FILE_LOG(logDEBUG1) << "Creating TCP Server Thread" << endl;
killTCPServerThread = 0; killTCPServerThread = 0;
if(pthread_create(&TCPServer_thread, NULL,startTCPServerThread, (void*) this)){ if(pthread_create(&TCPServer_thread, NULL,startTCPServerThread, (void*) this)){
cout << "Could not create TCP Server thread" << endl; cout << "Could not create TCP Server thread" << endl;
return FAIL; return FAIL;
} }
//#ifdef VERBOSE //#ifdef VERBOSE
cout << "TCP Server thread created successfully." << endl; FILE_LOG(logDEBUG1) << "TCP Server thread created successfully." << endl;
//#endif //#endif
return OK; return OK;
} }