Make most operations on Server deferred, so that we a) do not get bugs with epoll...

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index f8fece60a43c0a17d303c74dbd48e9e5a986d695..a2035943d429a53e1c621ab6c773b08fdac56994 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -16,7 +16,7 @@ ServerPool::~ServerPool()
 
 void ServerPool::add_client(int sock)
 {
-       servers[clients_added++ % num_servers].add_client(sock);
+       servers[clients_added++ % num_servers].add_client_deferred(sock);
 }
 
 void ServerPool::add_client_from_serialized(const ClientProto &client)
@@ -48,7 +48,7 @@ void ServerPool::set_header(const std::string &stream_id, const std::string &hea
 void ServerPool::add_data(const std::string &stream_id, const char *data, size_t bytes)
 {
        for (int i = 0; i < num_servers; ++i) {
-               servers[i].add_data(stream_id, data, bytes);
+               servers[i].add_data_deferred(stream_id, data, bytes);
        }
 }