update

[l4.git] / l4 / pkg / io / server / src / server.cc

diff --git a/l4/pkg/io/server/src/server.cc b/l4/pkg/io/server/src/server.cc
index 49fe34d3269f46862c4c7f321cb1997ffaf83bbe..7e54f13ec68f03b6e30a0e69208336ff00f6a725 100644 (file)
--- a/l4/pkg/io/server/src/server.cc
+++ b/l4/pkg/io/server/src/server.cc
@@ -1,5 +1,7 @@
 /*
- * (c) 2010 Technische Universität Dresden
+ * (c) 2010 Alexander Warg <warg@os.inf.tu-dresden.de>
+ *     economic rights: Technische Universität Dresden (Germany)
+ *
  * This file is part of TUD:OS and distributed under the terms of the
  * GNU General Public License 2.
  * Please see the COPYING-GPL-2 file for details.
@@ -11,32 +13,35 @@
 #include <l4/re/error_helper>
 
 #include <l4/cxx/ipc_server>
-#include <l4/cxx/iostream>
-#include <l4/cxx/l4iostream>
+#include <l4/cxx/ipc_timeout_queue>
 
 #include "server.h"
 
-
 L4::Cap<void> rcv_cap = L4Re::Util::cap_alloc.alloc<void>();
 
 class Loop_hooks :
-  public L4::Ipc_svr::Ignore_errors,
-  public L4::Ipc_svr::Default_timeout,
-  public L4::Ipc_svr::Compound_reply
+  public L4::Ipc_svr::Timeout_queue_hooks<Loop_hooks>,
+  public L4::Ipc_svr::Ignore_errors
 {
 public:
-  static void setup_wait(L4::Ipc_istream &istr, bool)
+  static l4_kernel_clock_t now()
+  { return l4_kip_clock(l4re_kip()); }
+
+  static int timeout_br() { return 8; }
+
+  void setup_wait(L4::Ipc::Istream &istr, L4::Ipc_svr::Reply_mode mode)
   {
+    L4::Ipc_svr::Timeout_queue_hooks<Loop_hooks>::setup_wait(istr, mode);
     istr.reset();
-    istr << L4::Small_buf(rcv_cap.cap(), L4_RCV_ITEM_LOCAL_ID);
+    istr << L4::Ipc::Small_buf(rcv_cap.cap(), L4_RCV_ITEM_LOCAL_ID);
     l4_utcb_br()->bdr = 0;
   }
-
 };
 
 static L4Re::Util::Registry_server<Loop_hooks> server;
 
 L4Re::Util::Object_registry *registry = server.registry();
+L4::Ipc_svr::Timeout_queue *timeouts = &server.queue;
 
 int server_loop()
 {