Changeset 229 for Chief

Timestamp:

06/24/10 07:51:15 (14 years ago)

Author:

ogrimm

Message:

Config requests non-blocking if not made from main thread, adapted all servers to GetConfig() returning std::string, workaround for erroneous SERVICE_LIST

File:

• Chief/Chief.cc (modified) (6 diffs)

Chief/Chief.cc

@@ -14 +14 @@
 #define SERVER_NAME "Chief"
 #include "Evidence.h"
+
+using namespace std;
 
 // ========= Class Declarations =========
@@ -38 +40 @@
         
         DimService *LastRunNumber;
-        char *RunNumFilename;
+        string RunNumFilename;
         int RunNumber;
 };
@@ -70 +72 @@
   
   // Open file containing last run number
-  FILE *RunNumFile = fopen(Chief->RunNumFilename, "r+");
+  FILE *RunNumFile = fopen(Chief->RunNumFilename.c_str(), "r+");
   if(RunNumFile == NULL) {
-    Chief->Message(Chief->ERROR, "Could not open file '%s' that contains the last run number (%s)", Chief->RunNumFilename, strerror(errno));
+    Chief->Message(Chief->ERROR, "Could not open file '%s' that contains the last run number (%s)", Chief->RunNumFilename.c_str(), strerror(errno));
         OK = false;
   }
@@ -78 +80 @@
         // Read last run number
         if(fscanf(RunNumFile,"%d", &RunNumber) != 1 ) {
-      Chief->Message(Chief->ERROR, "Could not read run number from file '%s'", Chief->RunNumFilename);
+      Chief->Message(Chief->ERROR, "Could not read run number from file '%s'", Chief->RunNumFilename.c_str());
           OK = false;
         }
@@ -86 +88 @@
         rewind(RunNumFile);
         if(OK && fprintf(RunNumFile,"%.8u   ",RunNumber) < 0) {
-      Chief->Message(Chief->ERROR, "Could not write to run number file '%s'", Chief->RunNumFilename);
+      Chief->Message(Chief->ERROR, "Could not write to run number file '%s'", Chief->RunNumFilename.c_str());
           OK = false;
         }
@@ -92 +94 @@
         // Close run number file
         if(fclose(RunNumFile) != 0) {
-      Chief->Message(Chief->ERROR, "Could not close run number file '%s'", Chief->RunNumFilename);
+      Chief->Message(Chief->ERROR, "Could not close run number file '%s'", Chief->RunNumFilename.c_str());
           OK = false;
         }