diff options
31 files changed, 46 insertions, 46 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 695b998b57..f9014dc560 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -64,7 +64,7 @@ nsec_t now_nsec(clockid_t clock_id) { return timespec_load_nsec(&ts); } -dual_timestamp* dual_timestamp_get(dual_timestamp *ts) { +dual_timestamp* dual_timestamp_now(dual_timestamp *ts) { assert(ts); ts->realtime = now(CLOCK_REALTIME); @@ -73,7 +73,7 @@ dual_timestamp* dual_timestamp_get(dual_timestamp *ts) { return ts; } -triple_timestamp* triple_timestamp_get(triple_timestamp *ts) { +triple_timestamp* triple_timestamp_now(triple_timestamp *ts) { assert(ts); ts->realtime = now(CLOCK_REALTIME); diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 73ba8b9544..ed4c1aabd4 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -79,12 +79,12 @@ nsec_t now_nsec(clockid_t clock); usec_t map_clock_usec(usec_t from, clockid_t from_clock, clockid_t to_clock); -dual_timestamp* dual_timestamp_get(dual_timestamp *ts); +dual_timestamp* dual_timestamp_now(dual_timestamp *ts); dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u); dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u); dual_timestamp* dual_timestamp_from_boottime(dual_timestamp *ts, usec_t u); -triple_timestamp* triple_timestamp_get(triple_timestamp *ts); +triple_timestamp* triple_timestamp_now(triple_timestamp *ts); triple_timestamp* triple_timestamp_from_realtime(triple_timestamp *ts, usec_t u); triple_timestamp* triple_timestamp_from_boottime(triple_timestamp *ts, usec_t u); diff --git a/src/core/execute.c b/src/core/execute.c index e63137440a..1e48e88ee8 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1797,7 +1797,7 @@ void exec_status_start(ExecStatus *s, pid_t pid) { .pid = pid, }; - dual_timestamp_get(&s->start_timestamp); + dual_timestamp_now(&s->start_timestamp); } void exec_status_exit(ExecStatus *s, const ExecContext *context, pid_t pid, int code, int status) { @@ -1808,7 +1808,7 @@ void exec_status_exit(ExecStatus *s, const ExecContext *context, pid_t pid, int .pid = pid, }; - dual_timestamp_get(&s->exit_timestamp); + dual_timestamp_now(&s->exit_timestamp); s->code = code; s->status = status; diff --git a/src/core/main.c b/src/core/main.c index cfa29f3a58..2ac59dabf5 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2687,7 +2687,7 @@ static int initialize_security( assert(security_finish_timestamp); assert(ret_error_message); - dual_timestamp_get(security_start_timestamp); + dual_timestamp_now(security_start_timestamp); r = mac_selinux_setup(loaded_policy); if (r < 0) { @@ -2713,7 +2713,7 @@ static int initialize_security( return r; } - dual_timestamp_get(security_finish_timestamp); + dual_timestamp_now(security_finish_timestamp); return 0; } @@ -2819,7 +2819,7 @@ int main(int argc, char *argv[]) { /* Take timestamps early on */ dual_timestamp_from_monotonic(&kernel_timestamp, 0); - dual_timestamp_get(&userspace_timestamp); + dual_timestamp_now(&userspace_timestamp); /* Figure out whether we need to do initialize the system, or if we already did that because we are * reexecuting. */ diff --git a/src/core/manager.c b/src/core/manager.c index 6b9ce2d2ec..10f2e8e00e 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1947,7 +1947,7 @@ static void manager_ready(Manager *m) { Manager* manager_reloading_start(Manager *m) { m->n_reloading++; - dual_timestamp_get(m->timestamps + MANAGER_TIMESTAMP_UNITS_LOAD); + dual_timestamp_now(m->timestamps + MANAGER_TIMESTAMP_UNITS_LOAD); return m; } @@ -1971,11 +1971,11 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *roo if (r < 0) return r; - dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_START)); + dual_timestamp_now(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_START)); r = manager_run_environment_generators(m); if (r >= 0) r = manager_run_generators(m); - dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_FINISH)); + dual_timestamp_now(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_FINISH)); if (r < 0) return r; @@ -1997,10 +1997,10 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *roo reloading = manager_reloading_start(m); /* First, enumerate what we can from all config files */ - dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_UNITS_LOAD_START)); + dual_timestamp_now(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_UNITS_LOAD_START)); manager_enumerate_perpetual(m); manager_enumerate(m); - dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_UNITS_LOAD_FINISH)); + dual_timestamp_now(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_UNITS_LOAD_FINISH)); /* Second, deserialize if there is something to deserialize */ if (serialization) { @@ -3890,7 +3890,7 @@ void manager_check_finished(Manager *m) { /* This is no longer the first boot */ manager_set_first_boot(m, false); - dual_timestamp_get(m->timestamps + MANAGER_TIMESTAMP_FINISH); + dual_timestamp_now(m->timestamps + MANAGER_TIMESTAMP_FINISH); manager_notify_finished(m); diff --git a/src/core/service.c b/src/core/service.c index d3e8d45854..b9eb40c555 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -378,7 +378,7 @@ static void service_extend_timeout(Service *s, usec_t extend_timeout_usec) { static void service_reset_watchdog(Service *s) { assert(s); - dual_timestamp_get(&s->watchdog_timestamp); + dual_timestamp_now(&s->watchdog_timestamp); service_start_watchdog(s); } diff --git a/src/core/timer.c b/src/core/timer.c index 97233a88f6..3c41a250b0 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -382,7 +382,7 @@ static void timer_enter_waiting(Timer *t, bool time_change) { goto fail; } - triple_timestamp_get(&ts); + triple_timestamp_now(&ts); t->next_elapse_monotonic_or_boottime = t->next_elapse_realtime = 0; LIST_FOREACH(value, v, t->values) { @@ -618,7 +618,7 @@ static void timer_enter_running(Timer *t) { goto fail; } - dual_timestamp_get(&t->last_trigger); + dual_timestamp_now(&t->last_trigger); ACTIVATION_DETAILS_TIMER(details)->last_trigger = t->last_trigger; job_set_activation_details(job, details); diff --git a/src/core/unit-serialize.c b/src/core/unit-serialize.c index 0ffcceaf53..3bb63d15d6 100644 --- a/src/core/unit-serialize.c +++ b/src/core/unit-serialize.c @@ -526,7 +526,7 @@ int unit_deserialize_state(Unit *u, FILE *f, FDSet *fds) { * reboots. */ if (!dual_timestamp_is_set(&u->state_change_timestamp)) - dual_timestamp_get(&u->state_change_timestamp); + dual_timestamp_now(&u->state_change_timestamp); /* Let's make sure that everything that is deserialized also gets any potential new cgroup settings * applied after we are done. For that we invalidate anything already realized, so that we can diff --git a/src/core/unit.c b/src/core/unit.c index 4bff7ced08..e865c393a3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1779,7 +1779,7 @@ static bool unit_test_condition(Unit *u) { assert(u); - dual_timestamp_get(&u->condition_timestamp); + dual_timestamp_now(&u->condition_timestamp); r = manager_get_effective_environment(u->manager, &env); if (r < 0) { @@ -1803,7 +1803,7 @@ static bool unit_test_assert(Unit *u) { assert(u); - dual_timestamp_get(&u->assert_timestamp); + dual_timestamp_now(&u->assert_timestamp); r = manager_get_effective_environment(u->manager, &env); if (r < 0) { @@ -2740,7 +2740,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su /* Update timestamps for state changes */ if (!MANAGER_IS_RELOADING(m)) { - dual_timestamp_get(&u->state_change_timestamp); + dual_timestamp_now(&u->state_change_timestamp); if (UNIT_IS_INACTIVE_OR_FAILED(os) && !UNIT_IS_INACTIVE_OR_FAILED(ns)) u->inactive_exit_timestamp = u->state_change_timestamp; diff --git a/src/libsystemd-network/icmp6-util-unix.c b/src/libsystemd-network/icmp6-util-unix.c index 95e050083b..01edb854df 100644 --- a/src/libsystemd-network/icmp6-util-unix.c +++ b/src/libsystemd-network/icmp6-util-unix.c @@ -44,7 +44,7 @@ int icmp6_receive( assert_se(read (fd, iov_base, iov_len) == (ssize_t) iov_len); if (ret_timestamp) - triple_timestamp_get(ret_timestamp); + triple_timestamp_now(ret_timestamp); if (ret_sender) *ret_sender = dummy_link_local; diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index a0521f0562..25fd70b1b1 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -214,7 +214,7 @@ int icmp6_receive( if (triple_timestamp_is_set(&t)) *ret_timestamp = t; else - triple_timestamp_get(ret_timestamp); + triple_timestamp_now(ret_timestamp); } if (ret_sender) diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index a6e78dd071..4925fa8f19 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -39,7 +39,7 @@ void dhcp_lease_set_timestamp(sd_dhcp_lease *lease, const triple_timestamp *time if (timestamp && triple_timestamp_is_set(timestamp)) lease->timestamp = *timestamp; else - triple_timestamp_get(&lease->timestamp); + triple_timestamp_now(&lease->timestamp); } int sd_dhcp_lease_get_timestamp(sd_dhcp_lease *lease, clockid_t clock, uint64_t *ret) { diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 45c0f14d2c..ce576c24eb 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -903,7 +903,7 @@ static void request_set_timestamp(DHCPRequest *req, const triple_timestamp *time if (timestamp && triple_timestamp_is_set(timestamp)) req->timestamp = *timestamp; else - triple_timestamp_get(&req->timestamp); + triple_timestamp_now(&req->timestamp); } static int request_get_lifetime_timestamp(DHCPRequest *req, clockid_t clock, usec_t *ret) { diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c index bbd005bb63..674248b83d 100644 --- a/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libsystemd-network/sd-dhcp6-lease.c @@ -20,7 +20,7 @@ static void dhcp6_lease_set_timestamp(sd_dhcp6_lease *lease, const triple_timest if (timestamp && triple_timestamp_is_set(timestamp)) lease->timestamp = *timestamp; else - triple_timestamp_get(&lease->timestamp); + triple_timestamp_now(&lease->timestamp); } int sd_dhcp6_lease_get_timestamp(sd_dhcp6_lease *lease, clockid_t clock, uint64_t *ret) { diff --git a/src/libsystemd-network/sd-lldp-rx.c b/src/libsystemd-network/sd-lldp-rx.c index 7e2ffd4eab..2fc9a55323 100644 --- a/src/libsystemd-network/sd-lldp-rx.c +++ b/src/libsystemd-network/sd-lldp-rx.c @@ -229,7 +229,7 @@ static int lldp_rx_receive_datagram(sd_event_source *s, int fd, uint32_t revents if (ioctl(fd, SIOCGSTAMPNS, &ts) >= 0) triple_timestamp_from_realtime(&n->timestamp, timespec_load(&ts)); else - triple_timestamp_get(&n->timestamp); + triple_timestamp_now(&n->timestamp); (void) lldp_rx_handle_datagram(lldp_rx, n); return 0; diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index aba458185b..288798a0dc 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -4612,7 +4612,7 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t /* Set timestamp only when this is called first time. */ if (threshold == INT64_MAX) - triple_timestamp_get(&e->timestamp); + triple_timestamp_now(&e->timestamp); for (size_t i = 0; i < m; i++) { diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 4b74d06997..f72498c2e7 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -2530,7 +2530,7 @@ int journal_file_append_entry( "Invalid monotomic timestamp %" PRIu64 ", refusing entry.", ts->monotonic); } else { - dual_timestamp_get(&_ts); + dual_timestamp_now(&_ts); ts = &_ts; } diff --git a/src/libsystemd/sd-journal/test-journal-append.c b/src/libsystemd/sd-journal/test-journal-append.c index 90a7ccb00f..24b98c8b4a 100644 --- a/src/libsystemd/sd-journal/test-journal-append.c +++ b/src/libsystemd/sd-journal/test-journal-append.c @@ -27,7 +27,7 @@ static int journal_append_message(JournalFile *mj, const char *message) { assert(mj); assert(message); - dual_timestamp_get(&ts); + dual_timestamp_now(&ts); iovec = IOVEC_MAKE_STRING(message); return journal_file_append_entry( mj, diff --git a/src/libsystemd/sd-journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c index fe97a9e4a6..eff908bde0 100644 --- a/src/libsystemd/sd-journal/test-journal-interleaving.c +++ b/src/libsystemd/sd-journal/test-journal-interleaving.c @@ -64,7 +64,7 @@ static void append_number(JournalFile *f, int n, const sd_id128_t *boot_id, uint struct iovec iovec[2]; size_t n_iov = 0; - dual_timestamp_get(&ts); + dual_timestamp_now(&ts); if (ts.monotonic <= previous_ts.monotonic) ts.monotonic = previous_ts.monotonic + 1; diff --git a/src/libsystemd/sd-journal/test-journal-stream.c b/src/libsystemd/sd-journal/test-journal-stream.c index 1dbfdcd607..3a370ef311 100644 --- a/src/libsystemd/sd-journal/test-journal-stream.c +++ b/src/libsystemd/sd-journal/test-journal-stream.c @@ -85,7 +85,7 @@ static void run_test(void) { dual_timestamp ts; struct iovec iovec[2]; - dual_timestamp_get(&ts); + dual_timestamp_now(&ts); if (ts.monotonic <= previous_ts.monotonic) ts.monotonic = previous_ts.monotonic + 1; diff --git a/src/libsystemd/sd-journal/test-journal-verify.c b/src/libsystemd/sd-journal/test-journal-verify.c index d05312c88f..edce44049a 100644 --- a/src/libsystemd/sd-journal/test-journal-verify.c +++ b/src/libsystemd/sd-journal/test-journal-verify.c @@ -108,7 +108,7 @@ static int run_test(const char *verification_key, ssize_t max_iterations) { struct iovec iovec; struct dual_timestamp ts; - dual_timestamp_get(&ts); + dual_timestamp_now(&ts); assert_se(asprintf(&test, "RANDOM=%li", random() % RANDOM_RANGE)); iovec = IOVEC_MAKE_STRING(test); assert_se(journal_file_append_entry( diff --git a/src/libsystemd/sd-journal/test-journal.c b/src/libsystemd/sd-journal/test-journal.c index badf6cdb45..96f2b6719e 100644 --- a/src/libsystemd/sd-journal/test-journal.c +++ b/src/libsystemd/sd-journal/test-journal.c @@ -41,7 +41,7 @@ static void test_non_empty_one(void) { assert_se(journal_file_open(-1, "test.journal", O_RDWR|O_CREAT, JOURNAL_COMPRESS|JOURNAL_SEAL, 0666, UINT64_MAX, NULL, m, NULL, &f) == 0); - assert_se(dual_timestamp_get(&ts)); + assert_se(dual_timestamp_now(&ts)); assert_se(sd_id128_randomize(&fake_boot_id) == 0); iovec = IOVEC_MAKE_STRING(test); @@ -196,7 +196,7 @@ static bool check_compressed(uint64_t compress_threshold, uint64_t data_size) { assert_se(journal_file_open(-1, "test.journal", O_RDWR|O_CREAT, JOURNAL_COMPRESS|JOURNAL_SEAL, 0666, compress_threshold, NULL, m, NULL, &f) == 0); - dual_timestamp_get(&ts); + dual_timestamp_now(&ts); iovec = IOVEC_MAKE(data, data_size); assert_se(journal_file_append_entry(f, &ts, NULL, &iovec, 1, NULL, NULL, NULL, NULL) == 0); diff --git a/src/login/logind-device.c b/src/login/logind-device.c index f605034526..376cd0d42f 100644 --- a/src/login/logind-device.c +++ b/src/login/logind-device.c @@ -27,7 +27,7 @@ Device* device_new(Manager *m, const char *sysfs, bool master) { d->manager = m; d->master = master; - dual_timestamp_get(&d->timestamp); + dual_timestamp_now(&d->timestamp); return d; } diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 62c38f2f12..af7879f561 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -176,7 +176,7 @@ int inhibitor_start(Inhibitor *i) { if (i->started) return 0; - dual_timestamp_get(&i->since); + dual_timestamp_now(&i->since); log_debug("Inhibitor %s (%s) pid="PID_FMT" uid="UID_FMT" mode=%s started.", strna(i->who), strna(i->why), diff --git a/src/login/logind-session.c b/src/login/logind-session.c index fa62c60a9f..3f5decd8d9 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -794,7 +794,7 @@ int session_start(Session *s, sd_bus_message *properties, sd_bus_error *error) { LOG_MESSAGE("New session %s of user %s.", s->id, s->user->user_record->user_name)); if (!dual_timestamp_is_set(&s->timestamp)) - dual_timestamp_get(&s->timestamp); + dual_timestamp_now(&s->timestamp); if (s->seat) seat_read_active_vt(s->seat); @@ -1088,7 +1088,7 @@ int session_set_idle_hint(Session *s, bool b) { return 0; s->idle_hint = b; - dual_timestamp_get(&s->idle_hint_timestamp); + dual_timestamp_now(&s->idle_hint_timestamp); session_send_changed(s, "IdleHint", "IdleSinceHint", "IdleSinceHintMonotonic", NULL); diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 7a6056086a..641050f8ba 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -460,7 +460,7 @@ int user_start(User *u) { if (!u->started) { if (!dual_timestamp_is_set(&u->timestamp)) - dual_timestamp_get(&u->timestamp); + dual_timestamp_now(&u->timestamp); user_send_signal(u, true); u->started = true; } diff --git a/src/machine/machine.c b/src/machine/machine.c index ae64b430cf..44ff5c190b 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -470,7 +470,7 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { LOG_MESSAGE("New machine %s.", m->name)); if (!dual_timestamp_is_set(&m->timestamp)) - dual_timestamp_get(&m->timestamp); + dual_timestamp_now(&m->timestamp); m->started = true; diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c index 8786e89c0e..e49bd8f1f2 100644 --- a/src/shared/boot-timestamps.c +++ b/src/shared/boot-timestamps.c @@ -15,7 +15,7 @@ int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_time assert(loader); if (!n) { - dual_timestamp_get(&_n); + dual_timestamp_now(&_n); n = &_n; } diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c index 34abc3cc9b..e48cf45333 100644 --- a/src/systemctl/systemctl-list-units.c +++ b/src/systemctl/systemctl-list-units.c @@ -769,7 +769,7 @@ int verb_list_timers(int argc, char *argv[], void *userdata) { if (n < 0) return n; - dual_timestamp_get(&nw); + dual_timestamp_now(&nw); FOREACH_ARRAY(u, unit_infos, n) { r = add_timer_info(bus, u, &nw, &timers, &n_timers); diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 1667ba4004..94f037615b 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -484,7 +484,7 @@ static void print_status_info( dual_timestamp nw, next = {i->next_elapse_real, i->next_elapse_monotonic}; usec_t next_elapse; - dual_timestamp_get(&nw); + dual_timestamp_now(&nw); next_elapse = calc_next_elapse(&nw, &next); if (timestamp_is_set(next_elapse)) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 82fe668bf9..1317bc0f76 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -566,7 +566,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re m->poll_interval_usec / USEC_PER_SEC); /* Get current monotonic/realtime clocks immediately before adjusting the latter */ - triple_timestamp_get(&dts); + triple_timestamp_now(&dts); if (!spike) { /* Fix up our idea of the time. */ |