Changeset 264 for hvcontrol/src/HV.cc

Timestamp:

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

Author:

ogrimm

Message:

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

File:

• hvcontrol/src/HV.cc (modified) (4 diffs)

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) {