Skip to content

Commit 356779d

Browse files
poetteringpoettering
committed
sd-event: rename sd_event_source_set_name() to sd_event_source_get_name()
To mirror the recent name change of the concept for sd_bus objects, follow the same logic for sd_event_source objects, too.
1 parent e80afdb commit 356779d

File tree

11 files changed

+47
-61
lines changed

11 files changed

+47
-61
lines changed

‎src/journal-remote/journal-remote.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
398398
goto error;
399399
}
400400

401-
r = sd_event_source_set_name(source->event, name);
401+
r = sd_event_source_set_description(source->event, name);
402402
if (r < 0) {
403403
log_error("Failed to set source name for fd:%d: %s", fd, strerror(-r));
404404
goto error;
@@ -426,7 +426,7 @@ static int add_raw_socket(RemoteServer *s, int fd) {
426426

427427
snprintf(name, sizeof(name), "raw-socket-%d", fd);
428428

429-
r = sd_event_source_set_name(s->listen_event, name);
429+
r = sd_event_source_set_description(s->listen_event, name);
430430
if (r < 0)
431431
return r;
432432

@@ -724,7 +724,7 @@ static int setup_microhttpd_server(RemoteServer *s,
724724
goto error;
725725
}
726726

727-
r = sd_event_source_set_name(d->event, "epoll-fd");
727+
r = sd_event_source_set_description(d->event, "epoll-fd");
728728
if (r < 0) {
729729
log_error("Failed to set source name: %s", strerror(-r));
730730
goto error;
@@ -803,15 +803,15 @@ static int setup_signals(RemoteServer *s) {
803803
if (r < 0)
804804
return r;
805805

806-
r = sd_event_source_set_name(s->sigterm_event, "sigterm");
806+
r = sd_event_source_set_description(s->sigterm_event, "sigterm");
807807
if (r < 0)
808808
return r;
809809

810810
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
811811
if (r < 0)
812812
return r;
813813

814-
r = sd_event_source_set_name(s->sigint_event, "sigint");
814+
r = sd_event_source_set_description(s->sigint_event, "sigint");
815815
if (r < 0)
816816
return r;
817817

‎src/libsystemd-network/sd-dhcp-client.c‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
723723
if (r < 0)
724724
goto error;
725725

726-
r = sd_event_source_set_name(client->timeout_resend,
727-
"dhcp4-resend-timer");
726+
r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
728727
if (r < 0)
729728
goto error;
730729

@@ -801,8 +800,7 @@ static int client_initialize_io_events(sd_dhcp_client *client,
801800
if (r < 0)
802801
goto error;
803802

804-
r = sd_event_source_set_name(client->receive_message,
805-
"dhcp4-receive-message");
803+
r = sd_event_source_set_description(client->receive_message, "dhcp4-receive-message");
806804
if (r < 0)
807805
goto error;
808806

@@ -832,8 +830,7 @@ static int client_initialize_time_events(sd_dhcp_client *client) {
832830
r = sd_event_source_set_priority(client->timeout_resend,
833831
client->event_priority);
834832

835-
r = sd_event_source_set_name(client->timeout_resend,
836-
"dhcp4-resend-timer");
833+
r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
837834
if (r < 0)
838835
goto error;
839836

@@ -1149,8 +1146,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
11491146
if (r < 0)
11501147
return r;
11511148

1152-
r = sd_event_source_set_name(client->timeout_expire,
1153-
"dhcp4-lifetime");
1149+
r = sd_event_source_set_description(client->timeout_expire, "dhcp4-lifetime");
11541150
if (r < 0)
11551151
return r;
11561152

@@ -1177,8 +1173,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
11771173
if (r < 0)
11781174
return r;
11791175

1180-
r = sd_event_source_set_name(client->timeout_t2,
1181-
"dhcp4-t2-timeout");
1176+
r = sd_event_source_set_description(client->timeout_t2, "dhcp4-t2-timeout");
11821177
if (r < 0)
11831178
return r;
11841179

@@ -1204,8 +1199,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
12041199
if (r < 0)
12051200
return r;
12061201

1207-
r = sd_event_source_set_name(client->timeout_t1,
1208-
"dhcp4-t1-timer");
1202+
r = sd_event_source_set_description(client->timeout_t1, "dhcp4-t1-timer");
12091203
if (r < 0)
12101204
return r;
12111205

@@ -1250,8 +1244,7 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
12501244
if (r < 0)
12511245
goto error;
12521246

1253-
r = sd_event_source_set_name(client->timeout_resend,
1254-
"dhcp4-resend-timer");
1247+
r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
12551248
if (r < 0)
12561249
goto error;
12571250
} else if (r == -ENOMSG)

‎src/libsystemd-network/sd-dhcp6-client.c‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
590590
if (r < 0)
591591
goto error;
592592

593-
r = sd_event_source_set_name(client->timeout_resend,
594-
"dhcp6-resend-timer");
593+
r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timer");
595594
if (r < 0)
596595
goto error;
597596

@@ -614,8 +613,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
614613
if (r < 0)
615614
goto error;
616615

617-
r = sd_event_source_set_name(client->timeout_resend_expire,
618-
"dhcp6-resend-expire-timer");
616+
r = sd_event_source_set_description(client->timeout_resend_expire, "dhcp6-resend-expire-timer");
619617
if (r < 0)
620618
goto error;
621619
}
@@ -1010,8 +1008,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
10101008
if (r < 0)
10111009
return r;
10121010

1013-
r = sd_event_source_set_name(client->receive_message,
1014-
"dhcp6-receive-message");
1011+
r = sd_event_source_set_description(client->receive_message, "dhcp6-receive-message");
10151012
if (r < 0)
10161013
return r;
10171014

@@ -1059,8 +1056,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
10591056
if (r < 0)
10601057
return r;
10611058

1062-
r = sd_event_source_set_name(client->lease->ia.timeout_t1,
1063-
"dhcp6-t1-timeout");
1059+
r = sd_event_source_set_description(client->lease->ia.timeout_t1, "dhcp6-t1-timeout");
10641060
if (r < 0)
10651061
return r;
10661062

@@ -1084,8 +1080,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
10841080
if (r < 0)
10851081
return r;
10861082

1087-
r = sd_event_source_set_name(client->lease->ia.timeout_t2,
1088-
"dhcp6-t2-timeout");
1083+
r = sd_event_source_set_description(client->lease->ia.timeout_t2, "dhcp6-t2-timeout");
10891084
if (r < 0)
10901085
return r;
10911086

@@ -1108,8 +1103,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
11081103
if (r < 0)
11091104
return r;
11101105

1111-
r = sd_event_source_set_name(client->timeout_resend,
1112-
"dhcp6-resend-timeout");
1106+
r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timeout");
11131107
if (r < 0)
11141108
return r;
11151109

‎src/libsystemd-network/sd-icmp6-nd.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
278278
return 0;
279279
}
280280

281-
r = sd_event_source_set_name(nd->timeout, "icmp6-timeout");
281+
r = sd_event_source_set_description(nd->timeout, "icmp6-timeout");
282282
if (r < 0) {
283283
icmp6_nd_notify(nd, r);
284284
return 0;
@@ -328,7 +328,7 @@ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
328328
if (r < 0)
329329
goto error;
330330

331-
r = sd_event_source_set_name(nd->recv, "icmp6-receive-message");
331+
r = sd_event_source_set_description(nd->recv, "icmp6-receive-message");
332332
if (r < 0)
333333
goto error;
334334

@@ -341,7 +341,7 @@ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
341341
if (r < 0)
342342
goto error;
343343

344-
r = sd_event_source_set_name(nd->timeout, "icmp6-timeout");
344+
r = sd_event_source_set_description(nd->timeout, "icmp6-timeout");
345345
error:
346346
if (r < 0)
347347
icmp6_nd_init(nd);

‎src/libsystemd-network/sd-ipv4ll.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ static void ipv4ll_run_state_machine(sd_ipv4ll *ll, IPv4LLTrigger trigger, void
353353
if (r < 0)
354354
goto out;
355355

356-
r = sd_event_source_set_name(ll->timer, "ipv4ll-timer");
356+
r = sd_event_source_set_description(ll->timer, "ipv4ll-timer");
357357
if (r < 0)
358358
goto out;
359359
}
@@ -564,7 +564,7 @@ int sd_ipv4ll_start (sd_ipv4ll *ll) {
564564
if (r < 0)
565565
goto out;
566566

567-
r = sd_event_source_set_name(ll->receive_message, "ipv4ll-receive-message");
567+
r = sd_event_source_set_description(ll->receive_message, "ipv4ll-receive-message");
568568
if (r < 0)
569569
goto out;
570570

@@ -581,7 +581,7 @@ int sd_ipv4ll_start (sd_ipv4ll *ll) {
581581
if (r < 0)
582582
goto out;
583583

584-
r = sd_event_source_set_name(ll->timer, "ipv4ll-timer");
584+
r = sd_event_source_set_description(ll->timer, "ipv4ll-timer");
585585
out:
586586
if (r < 0)
587587
ipv4ll_stop(ll, IPV4LL_EVENT_STOP);

‎src/libsystemd/libsystemd.sym.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ global:
387387
sd_event_get_watchdog;
388388
sd_event_source_ref;
389389
sd_event_source_unref;
390-
sd_event_source_set_name;
391-
sd_event_source_get_name;
390+
sd_event_source_set_description;
391+
sd_event_source_get_description;
392392
sd_event_source_set_prepare;
393393
sd_event_source_get_pending;
394394
sd_event_source_get_priority;

‎src/libsystemd/sd-bus/sd-bus.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,7 +3015,7 @@ static int attach_io_events(sd_bus *bus) {
30153015
if (r < 0)
30163016
return r;
30173017

3018-
r = sd_event_source_set_name(bus->input_io_event_source, "bus-input");
3018+
r = sd_event_source_set_description(bus->input_io_event_source, "bus-input");
30193019
} else
30203020
r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd);
30213021

@@ -3034,7 +3034,7 @@ static int attach_io_events(sd_bus *bus) {
30343034
if (r < 0)
30353035
return r;
30363036

3037-
r = sd_event_source_set_name(bus->input_io_event_source, "bus-output");
3037+
r = sd_event_source_set_description(bus->input_io_event_source, "bus-output");
30383038
} else
30393039
r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd);
30403040

@@ -3087,15 +3087,15 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
30873087
if (r < 0)
30883088
goto fail;
30893089

3090-
r = sd_event_source_set_name(bus->time_event_source, "bus-time");
3090+
r = sd_event_source_set_description(bus->time_event_source, "bus-time");
30913091
if (r < 0)
30923092
goto fail;
30933093

30943094
r = sd_event_add_exit(bus->event, &bus->quit_event_source, quit_callback, bus);
30953095
if (r < 0)
30963096
goto fail;
30973097

3098-
r = sd_event_source_set_name(bus->quit_event_source, "bus-exit");
3098+
r = sd_event_source_set_description(bus->quit_event_source, "bus-exit");
30993099
if (r < 0)
31003100
goto fail;
31013101

‎src/libsystemd/sd-event/sd-event.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct sd_event_source {
6666
void *userdata;
6767
sd_event_handler_t prepare;
6868

69-
char *name;
69+
char *description;
7070

7171
EventSourceType type:5;
7272
int enabled:3;
@@ -737,7 +737,7 @@ static void source_free(sd_event_source *s) {
737737
assert(s);
738738

739739
source_disconnect(s);
740-
free(s->name);
740+
free(s->description);
741741
free(s);
742742
}
743743

@@ -1253,18 +1253,17 @@ _public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
12531253
return NULL;
12541254
}
12551255

1256-
_public_ int sd_event_source_set_name(sd_event_source *s, const char *name) {
1256+
_public_ int sd_event_source_set_description(sd_event_source *s, const char *description) {
12571257
assert_return(s, -EINVAL);
12581258

1259-
return free_and_strdup(&s->name, name);
1259+
return free_and_strdup(&s->description, description);
12601260
}
12611261

1262-
_public_ int sd_event_source_get_name(sd_event_source *s, const char **name) {
1262+
_public_ int sd_event_source_get_description(sd_event_source *s, const char **description) {
12631263
assert_return(s, -EINVAL);
1264-
assert_return(name, -EINVAL);
1265-
1266-
*name = s->name;
1264+
assert_return(description, -EINVAL);
12671265

1266+
*description = s->description;
12681267
return 0;
12691268
}
12701269

@@ -2152,8 +2151,8 @@ static int source_dispatch(sd_event_source *s) {
21522151
s->dispatching = false;
21532152

21542153
if (r < 0) {
2155-
if (s->name)
2156-
log_debug("Event source '%s' returned error, disabling: %s", s->name, strerror(-r));
2154+
if (s->description)
2155+
log_debug("Event source '%s' returned error, disabling: %s", s->description, strerror(-r));
21572156
else
21582157
log_debug("Event source %p returned error, disabling: %s", s, strerror(-r));
21592158
}
@@ -2190,8 +2189,8 @@ static int event_prepare(sd_event *e) {
21902189
s->dispatching = false;
21912190

21922191
if (r < 0) {
2193-
if (s->name)
2194-
log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->name, strerror(-r));
2192+
if (s->description)
2193+
log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->description, strerror(-r));
21952194
else
21962195
log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r));
21972196
}

‎src/libsystemd/sd-rtnl/sd-rtnl.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) {
859859
if (r < 0)
860860
goto fail;
861861

862-
r = sd_event_source_set_name(rtnl->io_event_source, "rtnl-receive-message");
862+
r = sd_event_source_set_description(rtnl->io_event_source, "rtnl-receive-message");
863863
if (r < 0)
864864
goto fail;
865865

@@ -875,15 +875,15 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) {
875875
if (r < 0)
876876
goto fail;
877877

878-
r = sd_event_source_set_name(rtnl->time_event_source, "rtnl-timer");
878+
r = sd_event_source_set_description(rtnl->time_event_source, "rtnl-timer");
879879
if (r < 0)
880880
goto fail;
881881

882882
r = sd_event_add_exit(rtnl->event, &rtnl->exit_event_source, exit_callback, rtnl);
883883
if (r < 0)
884884
goto fail;
885885

886-
r = sd_event_source_set_name(rtnl->exit_event_source, "rtnl-exit");
886+
r = sd_event_source_set_description(rtnl->exit_event_source, "rtnl-exit");
887887
if (r < 0)
888888
goto fail;
889889

‎src/network/networkd-manager.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ int manager_udev_listen(Manager *m) {
368368
if (r < 0)
369369
return r;
370370

371-
r = sd_event_source_set_name(m->udev_event_source, "networkd-udev");
371+
r = sd_event_source_set_description(m->udev_event_source, "networkd-udev");
372372
if (r < 0)
373373
return r;
374374

0 commit comments

Comments
 (0)