diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-11-23 15:33:50 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-12-01 15:10:50 +0100 |
| commit | e6a7bee538f6638c2d5ca2afc66bf47cba3f075c (patch) | |
| tree | 9099f5e9de6c89978cffa45ddfe369adae1dd891 /src/libsystemd/sd-event/sd-event.c | |
| parent | sd-event: split out code to add/remove timer event sources to earliest/latest... (diff) | |
| download | systemd-e6a7bee538f6638c2d5ca2afc66bf47cba3f075c.tar.xz systemd-e6a7bee538f6638c2d5ca2afc66bf47cba3f075c.zip | |
sd-event: let's suffix last_run/last_log with "_usec"
Otherwise it's a bit confusing what this is about: two timestamps.
Diffstat (limited to '')
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 9bcd22f901..d5a3cb79a3 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -120,7 +120,7 @@ struct sd_event { LIST_HEAD(sd_event_source, sources); - usec_t last_run, last_log; + usec_t last_run_usec, last_log_usec; unsigned delays[sizeof(usec_t) * 8]; }; @@ -3755,19 +3755,19 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) { assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(e->state == SD_EVENT_INITIAL, -EBUSY); - if (e->profile_delays && e->last_run) { + if (e->profile_delays && e->last_run_usec != 0) { usec_t this_run; unsigned l; this_run = now(CLOCK_MONOTONIC); - l = u64log2(this_run - e->last_run); + l = u64log2(this_run - e->last_run_usec); assert(l < ELEMENTSOF(e->delays)); e->delays[l]++; - if (this_run - e->last_log >= 5*USEC_PER_SEC) { + if (this_run - e->last_log_usec >= 5*USEC_PER_SEC) { event_log_delays(e); - e->last_log = this_run; + e->last_log_usec = this_run; } } @@ -3777,7 +3777,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) { r = sd_event_wait(e, timeout); if (e->profile_delays) - e->last_run = now(CLOCK_MONOTONIC); + e->last_run_usec = now(CLOCK_MONOTONIC); if (r > 0) { /* There's something now, then let's dispatch it */ |