projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Remove unused and write-only members of 'struct bridge'.
[openvswitch]
/
extras
/
ezio
/
ezio-term.c
diff --git
a/extras/ezio/ezio-term.c
b/extras/ezio/ezio-term.c
index 846ccfded7cfffce0904e05f094b05e2f8663eec..d96122bc8d86d343492af4d207d259239529b013 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,6
+96,7
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
time_init();
vlog_init();
set_program_name(argv[0]);
time_init();
vlog_init();
@@
-906,14
+907,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