Changeset 264 for hvcontrol

Timestamp:

07/27/10 07:27:04 (14 years ago)

Author:

ogrimm

Message:

Removed mutex locking in hvcontrol, use lockf() in Communicate()

Location:

hvcontrol

Files:

• History.txt (modified) (1 diff)
• hvcontrol.cpp (modified) (2 diffs)
• src/HV.cc (modified) (4 diffs)
• src/ProcessIO.cc (modified) (8 diffs)
• src/ProcessIO.h (modified) (2 diffs)

hvcontrol/History.txt

@@ -38 +38 @@
                         removed 'chain' command.
 24/6/2010       Removed 'Target' from PrintMessage (can now use SendToLog() if needed)
+20/7/2010       Removed all mutex locking. Communicate() uses now lockf() to serialize access.

hvcontrol/hvcontrol.cpp

@@ -117 +117 @@
 void HVMonitor(ProcessIO *m) {
 
- 
   while (!m->ExitRequest) {
     if (m->state == active) m->Monitor();
@@ -133 +132 @@
 // Remove lock file before running default signal code
 void CrashHandler(int Signal) {
+
   remove(LOCKFILE);
   printf("Caught signal number %d. Removing lockfile and performing standard signal action. Good luck.\n",Signal);

hvcontrol/src/HV.cc

@@ -96 +96 @@
 
   unsigned char rbuf;
-  int ret;
+  int N, Ret = 0;
   fd_set SelectDescriptor;
-  
+  struct timeval WaitTime = {(long) fTimeOut, (long) ((fTimeOut-(long) fTimeOut)*1e6)};
+  
+  // === Lock file descriptor ===
+  if (lockf(fDescriptor, F_LOCK, 0) == -1) {
+        m->Message(m->ERROR, "Failed to lock file descriptor (%s)", strerror(errno));
+        return 0;
+  }
+
   // === Write data ===
-  if ((ret=write(fDescriptor, wbuf, Bytes)) < Bytes) {
-    if (ret == -1) m->Message(m->ERROR, "Could not write data to HV board (%s)", strerror(errno));
-    else m->Message(m->ERROR, "Could write only %d of %d bytes to HV board", ret, Bytes);
+  if ((N = write(fDescriptor, wbuf, Bytes)) < Bytes) {
+    if (N == -1) m->Message(m->ERROR, "Could not write data to HV board (%s)", strerror(errno));
+    else m->Message(m->ERROR, "Could write only %d of %d bytes to HV board", N, Bytes);
     ErrorCount++;
-    return 0;
+        goto ExitCommunicate;
   }
 
   // === Try to read until time-out ===
   FD_ZERO(&SelectDescriptor);   FD_SET(fDescriptor, &SelectDescriptor);
-  struct timeval WaitTime = {(long) fTimeOut, (long) ((fTimeOut-(long) fTimeOut)*1e6)};
   if (select(fDescriptor+1, &SelectDescriptor, NULL, NULL, &WaitTime)==-1) {
     m->Message(m->ERROR, "Error with select() (%s)", strerror(errno));
-    return 0;
+        goto ExitCommunicate;
   }
   // Time-out expired?
-  if (!FD_ISSET(fDescriptor, &SelectDescriptor)) return -1;
+  if (!FD_ISSET(fDescriptor, &SelectDescriptor)) {
+        Ret = -1;
+        goto ExitCommunicate;
+  }
 
   // Read error?    
-  if ((ret = read(fDescriptor, &rbuf, 1)) == -1) {
+  if (read(fDescriptor, &rbuf, 1) == -1) {
     m->Message(m->ERROR, "Read error (%s)", strerror(errno));
     ErrorCount++;
-    return 0;
+        goto ExitCommunicate;
   }
 
@@ -132 +141 @@
   for (int i=0; i<NUM_CHAINS; i++) Overcurrent[i] = (rbuf & (0X08 << i));
   ResetButton = (bool) (rbuf & 0X80);
-
-  return 1;
-}
-
-
-/* Reset HV board - uses TRead() and has same return values */
+  Ret =  1;
+
+  // === UnLock file descriptor ===
+  ExitCommunicate:
+  if (lockf(fDescriptor, F_LOCK, 0) == -1) {
+        m->Message(m->ERROR, "Failed to lock file descriptor (%s)", strerror(errno));
+        return 0;
+  }
+  
+  return Ret;
+}
+
+
+// Reset HV board
 int HVBoard::Reset() {
   
@@ -151 +168 @@
 
 
-/* Read status register - uses TRead() and has same return values */
+// Read status register
 int HVBoard::GetStatus() {
 
@@ -160 +177 @@
 
 
-/* Set high voltage - uses TRead() and has same return values */
+// Set high voltage 
 int HVBoard::SetHV(int chain, unsigned int channel, int hv) {
 

hvcontrol/src/ProcessIO.cc

@@ -30 +30 @@
         {"rate", &ProcessIO::cmd_rate, 1, "<rate>", "Set status refresh rate in Hz"},
         {"timeout", &ProcessIO::cmd_timeout, 1, "<time>", "Set timeout to return from read in seconds"},
-        {"reset", &ProcessIO::cmd_reset, 0, "", "Reset active bias board"},
+        {"reset", &ProcessIO::cmd_reset, 0, "", "Reset active bias boards"},
         {"start", &ProcessIO::cmd_start, 0, "", "Start bias status monitor"},
         {"stop", &ProcessIO::cmd_stop, 0, "", "Stop bias status monitor"},
@@ -53 +53 @@
   FirstBoard  = 0;
   LastBoard   = -1;
-
-  // Initialize mutex for thread synchronisation
-  if (pthread_mutex_init(&Mutex, NULL) != 0) {
-    Message(FATAL, "pthread_mutex_init() failed");
-  }
 
   // DIM console service used in PrintMessage()
@@ -109 +104 @@
   delete calib;
   delete ConsoleOut;    
-  free(ConsoleText);
-  
-  // Destroy mutex
-  if (pthread_mutex_destroy(&Mutex) != 0) Message(ERROR, "pthread_mutex_destroy() failed");
+  free(ConsoleText);  
 }
 
@@ -370 +362 @@
 void ProcessIO::cmd_reset() {
 
-  for (int i=FirstBoard; i<=LastBoard; i++) ResetBoard(i);
+  for (int i=FirstBoard; i<=LastBoard; i++) {
+        if (fHVBoard[i]->Reset() == 1) {
+          PrintMessage("Reset of board %d\n", fHVBoard[i]->GetBoardNumber());
+          PrintBoardStatus(i);
+        }
+        else PrintMessage("Error: Could not reset board %d\n",fHVBoard[i]->GetBoardNumber());
+  }
 }
 
@@ -527 +525 @@
 
   static bool Warned = false;
-  int Ret;
-
-  // Lock because command execution runs in different thread
-  if ((Ret = pthread_mutex_lock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_lock() failed in commandHandler() (%s)", strerror(Ret));
-  }
 
   for (int i=0; i<NumHVBoards; i++) {
@@ -549 +541 @@
     if (fHVBoard[i]->ResetButton) {
       Message(INFO, "Manual reset of board %d", fHVBoard[i]->GetBoardNumber());
-      ResetBoard(i);
+          fHVBoard[i]->Reset();
     }
     
@@ -558 +550 @@
     for (int j=0; j<NUM_CHAINS; j++) {
       if (fHVBoard[i]->Overcurrent[j]) {
-                Message(WARN, "Warning: Overcurrent in chain %d of board %d",j,fHVBoard[i]->GetBoardNumber());
-                ResetBoard(i);
+                Message(WARN, "Warning: Overcurrent in chain %d of board %d, resetting board",j,fHVBoard[i]->GetBoardNumber());
+                fHVBoard[i]->Reset();
       }
     }
-  }
-  
-  // Unlock
-  if ((Ret = pthread_mutex_unlock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_lock() failed in commandHandler() (%s)", strerror(Ret));
-  }
-
-}
-
-
-// Send reset to board and clear voltage arrays
-void ProcessIO::ResetBoard(int i) {
-    
-  if (fHVBoard[i]->Reset() == 1) {
-    PrintMessage("Reset of board %d\n", fHVBoard[i]->GetBoardNumber());
-    PrintBoardStatus(i);
-  }
-  else PrintMessage("Error: Could not reset board %d\n",fHVBoard[i]->GetBoardNumber());
-}
+  }  
+}
+
 
 
@@ -597 +573 @@
 
 
-// Command handling (mutex needed because of monitor thread)
+// Command handling
 void ProcessIO::commandHandler() {
 
-  int Ret;
-
-  if ((Ret = pthread_mutex_lock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_lock() failed in commandHandler() (%s)", strerror(Ret));
-  }
-
   if ((getCommand()==Command) && (*(Command->getString()+Command->getSize()-1)=='\0')) {
-        SendToLog("Command '%s' from %s (ID %d)", Command->getString(), getClientName(), getClientId());
         CommandControl(Command->getString());
-  }
-
-  if ((Ret = pthread_mutex_unlock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_unlock() failed in commandHandler() (%s)", strerror(Ret));
   }
 }

hvcontrol/src/ProcessIO.h

@@ -54 +54 @@
         unsigned int fHVMaxDiff;
 
-        // Status variables  
         pthread_t HVMonitor;       // exit function sends signal to these threads
-        pthread_mutex_t Mutex;
-
         int NumHVBoards;
         int FirstBoard;
@@ -71 +68 @@
         bool RampVoltage(unsigned int, int, int, int);
         void Monitor();
-        void ResetBoard(int);
         void PrintBoardStatus(int);