X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.h;h=9a8e171e36ff620637695bf99e6a980a2d5f41a9;hp=c22fb67462644f053da8ca0170fc21afebd1c931;hb=8cdf715a5a6320a0b8c1152a28c40bc0dd86676b;hpb=462cb16514a2b691ae4d4b76125b42fda83df712

diff --git a/serverpool.h b/serverpool.h
index c22fb67..9a8e171 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -1,11 +1,20 @@
 #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"
+#include "udpstream.h"
+
 class MarkPool;
+class Server;
+class UDPStream;
+struct ClientStats;
+struct sockaddr_in6;
 
 // Provides services such as load-balancing between a number of Server instances.
 class ServerPool {
@@ -13,34 +22,55 @@ 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);
+	int add_udpstream(const sockaddr_in6 &dst, MarkPool *mark_pool);
+
+	// 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();
 
+	// Stops all the servers.
+	void stop();
+
 	std::vector<ClientStats> get_client_stats() const;
 
 private:
 	Server *servers;
 	int num_servers, clients_added;
 
+	// Our indexing is currently rather primitive; every stream_index in
+	// [0, num_http_streams) maps to a HTTP stream (of which every Server
+	// has exactly one copy), and after that, it's mapping directly into
+	// <udp_streams>.
+	int num_http_streams;
+	std::vector<UDPStream *> udp_streams;
+
 	ServerPool(const ServerPool &);
 };