X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Ftimeval.c;h=3f12b501209f681f345e4108eb7b8fae53548925;hb=734ec5ec13499a2e7112626564cc9bd0c2d06600;hp=8097ce806b413f21e429ebbca4fcef01555c6a94;hpb=4ae90ff9e2011d54f52043a55707d16c8a9a258e;p=openvswitch diff --git a/lib/timeval.c b/lib/timeval.c index 8097ce80..3f12b501 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -54,8 +54,9 @@ static struct timespec monotonic_time; /* The monotonic time at which the time module was initialized. */ static long long int boot_time; -/* Fixed monotonic time offset, for use by unit tests. */ -static struct timespec warp_offset; +/* features for use by unit tests. */ +static struct timespec warp_offset; /* Offset added to monotonic_time. */ +static bool time_stopped; /* Disables real-time updates, if true. */ /* Time at which to die with SIGALRM (if not TIME_MIN). */ static time_t deadline = TIME_MIN; @@ -183,15 +184,17 @@ refresh_monotonic(void) { time_init(); - if (monotonic_clock == CLOCK_MONOTONIC) { - clock_gettime(monotonic_clock, &monotonic_time); - } else { - refresh_wall_if_ticked(); - monotonic_time = wall_time; - } - timespec_add(&monotonic_time, &monotonic_time, &warp_offset); + if (!time_stopped) { + if (monotonic_clock == CLOCK_MONOTONIC) { + clock_gettime(monotonic_clock, &monotonic_time); + } else { + refresh_wall_if_ticked(); + monotonic_time = wall_time; + } + timespec_add(&monotonic_time, &monotonic_time, &warp_offset); - monotonic_tick = false; + monotonic_tick = false; + } } /* Forces a refresh of the current time from the kernel. It is not usually @@ -561,6 +564,22 @@ get_cpu_usage(void) /* Unixctl interface. */ +/* "time/stop" stops the monotonic time returned by e.g. time_msec() from + * advancing, except due to later calls to "time/warp". */ +static void +timeval_stop_cb(struct unixctl_conn *conn, + int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, + void *aux OVS_UNUSED) +{ + time_stopped = true; + unixctl_command_reply(conn, NULL); +} + +/* "time/warp MSECS" advances the current monotonic time by the specified + * number of milliseconds. Unless "time/stop" has also been executed, the + * monotonic clock continues to tick forward at the normal rate afterward. + * + * Does not affect wall clock readings. */ static void timeval_warp_cb(struct unixctl_conn *conn, int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED) @@ -570,19 +589,21 @@ timeval_warp_cb(struct unixctl_conn *conn, msecs = atoi(argv[1]); if (msecs <= 0) { - unixctl_command_reply(conn, 501, "invalid MSECS"); + unixctl_command_reply_error(conn, "invalid MSECS"); return; } ts.tv_sec = msecs / 1000; ts.tv_nsec = (msecs % 1000) * 1000 * 1000; timespec_add(&warp_offset, &warp_offset, &ts); - unixctl_command_reply(conn, 200, "warped"); + timespec_add(&monotonic_time, &monotonic_time, &ts); + unixctl_command_reply(conn, "warped"); } void timeval_dummy_register(void) { + unixctl_command_register("time/stop", "", 0, 0, timeval_stop_cb, NULL); unixctl_command_register("time/warp", "MSECS", 1, 1, timeval_warp_cb, NULL); }