Merge pull request #486 from mrdanbrooks/indigo-devel

Implements delivered_msgs datafield to TopicStatistics.msg
ros · Aug 18, 2014 · 3745641 · 3745641
2 parents 92efce7 + a6441ce
commit 3745641
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/clients/roscpp/package.xml b/clients/roscpp/package.xml
@@ -29,7 +29,7 @@
   <build_depend>rosconsole</build_depend>
   <build_depend>roscpp_serialization</build_depend>
   <build_depend version_gte="0.3.17">roscpp_traits</build_depend>
-  <build_depend version_gte="1.10.2">rosgraph_msgs</build_depend>
+  <build_depend version_gte="1.10.3">rosgraph_msgs</build_depend>
   <build_depend>roslang</build_depend>
   <build_depend>rostime</build_depend>
   <build_depend>std_msgs</build_depend>
@@ -40,7 +40,7 @@
   <run_depend>rosconsole</run_depend>
   <run_depend>roscpp_serialization</run_depend>
   <run_depend version_gte="0.3.17">roscpp_traits</run_depend>
-  <run_depend>rosgraph_msgs</run_depend>
+  <run_depend version_gte="1.10.3">rosgraph_msgs</run_depend>
   <run_depend>rostime</run_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>xmlrpcpp</run_depend>

diff --git a/clients/roscpp/src/libros/statistics.cpp b/clients/roscpp/src/libros/statistics.cpp
@@ -120,6 +120,7 @@ void StatisticsLogger::callback(const boost::shared_ptr<M_string>& connection_he
     msg.node_sub = ros::this_node::getName();
     msg.window_start = window_start;
     msg.window_stop = received_time;
+    msg.delivered_msgs = stats.arrival_time_list.size();
     msg.dropped_msgs = stats.dropped_msgs;
     msg.traffic = bytes_sent - stats.stat_bytes_last;
 

diff --git a/clients/rospy/package.xml b/clients/rospy/package.xml
@@ -33,7 +33,7 @@
   <run_depend>python-yaml</run_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>rosgraph</run_depend>
-  <run_depend>rosgraph_msgs</run_depend>
+  <run_depend version_gte="1.10.3">rosgraph_msgs</run_depend>
   <run_depend>roslib</run_depend>
   <run_depend>std_msgs</run_depend>
 

diff --git a/clients/rospy/src/rospy/impl/statistics.py b/clients/rospy/src/rospy/impl/statistics.py
@@ -177,6 +177,7 @@ def sendStatistics(self, subscriber_statistics_logger):
 
         msg.traffic = self.stat_bytes_window_
 
+        msg.delivered_msgs = len(self.arrival_time_list_)
         msg.dropped_msgs = self.dropped_msgs_
 
         # we can only calculate message age if the messages did contain Header fields.