projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlog: Make the vlog module catalog program-specific.
[openvswitch]
/
extras
/
ezio
/
ezio-term.c
diff --git
a/extras/ezio/ezio-term.c
b/extras/ezio/ezio-term.c
index 8f12a7bc47780cf0f8759e4ac18b38d3d26b6a16..b41a7c0258306e6fb83520bb291f9dc9b60f787b 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.
@@
-37,10
+37,10
@@
#include "terminal.h"
#include "timeval.h"
#include "util.h"
#include "terminal.h"
#include "timeval.h"
#include "util.h"
-
-#define THIS_MODULE VLM_ezio_term
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(ezio_term)
+
/* EZIO button status. */
enum btn_status {
BTN_UP = 1 << 0,
/* EZIO button status. */
enum btn_status {
BTN_UP = 1 << 0,
@@
-96,9
+96,8
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
@@
-906,14
+905,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