shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-27 01:57:35 +03:00
Code

core: Make sure a stamp file exists for all Persistent=true timers

Browse Source 
If a persistent timer has no stamp file yet, it behaves just like a normal
timer until it runs for the first time. If the system is always shut down
while the timer is supposed to run, a stamp file is never created and
Peristent=true has no effect.

This patch fixes this by creating a stamp file with the current time
when the timer is first started.
This commit is contained in:
Thomas Bächler 2014-04-02 20:18:44 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent baf167ee0a
commit 472fc28fda
Notes: Lennart Poettering 2014-05-24 11:25:24 +08:00 
Backport: bugfix
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/timer.c
View File

@ -111,6 +111,23 @@ static int timer_add_default_dependencies(Timer *t) {
return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static void update_stampfile(Timer *t, usec_t timestamp) {
_cleanup_close_ int fd = -1;
mkdir_parents_label(t->stamp_path, 0755);
/* Update the file atime + mtime, if we can */
fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
if (fd >= 0) {
struct timespec ts[2];
timespec_store(&ts[0], timestamp);
ts[1] = ts[0];
futimens(fd, ts);
}
}
static int timer_setup_persistent(Timer *t) {
int r;
@ -496,22 +513,8 @@ static void timer_enter_running(Timer *t) {
dual_timestamp_get(&t->last_trigger);
if (t->stamp_path) {
_cleanup_close_ int fd = -1;
mkdir_parents_label(t->stamp_path, 0755);
/* Update the file atime + mtime, if we can */
fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
if (fd >= 0) {
struct timespec ts[2];
timespec_store(&ts[0], t->last_trigger.realtime);
ts[1] = ts[0];
futimens(fd, ts);
}
}
if (t->stamp_path)
update_stampfile(t, t->last_trigger.realtime);
timer_set_state(t, TIMER_RUNNING);
return;
@ -539,6 +542,11 @@ static int timer_start(Unit *u) {
if (stat(t->stamp_path, &st) >= 0)
t->last_trigger.realtime = timespec_load(&st.st_atim);
else if (errno == ENOENT)
/* The timer has never run before,
* make sure a stamp file exists.
*/
update_stampfile(t, now(CLOCK_REALTIME));
}
t->result = TIMER_SUCCESS;