diff options
Diffstat (limited to '')
-rw-r--r-- | src/stable/server.h | 12 |
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 @@ | |||
22 | #include "bu/hash.h" | 22 | #include "bu/hash.h" |
23 | #include "bu/synchroqueue.h" | 23 | #include "bu/synchroqueue.h" |
24 | #include "bu/thread.h" | 24 | #include "bu/thread.h" |
25 | #include "bu/counterevent.h" | ||
25 | 26 | ||
26 | #include "bu/config.h" | 27 | #include "bu/config.h" |
27 | 28 | ||
@@ -137,8 +138,7 @@ namespace Bu | |||
137 | class IoWorker : public Bu::Thread | 138 | class IoWorker : public Bu::Thread |
138 | { | 139 | { |
139 | public: | 140 | public: |
140 | IoWorker( Server &rSrv, EventQueue &qIoEvent, | 141 | IoWorker( Server &rSrv ); |
141 | EventQueue &qClientEvent ); | ||
142 | virtual ~IoWorker(); | 142 | virtual ~IoWorker(); |
143 | 143 | ||
144 | protected: | 144 | protected: |
@@ -151,14 +151,13 @@ namespace Bu | |||
151 | 151 | ||
152 | private: | 152 | private: |
153 | Server &rSrv; | 153 | Server &rSrv; |
154 | EventQueue &qIoEvent; | ||
155 | EventQueue &qClientEvent; | ||
156 | }; | 154 | }; |
155 | friend class Bu::Server::IoWorker; | ||
157 | 156 | ||
158 | class ClientWorker : public Bu::Thread | 157 | class ClientWorker : public Bu::Thread |
159 | { | 158 | { |
160 | public: | 159 | public: |
161 | ClientWorker( Server &rSrv, EventQueue &qEvent ); | 160 | ClientWorker( Server &rSrv ); |
162 | virtual ~ClientWorker(); | 161 | virtual ~ClientWorker(); |
163 | 162 | ||
164 | protected: | 163 | protected: |
@@ -166,8 +165,8 @@ namespace Bu | |||
166 | 165 | ||
167 | private: | 166 | private: |
168 | Server &rSrv; | 167 | Server &rSrv; |
169 | EventQueue &qEvent; | ||
170 | }; | 168 | }; |
169 | friend class Bu::Server::ClientWorker; | ||
171 | 170 | ||
172 | int nTimeoutSec; | 171 | int nTimeoutSec; |
173 | int nTimeoutUSec; | 172 | int nTimeoutUSec; |
@@ -189,6 +188,7 @@ namespace Bu | |||
189 | typedef List<ClientWorker *> ClientWorkerList; | 188 | typedef List<ClientWorker *> ClientWorkerList; |
190 | IoWorkerList lIoWorker; | 189 | IoWorkerList lIoWorker; |
191 | ClientWorkerList lClientWorker; | 190 | ClientWorkerList lClientWorker; |
191 | Bu::CounterEvent evIoCycle; | ||
192 | }; | 192 | }; |
193 | } | 193 | } |
194 | 194 | ||