Index: trunk/FACT++/src/EventBuilder.c =================================================================== --- trunk/FACT++/src/EventBuilder.c (revision 11081) +++ trunk/FACT++/src/EventBuilder.c (revision 11082) @@ -10,5 +10,5 @@ #include #include -#include +#include #include #include @@ -43,4 +43,11 @@ extern void factStat(int severity, int err, char* message ) ; + +extern void debugRead(int isock, int ibyte, int32_t event, int state, + uint32_t tsec, uint32_t tusec ) ; +extern void debugStream(int isock, void *buf, int len) ; + + + int g_actTime = 0 ; int g_runStat = 40 ; @@ -129,4 +136,7 @@ int16_t S ; } SHORT_BYTE ; + + + @@ -395,4 +405,8 @@ int nokCnt[MAX_SOCK],loopCnt=0; int sokCnt[MAX_SOCK]; + + struct timeval *tv, atv; + tv=&atv; + uint32_t tsec, tusec ; @@ -466,5 +480,7 @@ head_len = sizeof(PEVNT_HEADER) ; - frst_len = head_len + 36 * 12 ; //fad_header plus 36*pix_header +//frst_len = head_len + 36 * 12 ; //fad_header plus 36*pix_header + frst_len = head_len ; //fad_header only, so each event must be longer, even for roi=0 + numok = numok2 = 0 ; @@ -490,4 +506,9 @@ for (i=0; iB[ rd[i].bufPos], rd[i].bufLen, MSG_DONTWAIT); + +if (jrd >0 ) { + debugStream(i,&rd[i].rBuf->B[ rd[i].bufPos],jrd) ; +} + + + if (jrd == 0) { //connection has closed ... rd[i].sockStat = -1 ; //flag (try to reopen next round) @@ -528,4 +556,5 @@ rd[i].bufPos += jrd ; //==> prepare for continuation rd[i].bufLen -= jrd ; +debugRead(i,jrd,rd[i].evtID, 0,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 0=reading data } else { //full dataset read rd[i].bufLen = rd[i].bufPos + j ; @@ -539,4 +568,5 @@ } +debugRead(i,jrd,rd[i].evtID, 1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 1=finished event //we have a complete buffer, copy to WORK area @@ -675,6 +705,16 @@ rd[i].bufLen = rd[i].fadLen - rd[i].bufPos ; if (rd[i].bufLen <=0 ) rd[i].bufLen = 100000 ; +debugRead(i,jrd,rd[i].evtID,-1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid;-1=start event } + else { +debugRead(i,jrd,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet + } + } + + else { +debugRead(i,jrd,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet + } + } //end interpreting last read } //end of successful read anything @@ -953,9 +993,19 @@ /* close run runId (all all runs if runId=0) */ /* return: 0=close scheduled / >0 already closed / <0 does not exist */ - int j ; + int i, j ; if (runId == 0 ) { for ( j=0; j0 ) { + if ( runCtrl[j].fileId ==0 ) { int i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) ); if (i<0) { @@ -1212,5 +1272,5 @@ -/* + xwait.tv_sec = 20;; @@ -1233,5 +1293,5 @@ - */ + @@ -1250,2 +1310,124 @@ } /*-----------------------------------------------------------------*/ + + + + + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------*/ + +/* + + +FileHandle_t runOpen(uint32_t irun, RUN_HEAD *runhd, size_t len ) +{ return 1; } ; + +int runWrite(FileHandle_t fileHd , EVENT *event, size_t len ) +{ return 1; } ; + +int runClose(FileHandle_t fileHd , RUN_TAIL *runth, size_t len ) +{ return 1; } ; + + +void factStat(int severity, int err, char* message ) { + printf("%3d %3d : %s\n",severity,err,message) ; +} + + +void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec ) { + printf("%3d %5d %9d %3d %12d\n",isock, ibyte, event, state, tusec) ; +} + + + +void debugStream(int isock, void *buf, int len) { +} + + +void factOut(int severity, int err, char* message ) { +static FILE * fd ; +static int file=0 ; + + if (file==0) { + printf("open file\n"); + fd=fopen("x.out","w+") ; + file=999; + } + + fprintf(fd,"%3d %3d | %s \n",severity,err,message) ; + + if (severity != kDebug) + printf("%3d %3d | %s\n",severity,err,message) ; +} + + + +int main() { + int i,b,c,p ; + char ipStr[100] ; + struct in_addr IPaddr ; + + g_maxMem = 1024*1024 ; //MBytes + g_maxMem = g_maxMem * 1024 *10 ; //10GBytes + + g_maxBoards = 40 ; + + g_actBoards = g_maxBoards; + + g_runStat = 40 ; + + i=0 ; + +// version for standard crates +//for (c=0; c<4,c++) { +// for (b=0; b<10; b++) { +// sprintf(ipStr,"10.0.%d.%d",128+c,128+b) +// +// inet_pton(PF_INET, ipStr, &IPaddr) ; +// +// g_port[i].sockAddr.sin_family = PF_INET; +// g_port[i].sockAddr.sin_port = htons(5000) ; +// g_port[i].sockAddr.sin_addr = IPaddr ; +// g_port[i].sockDef = 1 ; +// i++ ; +// } +//} +// +//version for PC-test + for (c=0; c<4; c++) { + for (b=0; b<10; b++) { + sprintf(ipStr,"10.0.%d.11",128+c) ; + if (c==0) sprintf(ipStr,"10.0.100.11") ; + + inet_pton(PF_INET, ipStr, &IPaddr) ; + p = 31919+100*c+10*b; + + + g_port[i].sockAddr.sin_family = PF_INET; + g_port[i].sockAddr.sin_port = htons(p) ; + g_port[i].sockAddr.sin_addr = IPaddr ; + g_port[i].sockDef = 1 ; + + i++ ; + } + } + + +//g_port[17].sockDef =-1 ; +//g_actBoards-- ; + + StartEvtBuild() ; + + return 0; + +} + + */ Index: trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- trunk/FACT++/src/EventBuilderWrapper.h (revision 11081) +++ trunk/FACT++/src/EventBuilderWrapper.h (revision 11082) @@ -720,4 +720,7 @@ DimDescribedService fDimCurrentEvent; + bool fDebugStream; + bool fDebugRead; + int Write(const Time &time, const std::string &txt, int qos) { @@ -731,5 +734,6 @@ fDimRuns ("FAD_CONTROL/RUNS", "I:1", ""), fDimEvents("FAD_CONTROL/EVENTS", "I:2", ""), - fDimCurrentEvent("FAD_CONTROL/CURRENT_EVENT", "I:1", "") + fDimCurrentEvent("FAD_CONTROL/CURRENT_EVENT", "I:1", ""), + fDebugStream(false), fDebugRead(false) { if (This) @@ -847,4 +851,7 @@ bool IsIgnored(int i) const { return g_port[i].sockDef==0; } + void SetDebugStream(bool b) { fDebugStream = b; if (!b) for (int i=0; i<40; i++) fDumpStream[i].close(); } + void SetDebugRead(bool b) { fDebugRead = b; if (!b) fDumpRead.close(); } + size_t GetUsedMemory() const { return gi_usedMem; } @@ -984,4 +991,75 @@ return rc ? 0 : -1; } + + ofstream fDumpStream[40]; + + void debugStream(int isock, void *buf, int len) + { + if (!fDebugStream) + return; + + const int slot = isock/7; + if (slot<0 || slot>39) + return; + + if (!fDumpStream[slot].is_open()) + { + ostringstream name; + name << "socket_dump-" << setfill('0') << setw(2) << slot << ".bin"; + + fDumpStream[slot].open(name.str().c_str(), ios::app); + if (!fDumpStream[slot]) + { + //ostringstream str; + //str << "Open file " << name << ": " << strerror(errno) << " (errno=" << errno << ")"; + //Error(str); + + return; + } + } + + fDumpStream[slot].write(reinterpret_cast(buf), len); + } + + ofstream fDumpRead; // Stream to possibly dump docket events + + void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec) + { + // isock = socketID (0-279) + // ibyte = #bytes gelesen + // event = eventId (oder 0 wenn noch nicht bekannt) + // state : 0=reading data + // 1=finished reading data + // -1=start reading data (header) + // -2=start reading data, + // eventId not known yet (too little data) + // tsec, tusec = time when reading seconds, microseconds + // + if (!fDebugRead) + return; + + if (!fDumpRead.is_open()) + { + fDumpRead.open("socket_events.txt", ios::app); + if (!fDumpRead) + { + //ostringstream str; + //str << "Open file " << name << ": " << strerror(errno) << " (errno=" << errno << ")"; + //Error(str); + + return; + } + } + + fDumpRead + << setw(2) << state << " " + << setw(8) << tsec << " " + << setw(9) << tusec << " " + << setw(3) << isock << " " + << setw(2) << isock/7 << " " + << event << " " + << ibyte << endl; + } + }; @@ -1039,4 +1117,14 @@ } + void debugStream(int isock, void *buf, int len) + { + return EventBuilderWrapper::This->debugStream(isock, buf, len); + } + + void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec) + { + return EventBuilderWrapper::This->debugRead(isock, ibyte, event, state, tsec, tusec); + } + /* void message(int severity, const char *msg) Index: trunk/FACT++/src/fadctrl.cc =================================================================== --- trunk/FACT++/src/fadctrl.cc (revision 11081) +++ trunk/FACT++/src/fadctrl.cc (revision 11082) @@ -947,4 +947,24 @@ for (int i=slot[0]; i<=slot[1]; i++) SetIgnore(i, block); + + return T::GetCurrentState(); + } + + int SetDumpStream(const EventImp &evt) + { + if (!CheckEventSize(evt.GetSize(), "SetDumpStream", 1)) + return T::kSM_FatalError; + + SetDebugStream(evt.Get()); + + return T::GetCurrentState(); + } + + int SetDumpRecv(const EventImp &evt) + { + if (!CheckEventSize(evt.GetSize(), "SetDumpRecv", 1)) + return T::kSM_FatalError; + + SetDebugRead(evt.Get()); return T::GetCurrentState(); @@ -1334,22 +1354,32 @@ // Verbosity commands - T::AddEvent("SET_VERBOSE", "B") + T::AddEvent("SET_VERBOSE", "B:1") (boost::bind(&StateMachineFAD::SetVerbosity, this, _1)) ("set verbosity state" "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data"); - T::AddEvent("SET_HEX_OUTPUT", "B") + T::AddEvent("SET_HEX_OUTPUT", "B:1") (boost::bind(&StateMachineFAD::SetHexOutput, this, _1)) ("enable or disable hex output for received data" "|hexout[bool]:disable or enable hex output for received data (yes/no)"); - T::AddEvent("SET_DATA_OUTPUT", "B") + T::AddEvent("SET_DATA_OUTPUT", "B:1") (boost::bind(&StateMachineFAD::SetDataOutput, this, _1)) (""); - T::AddEvent("PRINT_EVENT", "I") + T::AddEvent("PRINT_EVENT", "I:1") (boost::bind(&StateMachineFAD::PrintEvent, this, _1)) ("Print (last) event" "|board[int]:slot from which the event should be printed (-1 for all)"); + + T::AddEvent("DUMP_STREAM", "B:1") + (boost::bind(&StateMachineFAD::SetDumpStream, this, _1)) + ("For debugging purpose: the binary data stream read from the sockets 0-7 can be dumped to files." + "|switch[bool]:Enable (yes) or disable (no)"); + + T::AddEvent("DUMP_RECV", "B:1") + (boost::bind(&StateMachineFAD::SetDumpRecv, this, _1)) + ("For debugging purpose: the times when data has been receives are dumped to a file." + "|switch[bool]:Enable (yes) or disable (no)"); T::AddEvent("BLOCK_TRANSMISSION", "S:1;B:1")