Changeset 254 for drsdaq/DAQReadout.cc

Timestamp:

07/20/10 13:20:47 (14 years ago)

Author:

ogrimm

Message:

Replaced mutex by Lock()/Unlock() from Evidence class, added feedback state service

File:

• drsdaq/DAQReadout.cc (modified) (16 diffs)

drsdaq/DAQReadout.cc

@@ -57 +57 @@
 
 // Global pointer for thread entry routines
-class DAQReadout *This;
+class DAQReadout *ThisClass;
 
 // -----------------------------------------------
@@ -67 +67 @@
 
   // Initialization
-  This = this;
-  MainThread = getpid();
+  ThisClass = this;
+  MainThread = pthread_self();
   ConsoleText = NULL;
   time(&StartTime);
@@ -74 +74 @@
   // DIM console service used in PrintMessage()
   ConsoleOut = new DimService(SERVER_NAME"/ConsoleOut", (char *) "");
-
-  // Initialize mutex for thread synchronisation
-  if (pthread_mutex_init(&Mutex, NULL) != 0) {
-    Message(FATAL, "pthread_mutex_init() failed");
-  }
 
   // Initialize status structure
@@ -169 +164 @@
   delete ConsoleOut;
   free(ConsoleText);
-  
-  if (pthread_mutex_destroy(&Mutex) != 0) Message(ERROR, "pthread_mutex_destroy() failed");
 }
 
@@ -202 +195 @@
   else if(CommandList[Count].NeedNotBusy && NumBoards==0) PrintMessage("No boards available\n");
   else {
-        int Ret;
-
-        // Lock (Execute() runs in thread spawned by commandHandler())
-        if ((Ret = pthread_mutex_lock(&Mutex)) != 0) {
-          Message(FATAL, "pthread_mutex_lock() failed (%s)", strerror(Ret));
-        }
-        // Run command
         CmdNumber = Count;
         (this->*CommandList[CmdNumber].CommandPointer)();
-        // Unlock
-        if ((Ret = pthread_mutex_unlock(&Mutex)) != 0) {
-          Message(FATAL, "pthread_mutex_unlock() failed (%s)", strerror(Ret));
-        }
   }
 }
@@ -238 +220 @@
 // Print DAQ configuration
 void DAQReadout::cmd_config() {
-  PrintConfig(MsgToConsole);
+  PrintConfig();
 }
 
@@ -411 +393 @@
   } 
 
-  PrintMessage(MsgToConsole, "==START== %d %.2f %.2f ",kNumberOfBins+2,DRSFreq[Board],GetBoard(Board)->GetPrecision());
+  PrintMessage("==START== %d %.2f %.2f ",kNumberOfBins+2,DRSFreq[Board],GetBoard(Board)->GetPrecision());
   for (int k=0; k<kNumberOfBins; k++) {
-    PrintMessage(MsgToConsole, "%.1f ", (float) WaveForm[Board][Chip][Channel][k]);
-  }
-  PrintMessage(MsgToConsole, "==END==");
-  PrintMessage(MsgToConsole, "\n");
-  PrintMessage(MsgToConsole, "Trigger cell: %d\n", TriggerCell[Board][Chip]);  
+    PrintMessage("%.1f ", (float) WaveForm[Board][Chip][Channel][k]);
+  }
+  PrintMessage("==END==");
+  PrintMessage("\n");
+  PrintMessage("Trigger cell: %d\n", TriggerCell[Board][Chip]);  
 } 
 
@@ -757 +739 @@
   for(unsigned int i=0; i<sizeof(CommandList)/sizeof(CL_Struct); i++) {
     snprintf(Buffer, sizeof(Buffer), "%s %s", CommandList[i].Name, CommandList[i].Parameters);
-    PrintMessage(MsgToConsole, "%-28s%s\n", Buffer, CommandList[i].Help);
+    PrintMessage("%-28s%s\n", Buffer, CommandList[i].Help);
   }     
-  PrintMessage(MsgToConsole,".<command>                  Execute shell command\n\n"
+  PrintMessage(".<command>                  Execute shell command\n\n"
    "Items in <> are mandatory, in [] optional, | indicates mutual exclusive or.\n"
    "Test data can also be written if no DRS boards are available.\n"
@@ -770 +752 @@
 
   if (daq_state == active) PrintMessage("Issue 'stop' first to stop daq\n");
-  else kill(MainThread, SIGTERM);  
+  else pthread_kill(MainThread, SIGTERM);  
 }
 
@@ -777 +759 @@
 
   if(Match(Param[1],"off")) HVFB->SetFBMode(FB_Off);
-  if(Match(Param[1],"active")) HVFB->SetFBMode(FB_Active);
-  if(Match(Param[1],"targets")) HVFB->SetFBMode(FB_Targets);
-  HVFB->GetFBMode();
+  else if(Match(Param[1],"active")) HVFB->SetFBMode(FB_Active);
+  else if(Match(Param[1],"targets")) HVFB->SetFBMode(FB_Targets);
+  else HVFB->GetFBMode();
 }
 
@@ -823 +805 @@
 void DAQReadout::cmd_fconfig() {
 
-  HVFB->PrintConfig(MsgToConsole);
+  HVFB->PrintConfig();
 }
 
@@ -1175 +1157 @@
 
 // Print configuration to target
-void DAQReadout::PrintConfig(int Target) {
-  PrintMessage(Target, "RawDataPath: %s\n"
+void DAQReadout::PrintConfig() {
+  PrintMessage("RawDataPath: %s\n"
                "DefaultFrequency: %.2f\tFirstSample: %d\tSamples: %u\n"
                "MinDiskSpaceMB: %u\tMaxFileSizeMB: %d\n"
@@ -1191 +1173 @@
 // Print progress (used in DRS class)
 void DAQReadout::Progress(int Progress) {
-  PrintMessage(MsgToConsole, "\rProgress: %d%%              ", Progress);
+  PrintMessage("\rProgress: %d%%              ", Progress);
   fflush(stdout);
 };
- 
-// Print message to selected target
-void DAQReadout::PrintMessage(int Target, const char *Format, ...) {
-
-  va_list ArgumentPointer;
-  va_start(ArgumentPointer, Format); 
-  DoPrintMessage(Format, ArgumentPointer, Target);
-  va_end(ArgumentPointer);
-}
 
 // Print message to console only
 void DAQReadout::PrintMessage(const char *Format, ...) {
+
+  static char Error[] = "vasprintf() failed in PrintMessage()";
+  char *Text;
+
+  // Evaluate arguments
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format);
-  DoPrintMessage(Format, ArgumentPointer, MsgToConsole);
+  if (vasprintf(&Text, Format, ArgumentPointer) == -1) Text = Error;
   va_end(ArgumentPointer);
-}
-
-// Function doing the actual printing work
-// Note: Be careful when overloading variadic functions. va_list is
-// in gcc an int, which can be interpreted as char *...
-void DAQReadout::DoPrintMessage(const char *Format, va_list ArgumentPointer, int Target) {
-
-  static char Error[] = "vasprintf() failed in DoPrintMessage()";
-  char *Text;
-
-  // Evaluate arguments    
-  if (vasprintf(&Text, Format, ArgumentPointer) == -1) Text = Error;
   
   // Print to console
-  if(Target & MsgToConsole) {
-    if(strlen(Text)>0 && Text[strlen(Text)-1]=='\n') printf("\r%s%s", Text, Prompt);  // New prompt
-    else printf("%s", Text);
-        fflush(stdout);
-  }
-  
-  // Send to DIM console service and to log if requested
-  ConsoleOut->updateService(Text);
-  if(Target & MsgToLog) SendToLog("%s %s", SERVER_NAME, Text);
+  if(strlen(Text)>0 && Text[strlen(Text)-1]=='\n') printf("\r%s%s", Text, Prompt); // New prompt
+  else printf("%s", Text);
+  fflush(stdout);
+
+  // Send to DIM text service
+  ConsoleOut->updateService(Text); 
 
   // Free old text
@@ -1246 +1209 @@
           *((char *) getCommand()->getData()+getCommand()->getSize()-1) != '\0' ||
           strlen(getCommand()->getString()) == 0) return;
-
-  // Log command reception
-  SendToLog("Command '%s' from %s (ID %d)", getCommand()->getString(), getClientName(), getClientId());
 
   // Copy command to new buffer (will be freed by global Execute() function)
@@ -1263 +1223 @@
     PrintMessage("pthread_create() failed in DRSReadout::commandHandler() (%s)\n", strerror(Code));
   }
-  else {
-    if ((Code = pthread_detach(Thread)) != 0) {
-          PrintMessage("pthread_detach() failed in DRSReadout::commandHandler() (%s)\n", strerror(Code));
-        }
+  else if ((Code = pthread_detach(Thread)) != 0) {
+        PrintMessage("pthread_detach() failed in DRSReadout::commandHandler() (%s)\n", strerror(Code));
   }  
 }
@@ -1459 +1417 @@
 void Execute(char *Command) {
 
- This->Execute(Command);
- free(Command);
-}
+  ThisClass->Lock();
+  ThisClass->Execute(Command);
+  free(Command);
+  ThisClass->Unlock();
+}