Make backlog_size changeable across HUPs.

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index dfd5b97dffb4e67c38c8a585df77269686e873a1..2c8661ab87395164033588669fac728f515ba556 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -194,6 +194,13 @@ void Server::add_stream_from_serialized(const StreamProto &stream)
        streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
 }
        
+void Server::set_backlog_size(const std::string &stream_id, size_t new_size)
+{
+       MutexLock lock(&mutex);
+       assert(streams.count(stream_id) != 0);
+       streams[stream_id]->set_backlog_size(new_size);
+}
+       
 void Server::set_header(const string &stream_id, const string &header)
 {
        MutexLock lock(&mutex);
@@ -225,50 +232,6 @@ void Server::add_data_deferred(const string &stream_id, const char *data, size_t
        queued_data[stream_id].append(string(data, data + bytes));
 }
 
-void Server::add_data(const string &stream_id, const char *data, ssize_t bytes)
-{
-       Stream *stream = find_stream(stream_id);
-       size_t pos = stream->bytes_received % stream->backlog_size;
-       stream->bytes_received += bytes;
-
-       if (pos + bytes > stream->backlog_size) {
-               ssize_t to_copy = stream->backlog_size - pos;
-               while (to_copy > 0) {
-                       int ret = pwrite(stream->data_fd, data, to_copy, pos);
-                       if (ret == -1 && errno == EINTR) {
-                               continue;
-                       }
-                       if (ret == -1) {
-                               perror("pwrite");
-                               // Dazed and confused, but trying to continue...
-                               break;
-                       }
-                       pos += ret;
-                       data += ret;
-                       to_copy -= ret;
-                       bytes -= ret;
-               }
-               pos = 0;
-       }
-
-       while (bytes > 0) {
-               int ret = pwrite(stream->data_fd, data, bytes, pos);
-               if (ret == -1 && errno == EINTR) {
-                       continue;
-               }
-               if (ret == -1) {
-                       perror("pwrite");
-                       // Dazed and confused, but trying to continue...
-                       break;
-               }
-               pos += ret;
-               data += ret;
-               bytes -= ret;
-       }
-
-       stream->wake_up_all_clients();
-}
-
 // See the .h file for postconditions after this function.     
 void Server::process_client(Client *client)
 {
@@ -569,7 +532,9 @@ void Server::process_queued_data()
        for (map<string, string>::iterator queued_it = queued_data.begin();
             queued_it != queued_data.end();
             ++queued_it) {
-               add_data(queued_it->first, queued_it->second.data(), queued_it->second.size());
+               Stream *stream = find_stream(queued_it->first);
+               stream->add_data(queued_it->second.data(), queued_it->second.size());
+               stream->wake_up_all_clients();
        }
        queued_data.clear();
 }