DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: add timeout support for listen command

Browse source 
Currently 'ubus listen' command does not respect the timeout parameter,
i.e., whether timeout parameter is provided, 'ubus listen' will always
run infinitely. This patch let 'ubus listen' command support the timeout
parameter. For example, 'ubus listen -t 60' will cause the command to
exit after 60 seconds.

Signed-off-by: Zhao, Gang <gang.zhao.42@gmail.com>
This commit is contained in:
Zhao, Gang 2016-02-26 17:18:39 +08:00 committed by Felix Fietkau
parent 6cd8912f10
commit b958a9aa60
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cli.c
View file

@ -140,15 +140,29 @@ static int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
return ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000); return ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000);
} }
struct cli_listen_data {
struct uloop_timeout timeout;
struct ubus_event_handler ev;
bool timed_out;
};
static void listen_timeout(struct uloop_timeout *timeout)
{
struct cli_listen_data *data = container_of(timeout, struct cli_listen_data, timeout);
data->timed_out = true;
uloop_end();
}
static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv) static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
{ {
struct ubus_event_handler listener; struct cli_listen_data data = {
.timeout.cb = listen_timeout,
.ev.cb = receive_event,
.timed_out = false,
};
const char *event; const char *event;
int ret = 0; int ret = 0;
memset(&listener, 0, sizeof(listener));
listener.cb = receive_event;
if (argc > 0) { if (argc > 0) {
event = argv[0]; event = argv[0];
} else { } else {
@ -157,7 +171,7 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
} }
do { do {
ret = ubus_register_event_handler(ctx, &listener, event); ret = ubus_register_event_handler(ctx, &data.ev, event);
if (ret) if (ret)
break; break;
@ -178,6 +192,7 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
uloop_init(); uloop_init();
ubus_add_uloop(ctx); ubus_add_uloop(ctx);
uloop_timeout_set(&data.timeout, timeout * 1000);
uloop_run(); uloop_run();
uloop_done(); uloop_done();