From fe400593b684f2cdb73f27df106fd1b94a17ac25 Mon Sep 17 00:00:00 2001 From: dan brooks Date: Thu, 7 Aug 2014 14:32:33 -0700 Subject: [PATCH 1/2] Implements delivered_msgs datafield to TopicStatistics.msg --- clients/roscpp/src/libros/statistics.cpp | 1 + clients/rospy/src/rospy/impl/statistics.py | 1 + 2 files changed, 2 insertions(+) diff --git a/clients/roscpp/src/libros/statistics.cpp b/clients/roscpp/src/libros/statistics.cpp index 882cded8a9..74c4414d12 100644 --- 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& 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/src/rospy/impl/statistics.py b/clients/rospy/src/rospy/impl/statistics.py index 6b2bb3f07e..6fbe8820a9 100644 --- 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. From a6441ce79b5448ab02feca3269032d48520ed3bd Mon Sep 17 00:00:00 2001 From: dan brooks Date: Thu, 7 Aug 2014 15:52:17 -0700 Subject: [PATCH 2/2] Adds version dependency for ros_comm_msgs 1.10.3. --- clients/roscpp/package.xml | 4 ++-- clients/rospy/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/roscpp/package.xml b/clients/roscpp/package.xml index a8047fd4df..77b626d96d 100644 --- a/clients/roscpp/package.xml +++ b/clients/roscpp/package.xml @@ -29,7 +29,7 @@ rosconsole roscpp_serialization roscpp_traits - rosgraph_msgs + rosgraph_msgs roslang rostime std_msgs @@ -40,7 +40,7 @@ rosconsole roscpp_serialization roscpp_traits - rosgraph_msgs + rosgraph_msgs rostime std_msgs xmlrpcpp diff --git a/clients/rospy/package.xml b/clients/rospy/package.xml index 99a4d8ccb8..ccb8784483 100644 --- a/clients/rospy/package.xml +++ b/clients/rospy/package.xml @@ -33,7 +33,7 @@ python-yaml roscpp rosgraph - rosgraph_msgs + rosgraph_msgs roslib std_msgs