Skip to content

time: Have skewing-now call non-skewing now#7466

Merged
liewegas merged 2 commits intoceph:masterfrom
adamemerson:wip-bsd-time-second-try
Feb 6, 2016
Merged

time: Have skewing-now call non-skewing now#7466
liewegas merged 2 commits intoceph:masterfrom
adamemerson:wip-bsd-time-second-try

Conversation

@adamemerson
Copy link
Contributor

For the real-time clocks, Ceph's testing infrastructure likes to be able to
inject a skew. To avoid pulling CephContext into ceph_time.h these are moved to
ceph_time.cc. The original way this was done called clock_gettime in both
places.

This is an unnecessary duplication and apparently error-prone. So only call
clock_gettime from one place.

Signed-off-by: Adam C. Emerson aemerson@redhat.com

@tchaikov tchaikov mentioned this pull request Feb 4, 2016
wjwithagen added a commit to wjwithagen/ceph that referenced this pull request Feb 5, 2016
So this route does not need to differentiate between COARSE, FAST, POSIX
gettime calls.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
For the real-time clocks, Ceph's testing infrastructure likes to be able to
inject a skew. To avoid pulling CephContext into ceph_time.h these are moved to
ceph_time.cc. The original way this was done called clock_gettime in both
places.

This is an unnecessary duplication and apparently error-prone. So only call
clock_gettime from one place.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
This fixes a compile error under clang and fixes another FreeBSD porting
issue.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson adamemerson force-pushed the wip-bsd-time-second-try branch from 6713571 to 672a694 Compare February 5, 2016 16:24
wjwithagen added a commit to wjwithagen/ceph that referenced this pull request Feb 5, 2016
So this route does not need to differentiate between COARSE, FAST, POSIX
gettime calls.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
liewegas added a commit that referenced this pull request Feb 6, 2016
common: time: have skewing-now call non-skewing now
@liewegas liewegas merged commit f3a0157 into ceph:master Feb 6, 2016
@tchaikov tchaikov mentioned this pull request Feb 8, 2016
@adamemerson adamemerson deleted the wip-bsd-time-second-try branch February 8, 2016 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants