diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-08-28 15:46:29 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-08-28 21:19:17 +0200 |
| commit | 9021bb9f935c93b516b10c88db2a212a9e3a8140 (patch) | |
| tree | 812f2077c86db0d38da59649b03d0728ddd363a0 /src/libsystemd | |
| parent | 752bbf75b9b52c0faae29bb4b77a99c4bb0d298f (diff) | |
sd-event: name event sources used in libraries
This should help in debugging failing event sources.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 16 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/sd-rtnl.c | 12 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 8caa404227..78e91b9654 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3013,6 +3013,10 @@ static int attach_io_events(sd_bus *bus) { return r; r = sd_event_source_set_priority(bus->input_io_event_source, bus->event_priority); + if (r < 0) + return r; + + r = sd_event_source_set_name(bus->input_io_event_source, "bus-input"); } else r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd); @@ -3028,6 +3032,10 @@ static int attach_io_events(sd_bus *bus) { return r; r = sd_event_source_set_priority(bus->output_io_event_source, bus->event_priority); + if (r < 0) + return r; + + r = sd_event_source_set_name(bus->input_io_event_source, "bus-output"); } else r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd); @@ -3080,10 +3088,18 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { if (r < 0) goto fail; + r = sd_event_source_set_name(bus->time_event_source, "bus-time"); + if (r < 0) + goto fail; + r = sd_event_add_exit(bus->event, &bus->quit_event_source, quit_callback, bus); if (r < 0) goto fail; + r = sd_event_source_set_name(bus->quit_event_source, "bus-exit"); + if (r < 0) + goto fail; + r = attach_io_events(bus); if (r < 0) goto fail; diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c index c19bad1bc9..f883f2842c 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -859,6 +859,10 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) { if (r < 0) goto fail; + r = sd_event_source_set_name(rtnl->io_event_source, "rtnl-receive-message"); + if (r < 0) + goto fail; + r = sd_event_source_set_prepare(rtnl->io_event_source, prepare_callback); if (r < 0) goto fail; @@ -871,10 +875,18 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) { if (r < 0) goto fail; + r = sd_event_source_set_name(rtnl->time_event_source, "rtnl-timer"); + if (r < 0) + goto fail; + r = sd_event_add_exit(rtnl->event, &rtnl->exit_event_source, exit_callback, rtnl); if (r < 0) goto fail; + r = sd_event_source_set_name(rtnl->exit_event_source, "rtnl-exit"); + if (r < 0) + goto fail; + return 0; fail: |