Changeset 10373

Timestamp:

04/15/11 23:03:39 (14 years ago)

Author:

tbretz

Message:

Changed basis of MessageImp::Write function from const char* to std::string& to be able to boost::bind the function, because boost::bind will hold an internal copy of the string.

Location:

trunk/FACT++/src

Files:

• Connection.cc (modified) (1 diff)
• Connection.h (modified) (1 diff)
• MessageDim.cc (modified) (4 diffs)
• MessageDim.h (modified) (3 diffs)
• MessageImp.cc (modified) (2 diffs)
• MessageImp.h (modified) (1 diff)
• StateMachineDim.h (modified) (1 diff)

trunk/FACT++/src/Connection.cc

@@ -23 +23 @@
     // -------- Abbreviations for starting async tasks ---------
 
-int Connection::Write(const Time &t, const char *txt, int qos)
+int Connection::Write(const Time &t, const string &txt, int qos)
 {
     if (fLog)

trunk/FACT++/src/Connection.h

@@ -61 +61 @@
     void HandleSentData(const boost::system::error_code& error, size_t);
 
-    int Write(const Time &t, const char *txt, int qos=kInfo);
+    int Write(const Time &t, const std::string &txt, int qos=kInfo);
 
     virtual void ConnectionEstablished() { }

trunk/FACT++/src/MessageDim.cc

@@ -62 +62 @@
 //! transmitted messages.
 //
-int MessageDimTX::Write(const Time &t, const char *txt, int qos)
+int MessageDimTX::Write(const Time &t, const string &txt, int qos)
 {
     MessageImp::Write(t, txt, qos);
@@ -69 +69 @@
     // hold a local copy of the data.
     setQuality(qos);
-    setData(const_cast<char*>(txt));
+    setData(const_cast<char*>(txt.c_str()));
     const int rc = updateService();
 
@@ -112 +112 @@
 MessageDimRX::MessageDimRX(const std::string &name, MessageImp &imp)
 : fMsg(imp),
-fDimMessage(Form("%s/MESSAGE", name.c_str()).c_str(), const_cast<char*>(""), this)
+fDimMessage(Form("%s/MESSAGE", name.c_str()).c_str(), const_cast<char*>(""), this),
+fConnected(false)
 {
     fMinLogLevel = 0;
@@ -129 +130 @@
 
     // The server is diconnected. Do nothing
-    if (getInfo()->getTimestamp()==0)
+    if (getInfo()->getTimestamp()==0 || getInfo()->getSize()==1)
     {
+        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

@@ -17 +17 @@
     ~MessageDimTX();
 
-    int Write(const Time &t, const char *txt, int qos=kInfo);
+    int Write(const Time &t, const std::string &txt, int qos=kInfo);
 
     void SetDebug(bool b=true) { fDebug=b; }
@@ -34 +34 @@
     DimStampedInfo fDimMessage;
 
-    int fMinLogLevel;
+    int  fMinLogLevel;
+    bool fConnected;
 
 protected:
@@ -43 +44 @@
 
     void SetMinLogLevel(int min=0) { fMinLogLevel=min; }
+    bool IsConnected() const { return fConnected; }
 };
 

trunk/FACT++/src/MessageImp.cc

@@ -69 +69 @@
 //!    The severity of the message
 //
-int MessageImp::Write(const Time &time, const char *txt, int severity)
+int MessageImp::Write(const Time &time, const string &txt, int severity)
 {
     switch (severity)
@@ -96 +96 @@
 //!    The severity of the message to be passed to Write
 //
-int MessageImp::Update(const char *txt, int severity)
+int MessageImp::Update(const string &txt, int severity)
 {
     Write(Time(), txt, severity);

trunk/FACT++/src/MessageImp.h

@@ -28 +28 @@
     MessageImp(std::ostream &out=std::cout);
 
-    virtual int Write(const Time &time, const char *txt, int qos=kInfo);
+    virtual int Write(const Time &time, const std::string &txt, int qos=kInfo);
 
-    int Update(const char *txt, int qos=kInfo);
-    int Update(const std::string &str, int qos=kInfo) { return Update(str.c_str(), qos); }
+    int Update(const std::string &str, int qos=kInfo);
+    int Update(const char *txt, int qos=kInfo) { return Update(std::string(txt), qos); }
     int Update(const std::stringstream &str, int qos=kInfo) { return Update(str.str(), qos); }
     int Update(int qos, const char *fmt, ...);
 
-    int Debug(const char *txt)   { return Update(txt, kDebug); }
-    int Message(const char *txt) { return Update(txt, kMessage); }
-    int Info(const char *txt)    { return Update(txt, kInfo);    }
-    int Warn(const char *txt)    { return Update(txt, kWarn);    }
-    int Error(const char *txt)   { return Update(txt, kError);   }
-    int Fatal(const char *txt)   { return Update(txt, kFatal);   }
+    int Debug(const std::string &str)    { return Update(str, kDebug);   }
+    int Message(const std::string &str)  { return Update(str, kMessage); }
+    int Info(const std::string &str)     { return Update(str, kInfo);    }
+    int Warn(const std::string &str)     { return Update(str, kWarn);    }
+    int Error(const std::string &str)    { return Update(str, kError);   }
+    int Fatal(const std::string &str)    { return Update(str, kFatal);   }
 
-    int Debug(const std::string &str)   { return Debug(str.c_str()); }
-    int Message(const std::string &str) { return Message(str.c_str()); }
-    int Info(const std::string &str)    { return Info(str.c_str());    }
-    int Warn(const std::string &str)    { return Warn(str.c_str());    }
-    int Error(const std::string &str)   { return Error(str.c_str());   }
-    int Fatal(const std::string &str)   { return Fatal(str.c_str());   }
+    int Debug(const char *txt)   { return Debug(std::string(txt));   }
+    int Message(const char *txt) { return Message(std::string(txt)); }
+    int Info(const char *txt)    { return Info(std::string(txt));    }
+    int Warn(const char *txt)    { return Warn(std::string(txt));    }
+    int Error(const char *txt)   { return Error(std::string(txt));   }
+    int Fatal(const char *txt)   { return Fatal(std::string(txt));   }
 
     int Debug(const std::stringstream &str)   { return Debug(str.str()); }

trunk/FACT++/src/StateMachineDim.h

@@ -40 +40 @@
 
     /// Redirect our own logging to fLog
-    int Write(const Time &time, const char *txt, int qos);
+    int Write(const Time &time, const std::string &txt, int qos);
 
     /// This is an internal function to do some action in case of