You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/07/23 19:58:16 UTC
[incubator-nuttx-apps] 13/20: uorb_listener: support set batch latency
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 8558e63772387445a04657238dba168b9a072c19
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Mon May 16 18:21:23 2022 +0800
uorb_listener: support set batch latency
Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
system/uorb/listener.c | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index 0abe69c73..9c10afdb2 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -70,7 +70,8 @@ static int listener_generate_object_list(FAR struct list_node *objlist,
FAR const char *filter);
static int listener_print(FAR const struct orb_metadata *meta, int fd);
static void listener_monitor(FAR struct list_node *objlist, int nb_objects,
- int topic_rate, int nb_msgs, int timeout);
+ int topic_rate, int topic_latency, int nb_msgs,
+ int timeout);
static int listener_update(FAR struct list_node *objlist,
FAR struct orb_object *object);
static void listener_top(FAR struct list_node *objlist,
@@ -115,6 +116,8 @@ listener <command> [arguments...]\n\
\t[-h ] Listener commands help\n\
\t[-n <val> ] Number of messages, default: 0\n\
\t[-r <val> ] Subscription rate (unlimited if 0), default: 0\n\
+\t[-b <val> ] Subscription maximum report latency in us(unlimited if 0),\n\
+\t default: 0\n\
\t[-t <val> ] Time of listener, in seconds, default: 5\n\
\t[-T ] Top, continuously print updating objects\n\
\t[-l ] Top only execute once.\n\
@@ -482,6 +485,7 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
* objlist List of objects to subscribe.
* nb_objects Length of objects list.
* topic_rate Subscribe frequency.
+ * topic_latency Subscribe report latency.
* nb_msgs Subscribe amount of messages.
* timeout Maximum poll waiting time , ms.
*
@@ -490,7 +494,8 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
****************************************************************************/
static void listener_monitor(FAR struct list_node *objlist, int nb_objects,
- int topic_rate, int nb_msgs, int timeout)
+ int topic_rate, int topic_latency, int nb_msgs,
+ int timeout)
{
FAR struct pollfd *fds;
FAR int *recv_msgs;
@@ -539,6 +544,10 @@ static void listener_monitor(FAR struct list_node *objlist, int nb_objects,
else if (topic_rate != 0)
{
orb_set_frequency(fd, topic_rate);
+ if (topic_latency != 0)
+ {
+ orb_set_batch_interval(fd, topic_latency);
+ }
}
i++;
@@ -598,6 +607,11 @@ static void listener_monitor(FAR struct list_node *objlist, int nb_objects,
}
else
{
+ if (topic_latency)
+ {
+ orb_set_batch_interval(fds[i].fd, 0);
+ }
+
orb_unsubscribe(fds[i].fd);
uorbinfo_raw("Object name:%s%d, recieved:%d",
tmp->object.meta->o_name, tmp->object.instance,
@@ -695,6 +709,7 @@ int main(int argc, FAR char *argv[])
struct list_node objlist;
FAR struct listen_object_s *tmp;
int topic_rate = 0;
+ int topic_latency = 0;
int nb_msgs = 0;
int timeout = 5;
bool top = false;
@@ -711,7 +726,7 @@ int main(int argc, FAR char *argv[])
/* Pasrse Argument */
- while ((ch = getopt(argc, argv, "r:n:t:Tlh")) != EOF)
+ while ((ch = getopt(argc, argv, "r:b:n:t:Tlh")) != EOF)
{
switch (ch)
{
@@ -723,6 +738,14 @@ int main(int argc, FAR char *argv[])
}
break;
+ case 'b':
+ topic_latency = strtol(optarg, NULL, 0);
+ if (topic_latency < 0)
+ {
+ goto error;
+ }
+ break;
+
case 'n':
nb_msgs = strtol(optarg, NULL, 0);
if (nb_msgs < 0)
@@ -781,7 +804,8 @@ int main(int argc, FAR char *argv[])
tmp->object.instance);
}
- listener_monitor(&objlist, ret, topic_rate, nb_msgs, timeout);
+ listener_monitor(&objlist, ret, topic_rate, topic_latency,
+ nb_msgs, timeout);
}
listener_delete_object_list(&objlist);