picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

event: be more conservative when returning errors from event handler callbacks 

We really should return errors from event handlers if we have a
continous problem and don't know any other solution.
This commit is contained in:
Lennart Poettering 2013-12-13 03:30:42 +01:00
parent c5ef10429a
commit 7b77ed8cf3
6 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/manager.c
View File

@ -1631,7 +1631,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
} }
if (sigchld) if (sigchld)
return manager_dispatch_sigchld(m); manager_dispatch_sigchld(m);
return 0; return 0;
} }

8
src/journal/journald-stream.c
View File

@ -293,7 +293,6 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) { if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents); log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents);
r = -EIO;
goto terminate; goto terminate;
} }
@ -304,12 +303,11 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
return 0; return 0;
log_warning("Failed to read from stream: %m"); log_warning("Failed to read from stream: %m");
r = -errno;
goto terminate; goto terminate;
} }
if (l == 0) { if (l == 0) {
r = stdout_stream_scan(s, true); stdout_stream_scan(s, true);
goto terminate; goto terminate;
} }
@ -391,7 +389,6 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
len = sizeof(stream->ucred); len = sizeof(stream->ucred);
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) { if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
log_error("Failed to determine peer credentials: %m"); log_error("Failed to determine peer credentials: %m");
r = -errno;
goto fail; goto fail;
} }
@ -404,7 +401,6 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
if (shutdown(fd, SHUT_WR) < 0) { if (shutdown(fd, SHUT_WR) < 0) {
log_error("Failed to shutdown writing side of socket: %m"); log_error("Failed to shutdown writing side of socket: %m");
r = -errno;
goto fail; goto fail;
} }
@ -428,7 +424,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
fail: fail:
stdout_stream_free(stream); stdout_stream_free(stream);
return r; return 0;
} }
int server_open_stdout_socket(Server *s) { int server_open_stdout_socket(Server *s) {

26
src/login/logind-button.c
View File

@ -141,7 +141,9 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
"MESSAGE=Power key pressed.", "MESSAGE=Power key pressed.",
MESSAGE_ID(SD_MESSAGE_POWER_KEY), MESSAGE_ID(SD_MESSAGE_POWER_KEY),
NULL); NULL);
return button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
break;
/* The kernel is a bit confused here: /* The kernel is a bit confused here:
@ -154,41 +156,41 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
"MESSAGE=Suspend key pressed.", "MESSAGE=Suspend key pressed.",
MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY), MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY),
NULL); NULL);
return button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
break;
case KEY_SUSPEND: case KEY_SUSPEND:
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE=Hibernate key pressed.", "MESSAGE=Hibernate key pressed.",
MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY), MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY),
NULL); NULL);
return button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
break;
} }
} else if (ev.type == EV_SW && ev.value > 0) { } else if (ev.type == EV_SW && ev.value > 0) {
switch (ev.code) { if (ev.code == SW_LID) {
case SW_LID:
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE=Lid closed.", "MESSAGE=Lid closed.",
MESSAGE_ID(SD_MESSAGE_LID_CLOSED), MESSAGE_ID(SD_MESSAGE_LID_CLOSED),
NULL); NULL);
b->lid_close_queued = true;
return button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true); b->lid_close_queued = true;
button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true);
} }
} else if (ev.type == EV_SW && ev.value == 0) { } else if (ev.type == EV_SW && ev.value == 0) {
switch (ev.code) { if (ev.code == SW_LID) {
case SW_LID:
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE=Lid opened.", "MESSAGE=Lid opened.",
MESSAGE_ID(SD_MESSAGE_LID_OPENED), MESSAGE_ID(SD_MESSAGE_LID_OPENED),
NULL); NULL);
b->lid_close_queued = false; b->lid_close_queued = false;
break;
} }
} }

38
src/login/logind.c
View File

@ -34,6 +34,7 @@
#include "bus-util.h" #include "bus-util.h"
#include "bus-error.h" #include "bus-error.h"
#include "logind.h" #include "logind.h"
#include "udev-util.h"
Manager *manager_new(void) { Manager *manager_new(void) {
Manager *m; Manager *m;
@ -490,9 +491,8 @@ static int manager_enumerate_inhibitors(Manager *m) {
} }
static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
Manager *m = userdata; Manager *m = userdata;
struct udev_device *d;
int r;
assert(m); assert(m);
@ -500,16 +500,13 @@ static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t reven
if (!d) if (!d)
return -ENOMEM; return -ENOMEM;
r = manager_process_seat_device(m, d); manager_process_seat_device(m, d);
udev_device_unref(d); return 0;
return r;
} }
static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
Manager *m = userdata; Manager *m = userdata;
struct udev_device *d;
int r;
assert(m); assert(m);
@ -517,16 +514,13 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev
if (!d) if (!d)
return -ENOMEM; return -ENOMEM;
r = manager_process_seat_device(m, d); manager_process_seat_device(m, d);
udev_device_unref(d); return 0;
return r;
} }
static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
Manager *m = userdata; Manager *m = userdata;
struct udev_device *d;
int r = 0;
const char *name; const char *name;
assert(m); assert(m);
@ -541,17 +535,14 @@ static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t reven
* VTs, to make sure our auto VTs never go away. */ * VTs, to make sure our auto VTs never go away. */
if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove")) if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
r = seat_preallocate_vts(m->seat0); seat_preallocate_vts(m->seat0);
udev_device_unref(d); return 0;
return r;
} }
static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
Manager *m = userdata; Manager *m = userdata;
struct udev_device *d;
int r;
assert(m); assert(m);
@ -559,10 +550,8 @@ static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t rev
if (!d) if (!d)
return -ENOMEM; return -ENOMEM;
r = manager_process_button_device(m, d); manager_process_button_device(m, d);
udev_device_unref(d); return 0;
return r;
} }
static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
@ -573,7 +562,6 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents
assert(m->console_active_fd == fd); assert(m->console_active_fd == fd);
seat_read_active_vt(m->seat0); seat_read_active_vt(m->seat0);
return 0; return 0;
} }

11
src/network/networkd-manager.c
View File

@ -22,6 +22,7 @@
#include "path-util.h" #include "path-util.h"
#include "networkd.h" #include "networkd.h"
#include "libudev-private.h" #include "libudev-private.h"
#include "udev-util.h"
int manager_new(Manager **ret) { int manager_new(Manager **ret) {
_cleanup_manager_free_ Manager *m = NULL; _cleanup_manager_free_ Manager *m = NULL;
@ -204,19 +205,13 @@ finish:
static int manager_dispatch_link_udev(sd_event_source *source, int fd, uint32_t revents, void *userdata) { static int manager_dispatch_link_udev(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
Manager *m = userdata; Manager *m = userdata;
struct udev_monitor *monitor = m->udev_monitor; struct udev_monitor *monitor = m->udev_monitor;
struct udev_device *device; _cleanup_udev_device_unref_ struct udev_device *device = NULL;
int r;
device = udev_monitor_receive_device(monitor); device = udev_monitor_receive_device(monitor);
if (!device) if (!device)
return -ENOMEM; return -ENOMEM;
r = manager_process_link(m, device); manager_process_link(m, device);
if (r < 0)
return r;
udev_device_unref(device);
return 0; return 0;
} }

17
src/socket-proxy/socket-proxyd.c
View File

@ -462,6 +462,7 @@ fail:
} }
static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdata) { static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_free_ char *peer = NULL;
Context *context = userdata; Context *context = userdata;
int nfd = -1, r; int nfd = -1, r;
@ -471,24 +472,24 @@ static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdat
assert(context); assert(context);
nfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); nfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
if (nfd >= 0) { if (nfd < 0) {
_cleanup_free_ char *peer = NULL; if (errno != -EAGAIN)
log_warning("Failed to accept() socket: %m");
} else {
getpeername_pretty(nfd, &peer); getpeername_pretty(nfd, &peer);
log_debug("New connection from %s", strna(peer)); log_debug("New connection from %s", strna(peer));
r = add_connection_socket(context, sd_event_source_get_event(s), nfd); r = add_connection_socket(context, sd_event_source_get_event(s), nfd);
if (r < 0) { if (r < 0) {
log_error("Failed to accept connection, ignoring: %s", strerror(-r));
close_nointr_nofail(fd); close_nointr_nofail(fd);
return r;
} }
}
} else if (errno != -EAGAIN)
log_warning("Failed to accept() socket: %m");
r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT); r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
if (r < 0) { if (r < 0) {
log_error("Error %d while re-enabling listener with ONESHOT: %s", r, strerror(-r)); log_error("Error while re-enabling listener with ONESHOT: %s", strerror(-r));
sd_event_exit(sd_event_source_get_event(s), r);
return r; return r;
} }