mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 06:45:17 +00:00
Code Issues Releases Wiki Activity

timeval: Replace rwlock by mutex.

Browse Source 
It's only held briefly now and in general a mutex tends to be preferred for
that case.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ben Pfaff
2013-09-13 11:38:57 -07:00
parent 04b331cdca
commit e6249c68a5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/timeval.c
View File

@@ -42,8 +42,8 @@ VLOG_DEFINE_THIS_MODULE(timeval);
struct clock { struct clock {
clockid_t id; /* CLOCK_MONOTONIC or CLOCK_REALTIME. */ clockid_t id; /* CLOCK_MONOTONIC or CLOCK_REALTIME. */
/* Features for use by unit tests. Protected by 'rwlock'. */ /* Features for use by unit tests. Protected by 'mutex'. */
struct ovs_rwlock rwlock; struct ovs_mutex mutex;
atomic_bool slow_path; /* True if warped or stopped. */ atomic_bool slow_path; /* True if warped or stopped. */
struct timespec warp OVS_GUARDED; /* Offset added for unit tests. */ struct timespec warp OVS_GUARDED; /* Offset added for unit tests. */
bool stopped OVS_GUARDED; /* Disable real-time updates if true. */ bool stopped OVS_GUARDED; /* Disable real-time updates if true. */
@@ -76,7 +76,7 @@ init_clock(struct clock *c, clockid_t id)
{ {
memset(c, 0, sizeof *c); memset(c, 0, sizeof *c);
c->id = id; c->id = id;
ovs_rwlock_init(&c->rwlock); ovs_mutex_init(&c->mutex);
atomic_init(&c->slow_path, false); atomic_init(&c->slow_path, false);
xclock_gettime(c->id, &c->cache); xclock_gettime(c->id, &c->cache);
} }
@@ -118,11 +118,11 @@ time_timespec__(struct clock *c, struct timespec *ts)
struct timespec cache; struct timespec cache;
bool stopped; bool stopped;
ovs_rwlock_rdlock(&c->rwlock); ovs_mutex_lock(&c->mutex);
stopped = c->stopped; stopped = c->stopped;
warp = c->warp; warp = c->warp;
cache = c->cache; cache = c->cache;
ovs_rwlock_unlock(&c->rwlock); ovs_mutex_unlock(&c->mutex);
if (!stopped) { if (!stopped) {
xclock_gettime(c->id, &cache); xclock_gettime(c->id, &cache);
@@ -340,9 +340,9 @@ is_warped(const struct clock *c)
{ {
bool warped; bool warped;
ovs_rwlock_rdlock(&c->rwlock); ovs_mutex_lock(&c->mutex);
warped = monotonic_clock.warp.tv_sec || monotonic_clock.warp.tv_nsec; warped = monotonic_clock.warp.tv_sec || monotonic_clock.warp.tv_nsec;
ovs_rwlock_unlock(&c->rwlock); ovs_mutex_unlock(&c->mutex);
return warped; return warped;
} }
@@ -476,11 +476,11 @@ timeval_stop_cb(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, int argc OVS_UNUSED, const char *argv[] OVS_UNUSED,
void *aux 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); atomic_store(&monotonic_clock.slow_path, true);
monotonic_clock.stopped = true; monotonic_clock.stopped = true;
xclock_gettime(monotonic_clock.id, &monotonic_clock.cache); 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); unixctl_command_reply(conn, NULL);
} }
@@ -506,10 +506,10 @@ timeval_warp_cb(struct unixctl_conn *conn,
ts.tv_sec = msecs / 1000; ts.tv_sec = msecs / 1000;
ts.tv_nsec = (msecs % 1000) * 1000 * 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); atomic_store(&monotonic_clock.slow_path, true);
timespec_add(&monotonic_clock.warp, &monotonic_clock.warp, &ts); 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"); unixctl_command_reply(conn, "warped");
} }