X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=d0e3d6a75a705b0ed9a2a16624155b0227800828;hp=c44b81ee357b7ed3e2d6cd629d8690b009334ddd;hb=20e478b83e754fd9b19d58abe79732fa0dd20ffc;hpb=cfe0df3728d8155fb03688f6db69e00971e23685

diff --git a/server.h b/server.h
index c44b81e..d0e3d6a 100644
--- a/server.h
+++ b/server.h
@@ -12,7 +12,16 @@
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
 
+class ClientProto;
+
 struct Client {
+	Client() {}
+	Client(int sock);
+
+	// Serialization/deserialization.
+	Client(const ClientProto &serialized);
+	ClientProto serialize() const;
+
 	// The file descriptor associated with this socket.
 	int sock;
 
@@ -21,13 +30,16 @@ struct Client {
 
 	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
 	// this might not be finished.
-	std::string client_request;
+	std::string request;
 
-#if 0
-	// What stream we're connecting to; parsed from client_request.
+	// What stream we're connecting to; parsed from <request>.
 	// Not relevant for READING_REQUEST.
-	string stream_id;
-#endif
+	std::string stream_id;
+
+	// The header we want to send. This is nominally a copy of Stream::header,
+	// but since that might change on reconnects etc., we keep a local copy here.
+	// Only relevant for SENDING_HEADER; blank otherwise.
+	std::string header;
 
 	// Number of bytes we've sent of the header. Only relevant for SENDING_HEADER.
 	size_t header_bytes_sent;
@@ -54,17 +66,24 @@ public:
 
 	// Start a new thread that handles clients.
 	void run();
+
+	// Stop the thread.
+	void stop();
+
 	void add_client(int sock);
 	void add_stream(const std::string &stream_id);
 	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:
-	void process_client(Client *client);
-	void close_client(Client *client);
+	pthread_t worker_thread;
 
+	// All variables below this line are protected by the mutex.
 	pthread_mutex_t mutex;
 
+	// If the thread should stop or not.
+	bool should_stop;	
+
 	// Map from stream ID to stream.
 	std::map<std::string, Stream> streams;
 
@@ -75,11 +94,33 @@ 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<int> sleeping_clients;
+
 	// Recover the this pointer, and call do_work().
 	static void *do_work_thunk(void *arg);
 
 	// The actual worker thread.
 	void do_work();
+
+	void process_client(Client *client);
+
+	// Close a given client socket, and clean up after it.
+	void close_client(Client *client);
+
+	// Parse the HTTP request, construct the header, and set the client into
+	// the SENDING_HEADER state.
+	void parse_request(Client *client);
+
+	// 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();
 };
 
 #endif  // !defined(_SERVER_H)