struct clock {
clockid_t id; /* CLOCK_MONOTONIC or CLOCK_REALTIME. */
- /* Features for use by unit tests. Protected by 'rwlock'. */
- struct ovs_rwlock rwlock;
+ /* Features for use by unit tests. Protected by 'mutex'. */
+ struct ovs_mutex mutex;
+ atomic_bool slow_path; /* True if warped or stopped. */
struct timespec warp OVS_GUARDED; /* Offset added for unit tests. */
bool stopped OVS_GUARDED; /* Disable real-time updates if true. */
struct timespec cache OVS_GUARDED; /* Last time read from kernel. */
{
memset(c, 0, sizeof *c);
c->id = id;
- ovs_rwlock_init(&c->rwlock);
+ ovs_mutex_init(&c->mutex);
+ atomic_init(&c->slow_path, false);
xclock_gettime(c->id, &c->cache);
}
static void
time_timespec__(struct clock *c, struct timespec *ts)
{
+ bool slow_path;
+
time_init();
- if (!c->stopped) {
+ atomic_read_explicit(&c->slow_path, &slow_path, memory_order_relaxed);
+ if (!slow_path) {
xclock_gettime(c->id, ts);
} else {
- ovs_rwlock_rdlock(&c->rwlock);
- timespec_add(ts, &c->cache, &c->warp);
- ovs_rwlock_unlock(&c->rwlock);
+ struct timespec warp;
+ struct timespec cache;
+ bool stopped;
+
+ ovs_mutex_lock(&c->mutex);
+ stopped = c->stopped;
+ warp = c->warp;
+ cache = c->cache;
+ ovs_mutex_unlock(&c->mutex);
+
+ if (!stopped) {
+ xclock_gettime(c->id, &cache);
+ }
+ timespec_add(ts, &cache, &warp);
}
}
{
bool warped;
- ovs_rwlock_rdlock(&c->rwlock);
+ ovs_mutex_lock(&c->mutex);
warped = monotonic_clock.warp.tv_sec || monotonic_clock.warp.tv_nsec;
- ovs_rwlock_unlock(&c->rwlock);
+ ovs_mutex_unlock(&c->mutex);
return warped;
}
int argc OVS_UNUSED, const char *argv[] OVS_UNUSED,
void *aux OVS_UNUSED)
{
- ovs_rwlock_wrlock(&monotonic_clock.rwlock);
+ ovs_mutex_lock(&monotonic_clock.mutex);
+ atomic_store(&monotonic_clock.slow_path, true);
monotonic_clock.stopped = true;
xclock_gettime(monotonic_clock.id, &monotonic_clock.cache);
- ovs_rwlock_unlock(&monotonic_clock.rwlock);
+ ovs_mutex_unlock(&monotonic_clock.mutex);
unixctl_command_reply(conn, NULL);
}
ts.tv_sec = msecs / 1000;
ts.tv_nsec = (msecs % 1000) * 1000 * 1000;
- ovs_rwlock_wrlock(&monotonic_clock.rwlock);
+ ovs_mutex_lock(&monotonic_clock.mutex);
+ atomic_store(&monotonic_clock.slow_path, true);
timespec_add(&monotonic_clock.warp, &monotonic_clock.warp, &ts);
- ovs_rwlock_unlock(&monotonic_clock.rwlock);
+ ovs_mutex_unlock(&monotonic_clock.mutex);
unixctl_command_reply(conn, "warped");
}