picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-event: let's suffix last_run/last_log with "_usec" 

Otherwise it's a bit confusing what this is about: two timestamps.
This commit is contained in:
Lennart Poettering 2020-11-23 15:33:50 +01:00
parent 1e45e3fecc
commit e6a7bee538
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd/sd-event/sd-event.c
View File

@ -120,7 +120,7 @@ struct sd_event {
LIST_HEAD(sd_event_source, sources); 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]; 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_FINISHED, -ESTALE);
assert_return(e->state == SD_EVENT_INITIAL, -EBUSY); 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; usec_t this_run;
unsigned l; unsigned l;
this_run = now(CLOCK_MONOTONIC); 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)); assert(l < ELEMENTSOF(e->delays));
e->delays[l]++; 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); 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); r = sd_event_wait(e, timeout);
if (e->profile_delays) if (e->profile_delays)
e->last_run = now(CLOCK_MONOTONIC); e->last_run_usec = now(CLOCK_MONOTONIC);
if (r > 0) { if (r > 0) {
/* There's something now, then let's dispatch it */ /* There's something now, then let's dispatch it */