Changeset 10439 for trunk

Timestamp:

04/21/11 09:50:11 (14 years ago)

Author:

tbretz

Message:

Added new class DimNetworkInfo which initialized members secs and millisecs which remain uninitialized by Dim; set the default size of the nolink argument to 0, in this way we can distinguish between an empty string and nolink.

Location:

trunk/FACT++/src

Files:

• DimNetwork.cc (modified) (3 diffs)
• DimNetwork.h (modified) (2 diffs)
• MessageDim.cc (modified) (2 diffs)
• MessageDim.h (modified) (3 diffs)

trunk/FACT++/src/DimNetwork.cc

@@ -3 +3 @@
 StateClient::StateClient(const std::string &name, MessageImp &imp) :
     MessageDimRX(name, imp), fState(-2),
-    fInfoState((name + "/STATE").c_str(), const_cast<char*>(""), this)
+    fInfoState((name + "/STATE").c_str(), const_cast<char*>(""), 0, this)
 {
 }
@@ -20 +20 @@
     if (curr==&fInfoState)
     {
-        const char *txt = fInfoState.getString();
+        const bool disconnected = fInfoState.getSize()==0;
 
-        fState     = strlen(txt)==0 ? -2 : fInfoState.getQuality();
+        fState     = disconnected ? -2 : fInfoState.getQuality();
         fStateTime = Time(fInfoState.getTimestamp(),
                           fInfoState.getTimestampMillisecs()*1000);
@@ -28 +28 @@
         const string name = fInfoState.getName();
 
-        fMsg.StateChanged(fStateTime, name.substr(0, name.length()-6), txt, fState);
+        fMsg.StateChanged(fStateTime, name.substr(0, name.length()-6),
+                          disconnected ? "" : fInfoState.getString(), fState);
 
         return;

trunk/FACT++/src/DimNetwork.h

@@ -22 +22 @@
     int  fState;               /// -2 not initialized, -1 not connected, 0>= state of client
 
-    DimStampedInfo fInfoState; /// The dim service subscription
+    DimNetworkInfo fInfoState; /// The dim service subscription
 
 protected:
@@ -33 +33 @@
     int  GetState() const    { return fState;    }
 
-    const char *GetName() const { return const_cast<DimStampedInfo&>(fInfoState).getName(); }
+    const char *GetName() const { return const_cast<DimNetworkInfo&>(fInfoState).getName(); }
 };
 

trunk/FACT++/src/MessageDim.cc

@@ -112 +112 @@
 MessageDimRX::MessageDimRX(const std::string &name, MessageImp &imp)
 : fMinLogLevel(0), fConnected(false), fMsg(imp),
-fDimMessage((name+"/MESSAGE").c_str(), const_cast<char*>(""), this)
+fDimMessage((name+"/MESSAGE").c_str(), const_cast<char*>(""), 0, this)
 {
 }
@@ -127 +127 @@
         return;
 
+    fConnected = getInfo()->getSize()!=0;
+
     // The server is diconnected. Do nothing
-    if (getInfo()->getTimestamp()==0 || getInfo()->getSize()==1)
+    if (!fConnected)
     {
-        fConnected=false;
         fMsg.Message("Disconnected.");
         return;
     }
-
-    fConnected=true;
 
     // skip all messages with a severity smaller than the minimum log level

trunk/FACT++/src/MessageDim.h

@@ -26 +26 @@
 #include <dic.hxx> // DimStampedInfo
 
+class DimNetworkInfo : public DimStampedInfo
+{
+public:
+    DimNetworkInfo(const char *name, const char *nolink, int size, DimInfoHandler *ptr)
+        : DimStampedInfo(name, const_cast<char*>(nolink), size, ptr)
+    {
+        secs      = 0;
+        millisecs = 0;
+    }
+};
+
 class MessageDimRX : public DimInfoHandler
 {
@@ -36 +47 @@
 
 private:
-    DimStampedInfo fDimMessage;
+    DimNetworkInfo fDimMessage;
 
 protected:
@@ -49 +60 @@
 
 #endif
+
+// **************************************************************************
+/** @class DimNetworkInfo
+
+@brief Direct derivative of DimStampedInfo
+
+Since secs and millisecs are not initialized in the base class
+valgrind throws a couple of warnings debugging applications.
+
+This derivative just initialized them with 0. It will be removed as
+soon as the initialization was done in Dim itself.
+
+**/
+// **************************************************************************