X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpoll-loop.h;h=65a2ff0374205a975e39239cac3823efbe3df486;hb=16472256190e083258bfcf6a4ba4f74cb412fcd4;hp=341d063b5f72c67d5b206298ae6d9477baac33d6;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch

diff --git a/lib/poll-loop.h b/lib/poll-loop.h
index 341d063b..65a2ff03 100644
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,34 +22,33 @@
  * calls one (or more) of the functions poll_fd_wait(), poll_immediate_wake(),
  * and poll_timer_wait() to register to be awakened when the appropriate event
  * occurs.  Then the main loop calls poll_block(), which blocks until one of
- * the registered events happens.
- *
- * There is also some support for autonomous subroutines that are executed by
- * poll_block() when a file descriptor becomes ready.  To prevent these
- * routines from starving if events are continuously ready, the application
- * should bound the amount of work it does between poll_block() calls. */
+ * the registered events happens. */
 
 #ifndef POLL_LOOP_H
 #define POLL_LOOP_H 1
 
 #include <poll.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct poll_waiter;
 
 /* Schedule events to wake up the following poll_block(). */
 struct poll_waiter *poll_fd_wait(int fd, short int events);
-void poll_timer_wait(int msec);
+void poll_timer_wait(long long int msec);
+void poll_timer_wait_until(long long int msec);
 void poll_immediate_wake(void);
 
 /* Wait until an event occurs. */
 void poll_block(void);
 
-/* Autonomous function callbacks. */
-typedef void poll_fd_func(int fd, short int revents, void *aux);
-struct poll_waiter *poll_fd_callback(int fd, short int events,
-                                     poll_fd_func *, void *aux);
-
 /* Cancel a file descriptor callback or event. */
 void poll_cancel(struct poll_waiter *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* poll-loop.h */