resolved: set a description on all our event sources

poettering · poettering · commit aa4a9deb7d3d · 2016-01-11T19:39:59.000+01:00
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
@@ -1390,6 +1390,7 @@ int manager_connect_bus(Manager *m) {
                 if (r < 0)
                         return log_error_errno(r, "Failed to install bus reconnect time event: %m");
 
+                (void) sd_event_source_set_description(m->bus_retry_event_source, "bus-retry");
                 return 0;
         }
 
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
@@ -961,6 +961,8 @@ int dns_query_go(DnsQuery *q) {
         if (r < 0)
                 goto fail;
 
+        (void) sd_event_source_set_description(q->timeout_event_source, "query-timeout");
+
         q->state = DNS_TRANSACTION_PENDING;
         q->block_ready++;
 
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
@@ -912,6 +912,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
         if (r < 0)
                 return log_debug_errno(r, "Failed to add conflict dispatch event: %m");
 
+        (void) sd_event_source_set_description(scope->conflict_event_source, "scope-conflict");
+
         return 0;
 }
 
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
@@ -367,6 +367,8 @@ int dns_stream_new(Manager *m, DnsStream **ret, DnsProtocol protocol, int fd) {
         if (r < 0)
                 return r;
 
+        (void) sd_event_source_set_description(s->io_event_source, "dns-stream-io");
+
         r = sd_event_add_time(
                         m->event,
                         &s->timeout_event_source,
@@ -376,6 +378,8 @@ int dns_stream_new(Manager *m, DnsStream **ret, DnsProtocol protocol, int fd) {
         if (r < 0)
                 return r;
 
+        (void) sd_event_source_set_description(s->timeout_event_source, "dns-stream-timeout");
+
         LIST_PREPEND(streams, m->dns_streams, s);
         s->manager = m;
         s->fd = fd;
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
@@ -812,6 +812,7 @@ static int dns_transaction_emit_udp(DnsTransaction *t) {
                                 return r;
                         }
 
+                        (void) sd_event_source_set_description(t->dns_udp_event_source, "dns-transaction-udp");
                         t->dns_udp_fd = fd;
                 }
 
@@ -1088,6 +1089,8 @@ static int dns_transaction_make_packet_mdns(DnsTransaction *t) {
                 if (r < 0)
                         return r;
 
+                (void) sd_event_source_set_description(t->timeout_event_source, "dns-transaction-timeout");
+
                 other->state = DNS_TRANSACTION_PENDING;
                 other->next_attempt_after = ts;
 
@@ -1203,6 +1206,8 @@ int dns_transaction_go(DnsTransaction *t) {
                 if (r < 0)
                         return r;
 
+                (void) sd_event_source_set_description(t->timeout_event_source, "dns-transaction-timeout");
+
                 t->n_attempts = 0;
                 t->next_attempt_after = ts;
                 t->state = DNS_TRANSACTION_PENDING;
@@ -1265,6 +1270,8 @@ int dns_transaction_go(DnsTransaction *t) {
         if (r < 0)
                 return r;
 
+        (void) sd_event_source_set_description(t->timeout_event_source, "dns-transaction-timeout");
+
         t->state = DNS_TRANSACTION_PENDING;
         t->next_attempt_after = ts;
 
diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c
@@ -193,6 +193,8 @@ int manager_llmnr_ipv4_udp_fd(Manager *m) {
         if (r < 0)
                 goto fail;
 
+        (void) sd_event_source_set_description(m->llmnr_ipv4_udp_event_source, "llmnr-ipv4-udp");
+
         return m->llmnr_ipv4_udp_fd;
 
 fail:
@@ -270,6 +272,8 @@ int manager_llmnr_ipv6_udp_fd(Manager *m) {
         if (r < 0)
                 goto fail;
 
+        (void) sd_event_source_set_description(m->llmnr_ipv6_udp_event_source, "llmnr-ipv6-udp");
+
         return m->llmnr_ipv6_udp_fd;
 
 fail:
@@ -391,6 +395,8 @@ int manager_llmnr_ipv4_tcp_fd(Manager *m) {
         if (r < 0)
                 goto fail;
 
+        (void) sd_event_source_set_description(m->llmnr_ipv4_tcp_event_source, "llmnr-ipv4-tcp");
+
         return m->llmnr_ipv4_tcp_fd;
 
 fail:
@@ -462,6 +468,8 @@ int manager_llmnr_ipv6_tcp_fd(Manager *m) {
         if (r < 0)
                 goto fail;
 
+        (void) sd_event_source_set_description(m->llmnr_ipv6_tcp_event_source, "llmnr-ipv6-tcp");
+
         return m->llmnr_ipv6_tcp_fd;
 
 fail:
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
@@ -313,6 +313,8 @@ static int manager_network_monitor_listen(Manager *m) {
         if (r < 0)
                 return r;
 
+        (void) sd_event_source_set_description(m->network_event_source, "network-monitor");
+
         return 0;
 }
 
@@ -420,6 +422,8 @@ static int manager_watch_hostname(Manager *m) {
                         return log_error_errno(r, "Failed to add hostname event source: %m");
         }
 
+        (void) sd_event_source_set_description(m->hostname_event_source, "hostname");
+
         r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname);
         if (r < 0) {
                 log_info("Defaulting to hostname 'linux'.");

Original file line number	Diff line number	Diff line change
`@@ -1390,6 +1390,7 @@ int manager_connect_bus(Manager *m) {`
`1390`	`1390`	`if (r < 0)`
`1391`	`1391`	`return log_error_errno(r, "Failed to install bus reconnect time event: %m");`
`1392`	`1392`
	`1393`	`+ (void) sd_event_source_set_description(m->bus_retry_event_source, "bus-retry");`
`1393`	`1394`	`return 0;`
`1394`	`1395`	`}`
`1395`	`1396`
Original file line number	Diff line number	Diff line change
`@@ -912,6 +912,8 @@ int dns_scope_notify_conflict(DnsScope scope, DnsResourceRecord rr) {`
`912`	`912`	`if (r < 0)`
`913`	`913`	`return log_debug_errno(r, "Failed to add conflict dispatch event: %m");`
`914`	`914`
	`915`	`+ (void) sd_event_source_set_description(scope->conflict_event_source, "scope-conflict");`
	`916`	`+`
`915`	`917`	`return 0;`
`916`	`918`	`}`
`917`	`919`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ static int manager_network_monitor_listen(Manager *m) {`
`313`	`313`	`if (r < 0)`
`314`	`314`	`return r;`
`315`	`315`
	`316`	`+ (void) sd_event_source_set_description(m->network_event_source, "network-monitor");`
	`317`	`+`
`316`	`318`	`return 0;`
`317`	`319`	`}`
`318`	`320`
`@@ -420,6 +422,8 @@ static int manager_watch_hostname(Manager *m) {`
`420`	`422`	`return log_error_errno(r, "Failed to add hostname event source: %m");`
`421`	`423`	`}`
`422`	`424`
	`425`	`+ (void) sd_event_source_set_description(m->hostname_event_source, "hostname");`
	`426`	`+`
`423`	`427`	`r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname);`
`424`	`428`	`if (r < 0) {`
`425`	`429`	`log_info("Defaulting to hostname 'linux'.");`