Changeset 112

Timestamp:

09/24/09 11:28:59 (15 years ago)

Author:

ogrimm

Message:

Program is terminated if too many read/write errors are encoutered by the monitor thread

Location:

hvcontrol

Files:

• History.txt (modified) (1 diff)
• src/ProcessIO.cc (modified) (3 diffs)
• src/ProcessIO.h (modified) (1 diff)

hvcontrol/History.txt

@@ -24 +24 @@
             return OK if no HV boards available.
             Number of HV boards is not limited anymore. 
+24/9/2009   Program is terminated if too many errors are encountered by the
+            monitor thread

hvcontrol/src/ProcessIO.cc

@@ -619 +619 @@
     else {
       PrintMessage("Error: Could not set HV of board %d, chain %d, channel %d. Skipping channel\n",fHVBoard[Board]->GetBoardNumber(),Chain,Channel);
-      //SlowDataClass->NewEntry("Error");
-      //SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
+      SlowDataClass->NewEntry("Error");
+      SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
       return false;
     }
   }
-  //SlowDataClass->NewEntry("Value");
-  //SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
+  SlowDataClass->NewEntry("Value");
+  SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
   return true;
 }
@@ -633 +633 @@
 void ProcessIO::Monitor() {
 
+  static unsigned int MismatchCount, ErrorCount;
+  
   for (int i=0; i<NumHVBoards; i++) {
 
     if (fHVBoard[i]->GetStatus() != 1) {
-      PrintMessage("Error: Monitor, could not read status of board %d\n", fHVBoard[i]->GetBoardNumber());
+      PrintMessage("Error: Monitor could not read status of board %d\n", fHVBoard[i]->GetBoardNumber());
+      sleep(1);
+      if (ErrorCount++ > 10) {
+        PrintMessage("Too many errors from HV monitor, terminating program after next command\n");
+        Exit = true;
+        pthread_kill(SocketThread, SIGUSR1);
+      } 
     }
     
@@ -645 +653 @@
     
     if (!fHVBoard[i]->WrapOK) {
-      PrintMessage("Error: Wrap counter mismatch board %d\n",fHVBoard[i]->GetBoardNumber());
+      if (MismatchCount++>10) PrintMessage("Error: Wrap counter mismatch board %d\n",fHVBoard[i]->GetBoardNumber());
+      else PrintMessage("Too many wrap counter mismatches, stopping messages\n");
     }
 

hvcontrol/src/ProcessIO.h

@@ -45 +45 @@
   pthread_t HVMonitor;       // exit function sends signal to these threads
   pthread_t SocketThread;
-
+  
   bool Verbose;  
   int Socket;                // -1 if not connected