sd-event: fix return code of sd_event_run()

[elogind.git] / src / libsystemd-bus / sd-event.c

diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd-bus/sd-event.c
index bf8b0fcf64ffc98efd69ebb8f434d8291c81e94e..0317088af31b73b59d84345968df5518f206faf0 100644 (file)
--- a/src/libsystemd-bus/sd-event.c
+++ b/src/libsystemd-bus/sd-event.c
@@ -1605,7 +1605,7 @@ static int flush_timer(sd_event *e, int fd, uint32_t events, usec_t *next) {
                 return -errno;
         }
 
                 return -errno;
         }
 

-        if (ss != sizeof(x))
+        if (_unlikely_(ss != sizeof(x)))

                 return -EIO;
 
         if (next)
                 return -EIO;
 
         if (next)


@@ -1733,7 +1733,7 @@ static int process_signal(sd_event *e, uint32_t events) {
                         return -errno;
                 }
 
                         return -errno;
                 }
 

-                if (ss != sizeof(si))
+                if (_unlikely_(ss != sizeof(si)))

                         return -EIO;
 
                 read_one = true;
                         return -EIO;
 
                 read_one = true;


@@ -1986,7 +1986,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
         m = epoll_wait(e->epoll_fd, ev_queue, ev_queue_max,
                        timeout == (uint64_t) -1 ? -1 : (int) ((timeout + USEC_PER_MSEC - 1) / USEC_PER_MSEC));
         if (m < 0) {
         m = epoll_wait(e->epoll_fd, ev_queue, ev_queue_max,
                        timeout == (uint64_t) -1 ? -1 : (int) ((timeout + USEC_PER_MSEC - 1) / USEC_PER_MSEC));
         if (m < 0) {

-                r = errno == EAGAIN || errno == EINTR ? 0 : -errno;
+                r = errno == EAGAIN || errno == EINTR ? 1 : -errno;

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -2029,7 +2029,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
 
         p = event_next_pending(e);
         if (!p) {
 
         p = event_next_pending(e);
         if (!p) {

-                r = 0;
+                r = 1;

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -2116,7 +2116,7 @@ _public_ int sd_event_get_now_monotonic(sd_event *e, uint64_t *usec) {
 
 _public_ int sd_event_default(sd_event **ret) {
 
 
 _public_ int sd_event_default(sd_event **ret) {
 

-        static __thread sd_event *default_event = NULL;
+        static thread_local sd_event *default_event = NULL;

         sd_event *e;
         int r;
 
         sd_event *e;
         int r;
 


@@ -2164,17 +2164,10 @@ _public_ int sd_event_set_watchdog(sd_event *e, int b) {
 
         if (b) {
                 struct epoll_event ev = {};
 
         if (b) {
                 struct epoll_event ev = {};

-                const char *env;

 
 

-                env = getenv("WATCHDOG_USEC");
-                if (!env)
-                        return false;
-
-                r = safe_atou64(env, &e->watchdog_period);
-                if (r < 0)
+                r = sd_watchdog_enabled(false, &e->watchdog_period);
+                if (r <= 0)

                         return r;
                         return r;

-                if (e->watchdog_period <= 0)
-                        return -EIO;

 
                 /* Issue first ping immediately */
                 sd_notify(false, "WATCHDOG=1");
 
                 /* Issue first ping immediately */
                 sd_notify(false, "WATCHDOG=1");