Changeset 10185

Timestamp:

02/28/11 15:58:52 (14 years ago)

Author:

ogrimm

Message:

Fixed bug due to static keyword in FAD::ReadLoop()

Location:

fact/FADctrl

Files:

• FADBoard.cc (modified) (3 diffs)
• History.txt (modified) (1 diff)

fact/FADctrl/FADBoard.cc

@@ -316 +316 @@
 void FADBoard::ReadLoop() {
 
-  static char Buffer[READ_BUFFER_SIZE];
-  static unsigned int Pos = 0, Temp;
+  char Buffer[READ_BUFFER_SIZE];
+  unsigned int Pos = 0, Temp;
   const PEVNT_HEADER *Header = (PEVNT_HEADER *) Buffer;
   ssize_t Result;
@@ -384 +384 @@
           memmove(Buffer, Buffer+Temp, Pos-Temp);
           Pos -= Temp;
-          m->PrintMessage("Removed %d bytes because of start_package_flag not found\n", Temp);
+          m->PrintMessage("Removed %d bytes because of start_package_flag not found for %s\n", Temp, Name);
           continue;
         }
@@ -467 +467 @@
           if (PrevStatus.BoardID != Status.BoardID) {
                 DIM_ID->updateService(&Status.BoardID, sizeof(Status.BoardID));
-          }  
+          }
+          
+          // Inform event thread of new data
+          string Message = string("EVENT")+Name;
+          if (write(m->Pipe[1], Message.data(), Message.size()) == -1) {
+                m->Message(m->ERROR, "write() to Pipe[1] failed in class FADBoard (%s)", strerror(errno));
+                m->ExitRequest = true;
+          }         
         }
         else m->PrintMessage("End package flag incorrect, removing corrupt event\n");
-
-        // Inform event thread of new data
-        string Message = string("EVENT")+Name;
-        if (write(m->Pipe[1], Message.data(), Message.size()) == -1) {
-          m->Message(m->ERROR, "write() to Pipe[1] failed in class FADBoard (%s)", strerror(errno));
-          m->ExitRequest = true;
-        }
 
         // Remove event data from internal buffer

fact/FADctrl/History.txt

@@ -14 +14 @@
 14/2/2011       Moved initialisation commands to Evidence configuration file
 18/2/2011   Added 'reconnect' command
+28/2/2011       Removed 'static' keywords in FADBoard::ReadLoop()