projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeval: Make time_init() static and remove calls to it.
[openvswitch]
/
extras
/
ezio
/
ezio-term.c
diff --git
a/extras/ezio/ezio-term.c
b/extras/ezio/ezio-term.c
index cedc5c96741ae57be03ce98a21d2207f99e8dd1c..bf8716a9e524c4d0ebe4c2357d2f3c04a502e1ce 100644
(file)
--- a/
extras/ezio/ezio-term.c
+++ b/
extras/ezio/ezio-term.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009
, 2010
Nicira Networks, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-98,7
+98,6
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
proctitle_init(argc, argv);
set_program_name(argv[0]);
- time_init();
vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
@@
-907,14
+906,7
@@
scanner_run(struct scanner *s, struct ezio *ezio)
static void
scanner_wait(struct scanner *s)
{
static void
scanner_wait(struct scanner *s)
{
- long long int now = time_msec();
- long long int expires = s->last_move + 750;
- if (now >= expires) {
- poll_immediate_wake();
- } else {
- poll_timer_wait(expires - now);
- }
-
+ poll_timer_wait_until(s->last_move + 750);
}
static void
}
static void