X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=2fe4f15184a62699c6bcb8c89606ffa95f9559e8;hp=40e9f7575b708e8d3dc5f9f83268ff7793f6cc04;hb=061988af511f42da3cd584b4d983177504ddc177;hpb=a0629a862bbac969ff858d8b4c3e78bd299aa721

diff --git a/server.h b/server.h
index 40e9f75..2fe4f15 100644
--- a/server.h
+++ b/server.h
@@ -1,13 +1,14 @@
 #ifndef _SERVER_H
 #define _SERVER_H 1
 
-#include <pthread.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/epoll.h>
 #include <sys/types.h>
 #include <time.h>
 #include <map>
+#include <memory>
+#include <mutex>
 #include <queue>
 #include <string>
 #include <vector>
@@ -56,8 +57,8 @@ public:
 	// 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);
+	CubemapStateProto serialize(std::unordered_map<const std::string *, size_t> *short_response_pool);
+	void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
 	int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
 	int add_stream_from_serialized(const StreamProto &stream, int data_fd);
 	int lookup_stream_by_url(const std::string &url) const;
@@ -70,27 +71,27 @@ public:
 
 private:
 	// 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;
+	// Note that if you want to hold both this and <mu> below,
+	// you will need to take <mu> before this one.
+	mutable std::mutex queued_clients_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>
+	//  - We don't want the input thread(s) hanging on <mu> when doing
+	//    add_data(), since they want to do add_data() rather often, and <mu>
 	//    can be taken a lot of the time.
 	//	
 	// Protected by <queued_clients_mutex>.
 	std::vector<std::pair<int, Acceptor *>> queued_add_clients;
 
 	// All variables below this line are protected by the mutex.
-	mutable pthread_mutex_t mutex;
+	mutable std::mutex mu;
 
 	// All streams.
-	std::vector<Stream *> streams;
+	std::vector<std::unique_ptr<Stream>> streams;
 
 	// Map from URL to index into <streams>.
 	std::map<std::string, int> stream_url_map;
@@ -161,6 +162,11 @@ private:
 	// Listen for a different set of epoll events.
 	void change_epoll_events(Client *client, uint32_t events);
 
+	// If we're supposed to listen for more requests (persistent HTTP connections),
+	// puts the client back into READING_REQUEST, changes its epoll flags and returns
+	// true.
+	bool more_requests(Client *client);
+
 	// Parse the HTTP request. Returns a HTTP status code (200/204/400/404).
 	int parse_request(Client *client);