Many bugfixes. It's almost working!

1 files changed, 6 insertions, 6 deletions

diff --git a/src/stable/server.h b/src/stable/server.h
index d66d9d5..e2b7d53 100644
--- a/src/stable/server.h
+++ b/src/stable/server.h
@@ -22,6 +22,7 @@
 #include "bu/hash.h"
 #include "bu/synchroqueue.h"
 #include "bu/thread.h"
+#include "bu/counterevent.h"
 
 #include "bu/config.h"
 
@@ -137,8 +138,7 @@ namespace Bu
         class IoWorker : public Bu::Thread
         {
         public:
-            IoWorker( Server &rSrv, EventQueue &qIoEvent,
-                    EventQueue &qClientEvent );
+            IoWorker( Server &rSrv );
             virtual ~IoWorker();
 
         protected:
@@ -151,14 +151,13 @@ namespace Bu
 
         private:
             Server &rSrv;
-            EventQueue &qIoEvent;
-            EventQueue &qClientEvent;
         };
+        friend class Bu::Server::IoWorker;
 
         class ClientWorker : public Bu::Thread
         {
         public:
-            ClientWorker( Server &rSrv, EventQueue &qEvent );
+            ClientWorker( Server &rSrv );
             virtual ~ClientWorker();
 
         protected:
@@ -166,8 +165,8 @@ namespace Bu
 
         private:
             Server &rSrv;
-            EventQueue &qEvent;
         };
+        friend class Bu::Server::ClientWorker;
 
         int nTimeoutSec;
         int nTimeoutUSec;
@@ -189,6 +188,7 @@ namespace Bu
         typedef List<ClientWorker *> ClientWorkerList;
         IoWorkerList lIoWorker;
         ClientWorkerList lClientWorker;
+        Bu::CounterEvent evIoCycle;
     };
 }