Skip to content

time-util: clock mapping improvements - #16536

Merged
keszybz merged 3 commits into
systemd:masterfrom
poettering:time-clock-map-fixes
Jul 22, 2020
Merged

keszybz merged 3 commits into
systemd:masterfrom
poettering:time-clock-map-fixes

Conversation

@poettering

Copy link
Copy Markdown
Member

No description provided.

Let's split this out into its own helper function we can reuse at
various places.

Also, let's avoid signed values where we can so that we can cover more
of the available time range.
@poettering

Copy link
Copy Markdown
Member Author

This is pretty much a follow-up for #16428, hence /cc @filbranden

@keszybz keszybz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Comment thread src/core/timer.c
rebased = map_clock_usec(UNIT(t)->manager->timestamps[MANAGER_TIMESTAMP_USERSPACE].monotonic,
CLOCK_MONOTONIC, CLOCK_REALTIME);
if (v->next_elapse < rebased)
v->next_elapse = rebased;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this is much clearer now.

@keszybz keszybz added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jul 22, 2020
@keszybz

keszybz commented Jul 22, 2020

Copy link
Copy Markdown
Member

bionic-i386 failed in boot-and-services, but I have no idea why exactly.

@keszybz

keszybz commented Jul 22, 2020

Copy link
Copy Markdown
Member

I restarted github ci.

@keszybz keszybz added ci-failure-appears-unrelated and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels Jul 22, 2020
@keszybz
keszybz merged commit 3bb4126 into systemd:master Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants