Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index e309ab99cecdae61b27faa77c55b5184ba473f4a..fb8ca451d38cf1c10f8ab30268ffc71c9ff85a9e 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -61,17 +61,32 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
        servers[clients_added++ % num_servers].add_client_from_serialized(client);
 }
 
        servers[clients_added++ % num_servers].add_client_from_serialized(client);
 }
 

-void ServerPool::add_stream(const string &stream_id, size_t backlog_size, Stream::Encoding encoding)
+int ServerPool::lookup_stream_by_url(const std::string &url) const

 {
 {

+       assert(servers != NULL);
+       return servers[0].lookup_stream_by_url(url);
+}
+
+int ServerPool::add_stream(const string &url, size_t backlog_size, Stream::Encoding encoding)
+{
+       int stream_index = -1;

        for (int i = 0; i < num_servers; ++i) {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].add_stream(stream_id, backlog_size, encoding);
+               int stream_index2 = servers[i].add_stream(url, backlog_size, encoding);
+               if (i == 0) {
+                       stream_index = stream_index2;
+               } else {
+                       // Verify that all servers have this under the same stream index.
+                       assert(stream_index == stream_index2);
+               }

        }
        }

+       return stream_index;

 }
 
 }
 

-void ServerPool::add_stream_from_serialized(const StreamProto &stream, const vector<int> &data_fds)
+int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vector<int> &data_fds)

 {
        assert(!data_fds.empty());
        string contents;
 {
        assert(!data_fds.empty());
        string contents;

+       int stream_index = -1;

        for (int i = 0; i < num_servers; ++i) {
                int data_fd;
                if (i < int(data_fds.size())) {
        for (int i = 0; i < num_servers; ++i) {
                int data_fd;
                if (i < int(data_fds.size())) {


@@ -87,26 +102,34 @@ void ServerPool::add_stream_from_serialized(const StreamProto &stream, const vec
                        data_fd = make_tempfile(contents);
                }
 
                        data_fd = make_tempfile(contents);
                }
 

-               servers[i].add_stream_from_serialized(stream, data_fd);
+               int stream_index2 = servers[i].add_stream_from_serialized(stream, data_fd);
+               if (i == 0) {
+                       stream_index = stream_index2;
+               } else {
+                       // Verify that all servers have this under the same stream index.
+                       assert(stream_index == stream_index2);
+               }

        }
 
        // Close and delete any leftovers, if the number of servers was reduced.
        for (size_t i = num_servers; i < data_fds.size(); ++i) {
                safe_close(data_fds[i]);  // Implicitly deletes the file.
        }
        }
 
        // Close and delete any leftovers, if the number of servers was reduced.
        for (size_t i = num_servers; i < data_fds.size(); ++i) {
                safe_close(data_fds[i]);  // Implicitly deletes the file.
        }

+
+       return stream_index;

 }
 
 }
 

-void ServerPool::set_header(const string &stream_id, const string &http_header, const string &stream_header)
+void ServerPool::set_header(int stream_index, const string &http_header, const string &stream_header)

 {
        for (int i = 0; i < num_servers; ++i) {
 {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].set_header(stream_id, http_header, stream_header);
+               servers[i].set_header(stream_index, http_header, stream_header);

        }
 }
 
        }
 }
 

-void ServerPool::add_data(const string &stream_id, const char *data, size_t bytes)
+void ServerPool::add_data(int stream_index, const char *data, size_t bytes)

 {
        for (int i = 0; i < num_servers; ++i) {
 {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].add_data_deferred(stream_id, data, bytes);
+               servers[i].add_data_deferred(stream_index, data, bytes);

        }
 }
 
        }
 }
 


@@ -134,23 +157,23 @@ vector<ClientStats> ServerPool::get_client_stats() const
        return ret;
 }
        
        return ret;
 }
        

-void ServerPool::set_mark_pool(const string &stream_id, MarkPool *mark_pool)
+void ServerPool::set_mark_pool(int stream_index, MarkPool *mark_pool)

 {
        for (int i = 0; i < num_servers; ++i) {
 {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].set_mark_pool(stream_id, mark_pool);
+               servers[i].set_mark_pool(stream_index, mark_pool);

        }       
 }
 
        }       
 }
 

-void ServerPool::set_backlog_size(const string &stream_id, size_t new_size)
+void ServerPool::set_backlog_size(int stream_index, size_t new_size)

 {
        for (int i = 0; i < num_servers; ++i) {
 {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].set_backlog_size(stream_id, new_size);
+               servers[i].set_backlog_size(stream_index, new_size);

        }       
 }
 
        }       
 }
 

-void ServerPool::set_encoding(const string &stream_id, Stream::Encoding encoding)
+void ServerPool::set_encoding(int stream_index, Stream::Encoding encoding)

 {
        for (int i = 0; i < num_servers; ++i) {
 {
        for (int i = 0; i < num_servers; ++i) {

-               servers[i].set_encoding(stream_id, encoding);
+               servers[i].set_encoding(stream_index, encoding);

        }       
 }
        }       
 }