Changeset 12892

Timestamp:

02/15/12 17:30:45 (13 years ago)

Author:

ogrimm

Message:

New inCallback() method of DIM version v19r23 used

Location:

fact/Evidence

Files:

• Evidence.cc (modified) (8 diffs)
• Evidence.h (modified) (1 diff)
• readme.txt (modified) (1 diff)

fact/Evidence/Evidence.cc

@@ -93 +93 @@
 EvidenceServer *EvidenceServer::This = NULL;
 pthread_mutex_t EvidenceServer::Mutex;
-set<pthread_t> EvidenceServer::Threads;
-
 
 // Constructor
@@ -104 +102 @@
   ExitRequest = false;
   This = this;
-  Threads.insert(pthread_self());
 
   // Initialise mutex
@@ -258 +255 @@
 
   string Result;
-  bool Blocking = false;
   
   // If up-to-date data in configuration list available, return this
   Lock();
   if ((List.count(Item) > 0) && (List[Item].Time >= ConfClass->ConfigTimeStamp)) Result = List[Item].Value;
-  if (Threads.count(pthread_self()) != 0) Blocking = true;
   Unlock();
   if (!Result.empty()) return Result;
 
-  // Blocking configuration request
-  if (Blocking) {
+  if (inCallback() == 0) {
+        // Blocking configuration request
         DimRpcInfo Config((char *) "ConfigRequest", NO_LINK);
         Config.setData((char *) (Name + " " + Item).c_str());
@@ -292 +287 @@
         }       
   }
-
-  // Non-blocking configuration request
-  if (!Blocking) {
+  else {
+        // Non-blocking configuration request
         Lock();
 
@@ -346 +340 @@
 void EvidenceServer::CallConfigChanged() {
 
-  EvidenceServer::Lock();
-  EvidenceServer::Threads.insert(pthread_self());
-  EvidenceServer::Unlock();
-
   This->ConfigChanged();
-  
-  EvidenceServer::Lock();
-  EvidenceServer::Threads.erase(pthread_self());
-  EvidenceServer::Unlock();
 }
 
@@ -434 +420 @@
         return Text.str();
   }
+
+  // Simplify format "?;1" to "?" 
+  if (strlen(Format)==3 && Format[2]=='1') Format[1] = '\0';
   
   // Structure: print hex representation 
@@ -450 +439 @@
   // Number array
   int ElementSize;
-  switch (*Format) {
+  switch (toupper(*Format)) {
+    case 'B':
+        case 'V':
     case 'C': ElementSize = sizeof(char);               break;
     case 'I':
@@ -466 +457 @@
 
         // Translate data
-        switch (*Format) {
+        switch (toupper(*Format)) {
+          case 'B':
+          case 'V':
       case 'C': Text << *((char *) Data + i);           break;
       case 'I':

fact/Evidence/Evidence.h

@@ -59 +59 @@
         class Config *ConfClass;
         static pthread_mutex_t Mutex;
-        static std::set<pthread_t> Threads;
         static EvidenceServer *This;
 

fact/Evidence/readme.txt

@@ -54 +54 @@
 6/7/2011        Missing pthread_mutexattr_init() in Evidence constructor caused spurious errors when
                         locking mutex
+2/8/2011        Used inCallback() method of DIM version v19r23 to decide between blocking or non-blocking config request.
+                        Updated EvidenceServer::ToString() for B and V formats.