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

sd-event: do not arm timers unnecessarily 

Rather than recalculating the next timeout on every loop, we only do it when something changed.
This commit is contained in:
Tom Gundersen 2014-08-14 00:22:27 +02:00
parent e92da1e5d0
commit 212bbb1798
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,8 @@ struct clock_data {
Prioq *earliest;
Prioq *latest;
usec_t next;
bool needs_rearm:1;
};
struct sd_event {
@ -616,6 +618,7 @@ static void source_disconnect(sd_event_source *s) {
prioq_remove(d->earliest, s, &s->time.earliest_index);
prioq_remove(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
break;
}
@ -715,6 +718,7 @@ static int source_set_pending(sd_event_source *s, bool b) {
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
}
return 0;
@ -898,6 +902,8 @@ _public_ int sd_event_add_time(
if (r < 0)
goto fail;
d->needs_rearm = true;
if (ret)
*ret = s;
@ -1408,6 +1414,7 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
break;
}
@ -1471,6 +1478,7 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
break;
}
@ -1548,6 +1556,7 @@ _public_ int sd_event_source_set_time(sd_event_source *s, uint64_t usec) {
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
return 0;
}
@ -1582,6 +1591,7 @@ _public_ int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec
assert(d);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
d->needs_rearm = true;
return 0;
}
@ -1745,6 +1755,11 @@ static int event_arm_timer(
assert(e);
assert(d);
if (_likely_(!d->needs_rearm))
return 0;
else
d->needs_rearm = false;
a = prioq_peek(d->earliest);
if (!a || a->enabled == SD_EVENT_OFF) {