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

[cubemap] / serverpool.h

diff --git a/serverpool.h b/serverpool.h
index 5dee5f778e8a534a720c0683405a8fe6e24b6313..5f5f6f80c03ff7264829cab95d0f42625148811c 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -1,11 +1,17 @@
 #ifndef _SERVERPOOL_H
 #define _SERVERPOOL_H 1
 
-#include "server.h"
-
+#include <stddef.h>
+#include <string>
 #include <vector>
 
+#include "server.h"
+#include "state.pb.h"
+#include "stream.h"
+
 class MarkPool;
+class Server;
+struct ClientStats;
 
 // Provides services such as load-balancing between a number of Server instances.
 class ServerPool {
@@ -13,24 +19,34 @@ public:
        ServerPool(int num_servers);
        ~ServerPool();
 
-       // Accessor. Only to be used in rare situations, really.
-       // The ServerPool retains ownership.
-       Server *get_server(int num) { return &servers[num]; }
+       // Fills streams() and clients().
+       CubemapStateProto serialize();
 
        // Picks a server (round-robin) and allocates the given client to it.
        void add_client(int sock);
        void add_client_from_serialized(const ClientProto &client);
 
-       // Adds the given stream to all the servers.
-       void add_stream(const std::string &stream_id);
-       void add_stream_from_serialized(const StreamProto &stream);
+       // Adds the given stream to all the servers. Returns the stream index.
+       int add_stream(const std::string &url, size_t backlog_size, Stream::Encoding encoding);
+       int add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
+
+       // Returns the stream index for the given URL (e.g. /foo.ts). Returns -1 on failure.
+       int lookup_stream_by_url(const std::string &url) const;
 
        // Adds the given data to all the servers.
-       void set_header(const std::string &stream_id, const std::string &header);
-       void add_data(const std::string &stream_id, const char *data, size_t bytes);
+       void set_header(int stream_index,
+                       const std::string &http_header,
+                       const std::string &stream_header);
+       void add_data(int stream_index, const char *data, size_t bytes);
 
        // Connects the given stream to the given mark pool for all the servers.
-       void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+       void set_mark_pool(int stream_index, MarkPool *mark_pool);
+
+       // Changes the given stream's backlog size on all the servers.
+       void set_backlog_size(int stream_index, size_t new_size);
+
+       // Changes the given stream's encoding type on all the servers.
+       void set_encoding(int stream_index, Stream::Encoding encoding);
 
        // Starts all the servers.
        void run();