Changeset 541 for trunk

Timestamp:

02/10/11 11:29:47 (16 months ago)

Author:

acbernst

Message:

fixed log messages

File:

• trunk/avango-core/src/avango/network/Msg.cpp (modified) (20 diffs)

trunk/avango-core/src/avango/network/Msg.cpp

@@ -35 +35 @@
 
 #include <boost/format.hpp>
+#include <boost/scoped_array.hpp>
 
 namespace
@@ -151 +152 @@
   msg.push(&b, sizeof(b));
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (int32_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (int32_t) [%1%]") % buf));
 }
 
@@ -164 +165 @@
   xdr_int(xdr.getXDR(), (int32_t*) &buf);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (int32_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (int32_t) [%1%]") % buf));
 }
 
@@ -212 +213 @@
   msg.push(&b, sizeof(b));
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (uint32_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (uint32_t) [%1%]") % buf));
 }
 
@@ -225 +226 @@
   xdr_u_int(xdr.getXDR(), &buf);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (uint32_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (uint32_t) [%1%]") % buf));
 }
 
@@ -273 +274 @@
   msg.push(&b, sizeof(b));
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (int64_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (int64_t) [%1%]") % buf));
 }
 
@@ -286 +287 @@
   xdr_longlong_t(xdr.getXDR(), (int64_t*) &buf);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (int64_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (int64_t) [%1%]") % buf));
 }
 
@@ -334 +335 @@
   msg.push(&b, sizeof(b));
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (uint64_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (uint64_t) [%1%]") % buf));
 }
 
@@ -347 +348 @@
   xdr_u_longlong_t(xdr.getXDR(), (uint64_t*) &buf);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (uint64_t) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (uint64_t) [%1%]") % buf));
 }
 
@@ -396 +397 @@
   msg.push(&b, sizeof(b));
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (float) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (float) [%1%]") % buf));
 }
 
@@ -409 +410 @@
   xdr_float(xdr.getXDR(), &buf);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (float) [%1%]") % buf)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (float) [%1%]") % buf));
 }
 
@@ -520 +521 @@
 av::av_pushMsg(av::Msg& msg, const AnyLink& buf)
 {
-  AVANGO_LOG(logger, logging::TRACE, "push: (AnyLink) [<blank>]")
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (AnyLink) [<blank>]")));
 
   if (!buf.isValid())
@@ -546 +547 @@
 av::av_popMsg(av::Msg& msg, AnyLink& buf)
 {
-  AVANGO_LOG(logger, logging::TRACE, "pop: (AnyLink) [<blank>]")
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (AnyLink) [<blank>]")));
 
   NetID id;
@@ -568 +569 @@
   {
     // this object is either not there or of wrong type.
-    AVANGO_LOG(logger, logging::WARN, "pop: object is either not there or of wrong type.")
+    AVANGO_LOG(logger, logging::WARN, boost::str(boost::format("pop: object is either not there or of wrong type.")));
     buf.clear();
   }
@@ -637 +638 @@
 av::av_pushMsg(av::Msg& msg, av::Distributed* distrObj)
 {
-  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (Distributed*) [%1%,%2%,%3%,%4%]")
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (Distributed*) [%1%,%2%]")
                  % distrObj
                  % distrObj->getTypeId().getName()))
@@ -648 +649 @@
 av::av_popMsg(av::Msg& msg, av::Distributed* distrObj)
 {
-  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (Distributed*) [%1%,%2%,%3%,%4%]")
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (Distributed*) [%1%,%2%]")
                  % distrObj
                  % distrObj->getTypeId().getName()))
@@ -661 +662 @@
 av::av_pushMsg(av::Msg& msg, const std::string& str)
 {
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (std::string) [%1%]") % str)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (std::string) [%1%]") % str));
 
   int length = str.size();
@@ -688 +689 @@
   }
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (std::string) [%1%]") % str)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (std::string) [%1%]") % str));
 }
 
@@ -695 +696 @@
 av::av_pushMsg(av::Msg& msg, const av::NetID& id)
 {
-  AVANGO_LOG(logger, logging::TRACE, boost::str("push: (NetID) [%1%]") % id)
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (NetID) [%1%]") % id));
 
   av_pushMsg(msg, id.getEID());
@@ -713 +714 @@
   id.set(eid, number);
 
-  AVANGO_LOG(logger, logging::TRACE, boost::str("pop: (NetID) [%1%]") % id)
-}
+  AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (NetID) [%1%]") % id));
+}