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 93ec1c28056e4bb2ba0b3a3f9a61edccb97ba14d..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.
@@
-26,8
+26,8
@@
#include <stdlib.h>
#include <term.h>
#include <unistd.h>
#include <stdlib.h>
#include <term.h>
#include <unistd.h>
+#include "byteq.h"
#include "command-line.h"
#include "command-line.h"
-#include "extras/ezio/byteq.h"
#include "extras/ezio/tty.h"
#include "extras/ezio/vt.h"
#include "daemon.h"
#include "extras/ezio/tty.h"
#include "extras/ezio/vt.h"
#include "daemon.h"
@@
-96,8
+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);
vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
@@
-106,7
+106,7
@@
main(int argc, char *argv[])
argv += optind;
/* Make sure that the ezio3 terminfo entry is available. */
argv += optind;
/* Make sure that the ezio3 terminfo entry is available. */
- dummy_fd =
open("/dev/null", O_RDWR
);
+ dummy_fd =
get_null_fd(
);
if (dummy_fd >= 0) {
if (setupterm("ezio3", dummy_fd, &retval) == ERR) {
if (retval == 0) {
if (dummy_fd >= 0) {
if (setupterm("ezio3", dummy_fd, &retval) == ERR) {
if (retval == 0) {
@@
-118,9
+118,6
@@
main(int argc, char *argv[])
}
}
del_curterm(cur_term);
}
}
del_curterm(cur_term);
- close(dummy_fd);
- } else {
- ovs_error(errno, "failed to open /dev/null");
}
/* Lock serial port. */
}
/* Lock serial port. */
@@
-909,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