Debugging yet, but the new server works.

It at least seems to!

1 files changed, 22 insertions, 7 deletions

diff --git a/src/stable/server.h b/src/stable/server.h
index e2b7d53..56ac29a 100644
--- a/src/stable/server.h
+++ b/src/stable/server.h
@@ -10,10 +10,6 @@
 
 #include <stdint.h>
 
-#ifndef WIN32
-    #include <sys/select.h>
-#endif
-
 #include "bu/string.h"
 #include "bu/list.h"
 
@@ -62,6 +58,7 @@ namespace Bu
      */
     class Server
     {
+    friend class ServerInterface;
     public:
         Server( int iIoWorkers=4, int iClientWorkers=8 );
         virtual ~Server();
@@ -90,8 +87,12 @@ namespace Bu
 
         void shutdown();
 
-    private:
+    protected:
+        void clientReadReady( fd iFd );
+        void clientWriteReady( fd iFd );
         void closeClient( fd iSocket );
+
+    private:
         class SrvClientLink : public Bu::ClientLink
         {
         public:
@@ -113,6 +114,19 @@ namespace Bu
             virtual Bu::ClientLink *createLink( Bu::Client *pClient );
         };
 
+        class WriteMonitor : public Bu::Thread
+        {
+        public:
+            WriteMonitor( Server &rSrv );
+            virtual ~WriteMonitor();
+
+        protected:
+            virtual void run();
+
+        private:
+            Server &rSrv;
+        };
+
         class Event
         {
         public:
@@ -168,9 +182,9 @@ namespace Bu
         };
         friend class Bu::Server::ClientWorker;
 
+        class __ServerCore *pCore;
         int nTimeoutSec;
         int nTimeoutUSec;
-        fd_set fdActive;
         typedef Hash<fd,ServerSocket *> SrvHash;
         SrvHash hServers;
         typedef Hash<fd,Client *> ClientHash;
@@ -188,7 +202,8 @@ namespace Bu
         typedef List<ClientWorker *> ClientWorkerList;
         IoWorkerList lIoWorker;
         ClientWorkerList lClientWorker;
-        Bu::CounterEvent evIoCycle;
+        WriteMonitor tMonitorWrite;
+        bool bRunning;
     };
 }