X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=5ebc060e10924e88c675f695fe6caefcb8cd520b;hp=fd309f41e34e1b97434f5af0071f9a47e4ad6690;hb=9b565a9e6e66f076abb7266b2c2f015f585fa9cb;hpb=a0ad2d9d955fcb5f0aa3cf4f89999c34e8408124

diff --git a/server.h b/server.h
index fd309f4..5ebc060 100644
--- a/server.h
+++ b/server.h
@@ -73,6 +73,23 @@ struct Stream {
 	// How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
 	// since the buffer wraps.
 	size_t data_size;
+	
+	// Clients that are in SENDING_DATA, but that we don't listen on,
+	// because we currently don't have any data for them.
+	// See put_client_to_sleep() and wake_up_all_clients().
+	std::vector<Client *> sleeping_clients;
+
+	// Clients that we recently got data for (when they were in
+	// <sleeping_clients>).
+	std::vector<Client *> to_process;
+
+	// Put client to sleep, since there is no more data for it; we will on
+	// longer listen on POLLOUT until we get more data. Also, it will be put
+	// in the list of clients to wake up when we do.
+	void put_client_to_sleep(Client *client);
+
+	// We have more data, so mark all clients that are sleeping as ready to go.
+	void wake_up_all_clients();
 
 private:
 	Stream(const Stream& other);
@@ -89,20 +106,43 @@ public:
 	// Stop the thread.
 	void stop();
 
-	CubemapStateProto serialize() const;
+	// Set header (both HTTP header and any stream headers) for the given stream.
+	void set_header(const std::string &stream_id, const std::string &header);
 
-	void add_client(int sock);
-	void add_client_from_serialized(const ClientProto &client);
+	// 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);
 
+	// 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);
 	void add_stream_from_serialized(const StreamProto &stream);
 
-	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);
-
 private:
 	pthread_t worker_thread;
 
+	// 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.
+	pthread_mutex_t queued_data_mutex;
+
+	// Deferred commands that should be run from the do_work() thread as soon as possible.
+	// We defer these for two reasons:
+	//
+	//  - We only want to fiddle with epoll from one thread at any given time,
+	//    and doing add_client() from the acceptor thread would violate that.
+	//  - We don't want the input thread(s) hanging on <mutex> when doing
+	//    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>.
+	std::vector<int> queued_add_clients;
+	std::map<std::string, std::string> queued_data;
+
 	// All variables below this line are protected by the mutex.
 	pthread_mutex_t mutex;
 
@@ -119,11 +159,6 @@ private:
 	int epoll_fd;
 	epoll_event events[EPOLL_MAX_EVENTS];
 
-	// Clients that are in SENDING_DATA, but that we don't listen on,
-	// because we currently don't have any data for them.
-	// See put_client_to_sleep() and wake_up_all_clients().
-	std::vector<Client *> sleeping_clients;
-
 	// Recover the this pointer, and call do_work().
 	static void *do_work_thunk(void *arg);
 
@@ -159,16 +194,13 @@ private:
 	// the SENDING_ERROR state.
 	void construct_error(Client *client, int error_code);
 
-	// Put client to sleep, since there is no more data for it; we will on
-	// longer listen on POLLOUT until we get more data. Also, it will be put
-	// in the list of clients to wake up when we do.
-	void put_client_to_sleep(Client *client);
-
-	// We have more data, so mark all clients that are sleeping as ready to go.
-	void wake_up_all_clients();
-
 	// TODO: This function should probably die.
 	Stream *find_stream(const std::string &stream_id);
+
+	void process_queued_data();
+
+	void add_client(int sock);
+	void add_data(const std::string &stream_id, const char *data, size_t bytes);
 };
 
 #endif  // !defined(_SERVER_H)