chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: merge libsystemd-journal into libsystemd
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index d6b9be5974307c59327ef8a56484b2a6f100dc40..37896d050da93c3c174007e029055d97707cb4df 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-70,9
+70,13
@@
int main(int argc, char *argv[]) {
"STATUS=Processing requests...");
for (;;) {
"STATUS=Processing requests...");
for (;;) {
- struct epoll_event event;
- int t = -1;
- usec_t n;
+ usec_t t = (usec_t) -1, n;
+
+ r = sd_event_get_state(server.event);
+ if (r < 0)
+ goto finish;
+ if (r == SD_EVENT_FINISHED)
+ break;
n = now(CLOCK_REALTIME);
n = now(CLOCK_REALTIME);
@@
-87,8
+91,7
@@
int main(int argc, char *argv[]) {
}
/* Calculate when to rotate the next time */
}
/* 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
}
#ifdef HAVE_GCRYPT
@@
-99,30
+102,18
@@
int main(int argc, char *argv[]) {
if (n >= u)
t = 0;
else
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
}
}
#endif
- r =
epoll_wait(server.epoll_fd, &event, 1
, t);
+ r =
sd_event_run(server.event
, t);
if (r < 0) {
if (r < 0) {
-
- if (errno == EINTR)
- continue;
-
- log_error("epoll_wait() failed: %m");
+ log_error("Failed to run event loop: %s", strerror(-r));
r = -errno;
goto finish;
}
r = -errno;
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);
}
server_maybe_append_tags(&server);
server_maybe_warn_forward_syslog_missed(&server);
}
@@
-131,8
+122,7
@@
int main(int argc, char *argv[]) {
server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
finish:
server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
finish:
- sd_notify(false,
- "STATUS=Shutting down...");
+ sd_notify(false, "STATUS=Shutting down...");
server_done(&server);
server_done(&server);