X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=6007626dd57d5e14953b4f9b905e94fbc08d74c9;hp=1e6f44a57eb8e7a07382c1e7b473db80f97899aa;hb=c039416ed5102c0c37298334bc009dc891038db9;hpb=24c4b8ed26779f3316a97191c037342561932ed9

diff --git a/server.h b/server.h
index 1e6f44a..6007626 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>
@@ -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;
+	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;
@@ -112,7 +113,7 @@ private:
 	// This means that when reading it, we need to check if the client it
 	// describes is still exists (ie., that the fd still exists, and that
 	// the timespec matches).
-	std::queue<std::pair<timespec, int> > clients_ordered_by_connect_time;
+	std::queue<std::pair<timespec, int>> clients_ordered_by_connect_time;
 
 	// Used for epoll implementation (obviously).
 	int epoll_fd;
@@ -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);