[Personalrobots-commit] SF.net SVN: personalrobots:[13950] pkg/trunk

[<jfa...@us...>]

Revision: 13950
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=13950&view=rev
Author:   jfaustwg
Date:     2009-04-16 17:04:10 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Getting inheritors from Message ready for the __getMessageDefinition() and __s_getMessageDefinition() calls

Modified Paths:
--------------
    pkg/trunk/prcore/tf/include/tf/message_notifier.h
    pkg/trunk/util/message_sequencing/include/message_sequencing/time_sequencer.h
    pkg/trunk/util/mux/mux.cpp

Modified: pkg/trunk/prcore/tf/include/tf/message_notifier.h
===================================================================
--- pkg/trunk/prcore/tf/include/tf/message_notifier.h	2009-04-16 16:47:57 UTC (rev 13949)
+++ pkg/trunk/prcore/tf/include/tf/message_notifier.h	2009-04-16 17:04:10 UTC (rev 13950)
@@ -143,6 +143,9 @@
    */
   ~MessageNotifier()
   {
+    NOTIFIER_DEBUG("Successful Transforms: %d, Failed Transforms: %d, Transform messages received: %d, Messages received: %d",
+                        successful_transform_count_, failed_transform_count_, transform_message_count_, incoming_message_count_);
+
     unsubscribeFromMessage();
 
     node_->unsubscribe("/tf_message", &MessageNotifier::incomingTFMessage, this);
@@ -155,9 +158,6 @@
     thread_handle_.join();
 
     clear();
-
-    NOTIFIER_DEBUG("Successful Transforms: %d, Failed Transforms: %d, Transform messages received: %d, Messages received: %d",
-                    successful_transform_count_, failed_transform_count_, transform_message_count_, incoming_message_count_);
   }
 
   /**

Modified: pkg/trunk/util/message_sequencing/include/message_sequencing/time_sequencer.h
===================================================================
--- pkg/trunk/util/message_sequencing/include/message_sequencing/time_sequencer.h	2009-04-16 16:47:57 UTC (rev 13949)
+++ pkg/trunk/util/message_sequencing/include/message_sequencing/time_sequencer.h	2009-04-16 17:04:10 UTC (rev 13950)
@@ -196,9 +196,11 @@
 
   inline static std::string __s_getDataType() { return M::__s_getDataType(); }
   inline static std::string __s_getMD5Sum() { return M::__s_getMD5Sum(); }
+  inline static std::string __s_getMessageDefinition() { return M::__s_getMessageDefinition(); }
 
   virtual const std::string __getDataType() const { return M::__s_getDataType(); }
   virtual const std::string __getMD5Sum()   const { return M::__s_getMD5Sum(); }
+  virtual const std::string __getMessageDefinition()   const { return M::__s_getMessageDefinition(); }
 
   // Topic buffer is for subscribing, not publishing
   virtual uint32_t serializationLength() const { return 0; }

Modified: pkg/trunk/util/mux/mux.cpp
===================================================================
--- pkg/trunk/util/mux/mux.cpp	2009-04-16 16:47:57 UTC (rev 13949)
+++ pkg/trunk/util/mux/mux.cpp	2009-04-16 17:04:10 UTC (rev 13950)
@@ -49,8 +49,12 @@
                             msgBuf = NULL; msgBufAlloc = 0; }
   virtual const string __getDataType() const { return string("*"); }
   virtual const string __getMD5Sum()   const { return string("*"); }
+  /// \todo Fill this in
+  virtual const string __getMessageDefinition()   const { return string(""); }
   static const string __s_getDataType() { return string("*"); }
   static const string __s_getMD5Sum()   { return string("*"); }
+  /// \todo Fill this in
+  static const string __s_getMessageDefinition()   { return string(""); }
   uint32_t serializationLength() const { return msgBufUsed; }
   virtual uint8_t *serialize(uint8_t *writePtr, uint32_t) const
   {
@@ -159,7 +163,7 @@
     topics.push_back(argv[i]);
   Mux mux(argv[1], argv[2], topics);
   mux.spin();
-  
+
   return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.