X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FTCPClientServer%2Fserver.cc;h=40e3139bf2131bc21da9f976b81bc5d2589641dd;hb=99c145da3884f5c20a74337927ef2cbc073d80d7;hp=93fb1baf05b6f1ad177e7c8e705192fc08548992;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Examples/TCPClientServer/server.cc b/Examples/TCPClientServer/server.cc
index 93fb1ba..40e3139 100644
--- a/Examples/TCPClientServer/server.cc
+++ b/Examples/TCPClientServer/server.cc
@@ -35,34 +35,37 @@
 class Server
 {
     senf::TCPv4ServerSocketHandle serverSock;
+    senf::scheduler::FdEvent acceptevent;
+    senf::scheduler::FdEvent readevent;
 
 public:
     Server(senf::INet4Address const & host, unsigned int port)
-        : serverSock(senf::INet4SocketAddress(host, port)) {}
+        : serverSock(senf::INet4SocketAddress(host, port)),
+          acceptevent("Server accept", senf::membind(&Server::accept, this),
+                      serverSock, senf::scheduler::FdEvent::EV_READ),
+          readevent("Server read", 0)
+        {}
 
     void run()
     {
-        senf::Scheduler::instance().add(
-            serverSock,
-            senf::membind(&Server::accept, this),
-            senf::Scheduler::EV_READ);
-        senf::Scheduler::instance().process();
+        senf::scheduler::process();
     }
 
 private:
-    void accept(senf::Scheduler::EventId event)
+    void accept(int event)
     {
         senf::TCPv4ClientSocketHandle clientSock (serverSock.accept());
-        senf::Scheduler::instance().add(
-            clientSock,
-            boost::bind(&Server::readFromClient, this, clientSock, _1),
-            senf::Scheduler::EV_READ);
+        readevent
+            .action(boost::bind(&Server::readFromClient, this, clientSock, _1))
+            .handle(clientSock)
+            .events(senf::scheduler::FdEvent::EV_READ)
+            .enable();
     }
 
-    void readFromClient(senf::TCPv4ClientSocketHandle clientSock, senf::Scheduler::EventId event)
+    void readFromClient(senf::TCPv4ClientSocketHandle clientSock, int event)
     {
         if (!clientSock) {
-            senf::Scheduler::instance().remove(clientSock);
+            readevent.disable();
             return;
         }
         std::string data (clientSock.read());