X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=8d5261f6ca9b42fb84bab11776486cd44a67f125;hp=300ec0d41115f53640068691947481cc24f44c45;hb=3fdf2e48bca3edcb0de00e0dbd0d0aae81ba9aa9;hpb=019b96a9cc6fa2902690e98a2aa033517efef3ed

diff --git a/server.h b/server.h
index 300ec0d..8d5261f 100644
--- a/server.h
+++ b/server.h
@@ -9,6 +9,8 @@
 #include <map>
 #include <vector>
 
+#include "thread.h"
+
 #define BACKLOG_SIZE 1048576
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
@@ -16,6 +18,7 @@
 
 class ClientProto;
 class CubemapStateProto;
+class MarkPool;
 class Stream;
 class StreamProto;
 
@@ -40,6 +43,9 @@ struct Client {
 	// The file descriptor associated with this socket.
 	int sock;
 
+	// The fwmark associated with this socket (or 0).
+	int fwmark;
+
 	// Some information only used for logging.
 	std::string remote_addr;
 	time_t connect_time;
@@ -98,6 +104,9 @@ struct Stream {
 	// <sleeping_clients>).
 	std::vector<Client *> to_process;
 
+	// What pool to fetch marks from, or NULL.
+	MarkPool *mark_pool;
+
 	// 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.
@@ -110,23 +119,21 @@ private:
 	Stream(const Stream& other);
 };
 
-class Server {
+class Server : public Thread {
 public:
 	Server();
 	~Server();
 
-	// Start a new thread that handles clients.
-	void run();
-
-	// Stop the thread.
-	void stop();
-	
 	// Get the list of all currently connected clients.	
 	std::vector<ClientStats> get_client_stats() 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);
 
+	// Set that the given stream should use the given mark pool from now on.
+	// NOTE: This should be set before any clients are connected!
+	void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+
 	// 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.
@@ -142,8 +149,6 @@ public:
 	void add_stream_from_serialized(const StreamProto &stream);
 
 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.
 	mutable pthread_mutex_t queued_data_mutex;
@@ -164,9 +169,6 @@ private:
 	// All variables below this line are protected by the mutex.
 	mutable 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;
 
@@ -177,11 +179,8 @@ private:
 	int epoll_fd;
 	epoll_event events[EPOLL_MAX_EVENTS];
 
-	// Recover the this pointer, and call do_work().
-	static void *do_work_thunk(void *arg);
-
 	// The actual worker thread.
-	void do_work();
+	virtual void do_work();
 
 	// Process a client; read and write data as far as we can.
 	// After this call, one of these four is true: