shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

core: properly initialize kernel timestamp

Browse Source
This commit is contained in:
Lennart Poettering 2013-01-08 01:27:39 +01:00
parent 6ee667aeeb
commit cae0c5e042
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/manager.c
View File

@ -301,6 +301,7 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) {
return -ENOMEM; return -ENOMEM;
dual_timestamp_get(&m->userspace_timestamp); dual_timestamp_get(&m->userspace_timestamp);
dual_timestamp_from_monotonic(&m->kernel_timestamp, 0);
m->running_as = running_as; m->running_as = running_as;
m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1; m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1;

26
src/shared/time-util.c
View File

@ -46,6 +46,11 @@ dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
int64_t delta; int64_t delta;
assert(ts); assert(ts);
if (u == (usec_t) -1) {
ts->realtime = ts->monotonic = (usec_t) -1;
return ts;
}
ts->realtime = u; ts->realtime = u;
if (u == 0) if (u == 0)
@ -64,6 +69,27 @@ dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
return ts; return ts;
} }
dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u) {
int64_t delta;
assert(ts);
if (u == (usec_t) -1) {
ts->realtime = ts->monotonic = (usec_t) -1;
return ts;
}
ts->monotonic = u;
delta = (int64_t) now(CLOCK_MONOTONIC) - (int64_t) u;
ts->realtime = now(CLOCK_REALTIME);
if ((int64_t) ts->realtime > delta)
ts->realtime -= delta;
else
ts->realtime = 0;
return ts;
}
usec_t timespec_load(const struct timespec *ts) { usec_t timespec_load(const struct timespec *ts) {
assert(ts); assert(ts);

1
src/shared/time-util.h
View File

@ -61,6 +61,7 @@ usec_t now(clockid_t clock);
dual_timestamp* dual_timestamp_get(dual_timestamp *ts); dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u); dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
#define dual_timestamp_is_set(ts) ((ts)->realtime > 0) #define dual_timestamp_is_set(ts) ((ts)->realtime > 0)