Changeset 10263 for fact

Timestamp:

03/29/11 15:08:34 (14 years ago)

Author:

ogrimm

Message:

Limited DIM slow-control update rate

Location:

fact/FADctrl

Files:

• FAD.h (modified) (2 diffs)
• FADBoard.cc (modified) (2 diffs)
• History.txt (modified) (1 diff)

fact/FADctrl/FAD.h

@@ -46 +46 @@
         static void LaunchEventThread(class FAD *);
         pthread_t Thread;
-        float EventUpdateDelay;
 
     int Datafile;
@@ -92 +91 @@
         int Pipe[2];
     int NumEventsRequested;     // Number of events requested
+        float EventUpdateDelay;
         std::vector<std::string> BoardList;
 };

fact/FADctrl/FADBoard.cc

@@ -348 +348 @@
   struct sockaddr_in SocketAddress;
   struct BoardStatus PrevStatus;
+  time_t LastUpdate = 0; 
   int Ret;
 
@@ -506 +507 @@
 
           // Update DIM services if necessary
-          if (memcmp(PrevStatus.Temp, Status.Temp, sizeof(Status.Temp)) != 0) {
-                DIM_Temp->updateService(Status.Temp, sizeof(Status.Temp));
-          }
-          if (memcmp(PrevStatus.DAC, Status.DAC, sizeof(Status.DAC)) != 0) {
-                DIM_DAC->updateService(Status.DAC, sizeof(Status.DAC));
-          }  
-          if (memcmp(PrevStatus.ROI, Status.ROI, sizeof(Status.ROI)) != 0) {
-                DIM_ROI->updateService(Status.ROI, sizeof(Status.ROI));
-          }  
-          if (PrevStatus.BoardID != Status.BoardID) {
-                DIM_ID->updateService(&Status.BoardID, sizeof(Status.BoardID));
+          if (time(NULL) - LastUpdate > m->EventUpdateDelay) {
+                LastUpdate = time(NULL);
+
+                if (memcmp(PrevStatus.Temp, Status.Temp, sizeof(Status.Temp)) != 0) {
+                  DIM_Temp->updateService(Status.Temp, sizeof(Status.Temp));
+                }
+                if (memcmp(PrevStatus.DAC, Status.DAC, sizeof(Status.DAC)) != 0) {
+                  DIM_DAC->updateService(Status.DAC, sizeof(Status.DAC));
+                }  
+                if (memcmp(PrevStatus.ROI, Status.ROI, sizeof(Status.ROI)) != 0) {
+                  DIM_ROI->updateService(Status.ROI, sizeof(Status.ROI));
+                }  
+                if (PrevStatus.BoardID != Status.BoardID) {
+                  DIM_ID->updateService(&Status.BoardID, sizeof(Status.BoardID));
+                }
           }
           

fact/FADctrl/History.txt

@@ -19 +19 @@
 28/3/2011       Boards with communication error set themselves inactive
 29/3/2011       Added Status message service for each board (removed several console messages in turn)
+                        Limited update rate of slow control data to 1 second or interval set by 'update'