X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=4b3aab8e9b7250eb47e634805f1978c5a4071ce2;hp=476e790dbb73b0d1f439d1663a290e0a811b113b;hb=d19e6c3ed8e85f5a39793903114d4de38b5a1609;hpb=9abb89bcf7940e2ada9d708f86a218a56334f68d

diff --git a/server.h b/server.h
index 476e790..4b3aab8 100644
--- a/server.h
+++ b/server.h
@@ -47,7 +47,7 @@ public:
 	// 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(int stream_index, 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
@@ -61,10 +61,10 @@ public:
 	void set_encoding(int stream_index, Stream::Encoding encoding);
 
 private:
-	// Mutex protecting queued_add_clients and streams[..]->queued_data.
+	// 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_data_mutex;
+	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:
@@ -75,7 +75,7 @@ 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;
 
 	// All variables below this line are protected by the mutex.
@@ -127,6 +127,7 @@ private:
 	void construct_error(Client *client, int error_code);
 
 	void process_queued_data();
+	void skip_lost_data(Client *client);
 
 	void add_client(int sock);
 };