2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-21 14:49:41 +00:00

timeval: Wake up all threads when time is warped.

This commit makes the main thread wake up all other threads when time is
warped.

Signed-off-by: Alex Wang <alexw@nicira.com>
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Alex Wang
2013-10-09 04:30:36 +00:00
committed by Ethan Jackson
parent 47aaca8823
commit 53d98a1e9c
3 changed files with 28 additions and 1 deletions

View File

@@ -226,6 +226,7 @@ poll_block(void)
COVERAGE_INC(poll_zero_timeout); COVERAGE_INC(poll_zero_timeout);
} }
timewarp_wait();
retval = time_poll(loop->pollfds, loop->n_waiters, retval = time_poll(loop->pollfds, loop->n_waiters,
loop->timeout_when, &elapsed); loop->timeout_when, &elapsed);
if (retval < 0) { if (retval < 0) {

View File

@@ -33,6 +33,7 @@
#include "hmap.h" #include "hmap.h"
#include "ovs-thread.h" #include "ovs-thread.h"
#include "signals.h" #include "signals.h"
#include "seq.h"
#include "unixctl.h" #include "unixctl.h"
#include "util.h" #include "util.h"
#include "vlog.h" #include "vlog.h"
@@ -57,6 +58,14 @@ static struct clock wall_clock; /* CLOCK_REALTIME. */
/* The monotonic time at which the time module was initialized. */ /* The monotonic time at which the time module was initialized. */
static long long int boot_time; static long long int boot_time;
/* True only when timeval_dummy_register() is called. */
static bool timewarp_enabled;
/* Reference to the seq struct. Threads other than main thread can
* wait on timewarp_seq and be waken up when time is warped. */
static struct seq *timewarp_seq;
/* Last value of 'timewarp_seq'. */
DEFINE_STATIC_PER_THREAD_DATA(uint64_t, last_seq, 0);
/* Monotonic time in milliseconds at which to die with SIGALRM (if not /* Monotonic time in milliseconds at which to die with SIGALRM (if not
* LLONG_MAX). */ * LLONG_MAX). */
static long long int deadline = LLONG_MAX; static long long int deadline = LLONG_MAX;
@@ -79,6 +88,7 @@ init_clock(struct clock *c, clockid_t id)
ovs_mutex_init(&c->mutex); 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);
timewarp_seq = seq_create();
} }
static void static void
@@ -313,6 +323,19 @@ xclock_gettime(clock_t id, struct timespec *ts)
} }
} }
/* Makes threads wait on timewarp_seq and be waken up when time is warped.
* This function will be no-op unless timeval_dummy_register() is called. */
void
timewarp_wait(void)
{
if (timewarp_enabled) {
uint64_t *last_seq = last_seq_get();
*last_seq = seq_read(timewarp_seq);
seq_wait(timewarp_seq, *last_seq);
}
}
static long long int static long long int
timeval_diff_msec(const struct timeval *a, const struct timeval *b) timeval_diff_msec(const struct timeval *a, const struct timeval *b)
{ {
@@ -511,13 +534,14 @@ timeval_warp_cb(struct unixctl_conn *conn,
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_mutex_unlock(&monotonic_clock.mutex); ovs_mutex_unlock(&monotonic_clock.mutex);
seq_change(timewarp_seq);
unixctl_command_reply(conn, "warped"); unixctl_command_reply(conn, "warped");
} }
void void
timeval_dummy_register(void) timeval_dummy_register(void)
{ {
timewarp_enabled = true;
unixctl_command_register("time/stop", "", 0, 0, timeval_stop_cb, NULL); unixctl_command_register("time/stop", "", 0, 0, timeval_stop_cb, NULL);
unixctl_command_register("time/warp", "MSECS", 1, 1, unixctl_command_register("time/warp", "MSECS", 1, 1,
timeval_warp_cb, NULL); timeval_warp_cb, NULL);

View File

@@ -69,6 +69,8 @@ int get_cpu_usage(void);
long long int time_boot_msec(void); long long int time_boot_msec(void);
void timewarp_wait(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif