X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=49f9d51badedd68c02ae2e7436b6807f1eccb060;hp=523f5c55f376eed2ca9becf25a15c60a9172ba70;hb=6889a665614e926437484a556124a5ff60363568;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7

diff --git a/server.h b/server.h
index 523f5c5..49f9d51 100644
--- a/server.h
+++ b/server.h
@@ -23,7 +23,6 @@ struct Stream;
 #define MAX_CLIENT_REQUEST 16384
 
 class CubemapStateProto;
-class MarkPool;
 class StreamProto;
 
 class Server : public Thread {
@@ -35,34 +34,36 @@ public:
 	std::vector<ClientStats> get_client_stats() const;
 
 	// Set header (both HTTP header and any stream headers) for the given stream.
-	void set_header(const std::string &stream_id,
+	void set_header(int stream_index,
 	                const std::string &http_header,
 	                const std::string &stream_header);
 
-	// Set that the given stream should use the given mark pool from now on.
+	// Set that the given stream should use the given max pacing rate from now on.
 	// NOTE: This should be set before any clients are connected!
-	void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+	void set_pacing_rate(int stream_index, uint32_t pacing_rate);
 
 	// These will be deferred until the next time an iteration in do_work() happens,
 	// and the order between them are undefined.
 	// XXX: header should ideally be ordered with respect to data.
 	void add_client_deferred(int sock);
-	void add_data_deferred(const std::string &stream_id, const char *data, size_t bytes);
+	void add_data_deferred(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
 
 	// These should not be called while running, since that would violate
 	// threading assumptions (ie., that epoll is only called from one thread
 	// at the same time).
 	CubemapStateProto serialize();
 	void add_client_from_serialized(const ClientProto &client);
-	void add_stream(const std::string &stream_id, size_t bytes_received, Stream::Encoding encoding);
-	void add_stream_from_serialized(const StreamProto &stream);
-	void set_backlog_size(const std::string &stream_id, size_t new_size);
-	void set_encoding(const std::string &stream_id, Stream::Encoding encoding);
+	int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding);
+	int add_stream_from_serialized(const StreamProto &stream, int data_fd);
+	int lookup_stream_by_url(const std::string &url) const;
+	void set_backlog_size(int stream_index, size_t new_size);
+	void set_encoding(int stream_index, Stream::Encoding encoding);
 
 private:
-	// Mutex protecting queued_data only. Note that if you want to hold both this
-	// and <mutex> below, you will need to take <mutex> before this one.
-	mutable pthread_mutex_t queued_data_mutex;
+	// Mutex protecting queued_add_clients.
+	// Note that if you want to hold both this and <mutex> below,
+	// you will need to take <mutex> before this one.
+	mutable pthread_mutex_t queued_clients_mutex;
 
 	// Deferred commands that should be run from the do_work() thread as soon as possible.
 	// We defer these for two reasons:
@@ -73,15 +74,17 @@ private:
 	//    add_data(), since they want to do add_data() rather often, and <mutex>
 	//    can be taken a lot of the time.
 	//	
-	// Protected by <queued_data_mutex>.
+	// Protected by <queued_clients_mutex>.
 	std::vector<int> queued_add_clients;
-	std::map<std::string, std::string> queued_data;
 
 	// All variables below this line are protected by the mutex.
 	mutable pthread_mutex_t mutex;
 
-	// Map from stream ID to stream.
-	std::map<std::string, Stream *> streams;
+	// All streams.
+	std::vector<Stream *> streams;
+
+	// Map from URL to index into <streams>.
+	std::map<std::string, int> url_map;
 
 	// Map from file descriptor to client.
 	std::map<int, Client> clients;
@@ -122,10 +125,8 @@ private:
 	// the SENDING_ERROR state.
 	void construct_error(Client *client, int error_code);
 
-	// TODO: This function should probably die.
-	Stream *find_stream(const std::string &stream_id);
-
 	void process_queued_data();
+	void skip_lost_data(Client *client);
 
 	void add_client(int sock);
 };