git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlog: Remove explicit calls to vlog_init().
[sliver-openvswitch.git]
/
extras
/
ezio
/
ovs-switchui.c
diff --git
a/extras/ezio/ovs-switchui.c
b/extras/ezio/ovs-switchui.c
index
16a6903
..
b1ba8d2
100644
(file)
--- a/
extras/ezio/ovs-switchui.c
+++ b/
extras/ezio/ovs-switchui.c
@@
-35,6
+35,7
@@
#include "ezio.h"
#include "fatal-signal.h"
#include "netdev.h"
#include "ezio.h"
#include "fatal-signal.h"
#include "netdev.h"
+#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
@@
-146,8
+147,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_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_EMER);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_EMER);
@@
-160,7
+159,8
@@
main(int argc, char *argv[])
"use --help for help");
}
"use --help for help");
}
- rconn = rconn_new(argv[0], 5, 5);
+ rconn = rconn_create(5, 5);
+ rconn_connect(rconn, argv[0], NULL);
die_if_already_running();
daemonize();
die_if_already_running();
daemonize();
@@
-242,7
+242,7
@@
main(int argc, char *argv[])
refresh();
poll_fd_wait(STDIN_FILENO, POLLIN);
refresh();
poll_fd_wait(STDIN_FILENO, POLLIN);
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
} while (time_msec() < timeout);
age_messages();
poll_block();
} while (time_msec() < timeout);
age_messages();
@@
-868,7
+868,7
@@
fetch_status(struct rconn *rconn, struct dict *dict, long long timeout)
rconn_run_wait(rconn);
rconn_recv_wait(rconn);
rconn_run_wait(rconn);
rconn_recv_wait(rconn);
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
}
}
poll_block();
}
}
@@
-1714,7
+1714,7
@@
menu_show(const struct menu *menu, int start, bool select)
refresh();
if (pos < min || pos > max) {
refresh();
if (pos < min || pos > max) {
- poll_timer_wait
(adjust - time_msec()
);
+ poll_timer_wait
_until(adjust
);
}
poll_fd_wait(STDIN_FILENO, POLLIN);
poll_block();
}
poll_fd_wait(STDIN_FILENO, POLLIN);
poll_block();
@@
-1946,7
+1946,7
@@
static void
block_until(long long timeout)
{
while (timeout > time_msec()) {
block_until(long long timeout)
{
while (timeout > time_msec()) {
- poll_timer_wait
(timeout - time_msec()
);
+ poll_timer_wait
_until(timeout
);
poll_block();
}
drain_keyboard_buffer();
poll_block();
}
drain_keyboard_buffer();