mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
time-sync-wait: trivial style fixes
This commit is contained in:
parent
30dd293c88
commit
0fad9daf4b
@ -47,8 +47,7 @@ static void clock_state_release(ClockState *sp) {
|
|||||||
sp->fd = safe_close(sp->fd);
|
sp->fd = safe_close(sp->fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int clock_state_update(ClockState *sp,
|
static int clock_state_update(ClockState *sp, sd_event *event);
|
||||||
sd_event *event);
|
|
||||||
|
|
||||||
static int io_handler(sd_event_source * s,
|
static int io_handler(sd_event_source * s,
|
||||||
int fd,
|
int fd,
|
||||||
@ -74,7 +73,7 @@ static int clock_state_update(ClockState *sp,
|
|||||||
|
|
||||||
/* The kernel supports cancelling timers whenever its realtime clock is "set" (which can happen in a variety of
|
/* The kernel supports cancelling timers whenever its realtime clock is "set" (which can happen in a variety of
|
||||||
* ways, generally adjustments of at least 500 ms). The way this module works is we set up a timer that will
|
* ways, generally adjustments of at least 500 ms). The way this module works is we set up a timer that will
|
||||||
* wake when it the clock is set, and when that happens we read the clock synchronization state from the return
|
* wake when the clock is set, and when that happens we read the clock synchronization state from the return
|
||||||
* value of adjtimex(2), which supports the NTP time adjustment protocol.
|
* value of adjtimex(2), which supports the NTP time adjustment protocol.
|
||||||
*
|
*
|
||||||
* The kernel determines whether the clock is synchronized using driver-specific tests, based on time
|
* The kernel determines whether the clock is synchronized using driver-specific tests, based on time
|
||||||
@ -87,7 +86,7 @@ static int clock_state_update(ClockState *sp,
|
|||||||
* information that adjtimex(2) can use to determine that the clock is synchronized.
|
* information that adjtimex(2) can use to determine that the clock is synchronized.
|
||||||
*
|
*
|
||||||
* Well-behaved implementations including systemd-timesyncd should not produce either situation. For timesyncd
|
* Well-behaved implementations including systemd-timesyncd should not produce either situation. For timesyncd
|
||||||
* the initial set of the timestamp uses settimeofday(2), which sets the clock but does not mark it
|
* the initial setting of the time uses settimeofday(2), which sets the clock but does not mark it
|
||||||
* synchronized. When an NTP source is selected it sets the clock again with clock_adjtime(2) which does mark
|
* synchronized. When an NTP source is selected it sets the clock again with clock_adjtime(2) which does mark
|
||||||
* it synchronized. */
|
* it synchronized. */
|
||||||
r = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC);
|
r = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC);
|
||||||
@ -140,8 +139,7 @@ static int clock_state_update(ClockState *sp,
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc,
|
int main(int argc, char * argv[]) {
|
||||||
char * argv[]) {
|
|
||||||
int r;
|
int r;
|
||||||
_cleanup_(sd_event_unrefp) sd_event *event;
|
_cleanup_(sd_event_unrefp) sd_event *event;
|
||||||
ClockState state = {
|
ClockState state = {
|
||||||
@ -177,7 +175,7 @@ int main(int argc,
|
|||||||
r = clock_state_update(&state, event);
|
r = clock_state_update(&state, event);
|
||||||
if (r > 0) {
|
if (r > 0) {
|
||||||
r = sd_event_loop(event);
|
r = sd_event_loop(event);
|
||||||
if (0 > r)
|
if (r < 0)
|
||||||
log_error_errno(r, "Failed in event loop: %m");
|
log_error_errno(r, "Failed in event loop: %m");
|
||||||
else if (state.adjtime_state == TIME_ERROR) {
|
else if (state.adjtime_state == TIME_ERROR) {
|
||||||
log_error("Event loop terminated without synchronizing");
|
log_error("Event loop terminated without synchronizing");
|
||||||
|
Loading…
Reference in New Issue
Block a user