X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=28a423326e4b0cb6006795829879565822e44aa7;hp=d6b9be5974307c59327ef8a56484b2a6f100dc40;hb=2eec67acbb00593e414549a7e5b35eb7dd776b1b;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d6b9be597..28a423326 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -19,29 +19,22 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/epoll.h>
-#include <sys/socket.h>
-#include <errno.h>
 #include <unistd.h>
 
-#include <systemd/sd-journal.h>
-#include <systemd/sd-messages.h>
-#include <systemd/sd-daemon.h>
+#include "systemd/sd-messages.h"
+#include "systemd/sd-daemon.h"
 
 #include "journal-authenticate.h"
 #include "journald-server.h"
 #include "journald-kmsg.h"
 #include "journald-syslog.h"
 
+#include "sigbus.h"
+
 int main(int argc, char *argv[]) {
         Server server;
         int r;
 
-        /* if (getppid() != 1) { */
-        /*         log_error("This program should be invoked by init only."); */
-        /*         return EXIT_FAILURE; */
-        /* } */
-
         if (argc > 1) {
                 log_error("This program does not take arguments.");
                 return EXIT_FAILURE;
@@ -54,6 +47,8 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
+        sigbus_install();
+
         r = server_init(&server);
         if (r < 0)
                 goto finish;
@@ -62,7 +57,7 @@ int main(int argc, char *argv[]) {
         server_flush_to_var(&server);
         server_flush_dev_kmsg(&server);
 
-        log_debug("systemd-journald running as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-journald running as pid "PID_FMT, getpid());
         server_driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
 
         sd_notify(false,
@@ -70,9 +65,13 @@ int main(int argc, char *argv[]) {
                   "STATUS=Processing requests...");
 
         for (;;) {
-                struct epoll_event event;
-                int t = -1;
-                usec_t n;
+                usec_t t = USEC_INFINITY, n;
+
+                r = sd_event_get_state(server.event);
+                if (r < 0)
+                        goto finish;
+                if (r == SD_EVENT_FINISHED)
+                        break;
 
                 n = now(CLOCK_REALTIME);
 
@@ -87,8 +86,7 @@ int main(int argc, char *argv[]) {
                         }
 
                         /* Calculate when to rotate the next time */
-                        t = (int) ((server.oldest_file_usec + server.max_retention_usec - n + USEC_PER_MSEC - 1) / USEC_PER_MSEC);
-                        log_info("Sleeping for %i ms", t);
+                        t = server.oldest_file_usec + server.max_retention_usec - n;
                 }
 
 #ifdef HAVE_GCRYPT
@@ -99,39 +97,27 @@ int main(int argc, char *argv[]) {
                                 if (n >= u)
                                         t = 0;
                                 else
-                                        t = MIN(t, (int) ((u - n + USEC_PER_MSEC - 1) / USEC_PER_MSEC));
+                                        t = MIN(t, u - n);
                         }
                 }
 #endif
 
-                r = epoll_wait(server.epoll_fd, &event, 1, t);
+                r = sd_event_run(server.event, t);
                 if (r < 0) {
-
-                        if (errno == EINTR)
-                                continue;
-
-                        log_error("epoll_wait() failed: %m");
-                        r = -errno;
+                        log_error_errno(r, "Failed to run event loop: %m");
                         goto finish;
                 }
 
-                if (r > 0) {
-                        r = process_event(&server, &event);
-                        if (r < 0)
-                                goto finish;
-                        else if (r == 0)
-                                break;
-                }
-
                 server_maybe_append_tags(&server);
                 server_maybe_warn_forward_syslog_missed(&server);
         }
 
-        log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-journald stopped as pid "PID_FMT, getpid());
         server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
 
 finish:
         sd_notify(false,
+                  "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
         server_done(&server);