X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=feea863f2a9fa0e8b6340c081ec071e4f5ef3235;hp=f0eb622c5ac2d62a188092448143a2d95fef0974;hb=f9c594b491cdeba531c3ff9329e9f1d5ad344b07;hpb=1c6b126fe95eb0465383ba225da764757eba05c0

diff --git a/server.h b/server.h
index f0eb622..feea863 100644
--- a/server.h
+++ b/server.h
@@ -8,6 +8,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <map>
+#include <queue>
 #include <string>
 #include <vector>
 
@@ -21,9 +22,9 @@ struct Stream;
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
+#define REQUEST_READ_TIMEOUT_SEC 60
 
 class CubemapStateProto;
-class MarkPool;
 class StreamProto;
 
 class Server : public Thread {
@@ -39,9 +40,9 @@ public:
 	                const std::string &http_header,
 	                const std::string &stream_header);
 
-	// Set that the given stream should use the given mark pool from now on.
+	// Set that the given stream should use the given max pacing rate from now on.
 	// NOTE: This should be set before any clients are connected!
-	void set_mark_pool(int stream_index, MarkPool *mark_pool);
+	void set_pacing_rate(int stream_index, uint32_t pacing_rate);
 
 	// These will be deferred until the next time an iteration in do_work() happens,
 	// and the order between them are undefined.
@@ -54,17 +55,17 @@ public:
 	// at the same time).
 	CubemapStateProto serialize();
 	void add_client_from_serialized(const ClientProto &client);
-	int add_stream(const std::string &url, size_t bytes_received, Stream::Encoding encoding);
+	int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding);
 	int add_stream_from_serialized(const StreamProto &stream, int data_fd);
 	int lookup_stream_by_url(const std::string &url) const;
 	void set_backlog_size(int stream_index, size_t new_size);
 	void set_encoding(int stream_index, Stream::Encoding encoding);
 
 private:
-	// Mutex protecting queued_add_clients and streams[..]->queued_data.
+	// 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_data_mutex;
+	mutable pthread_mutex_t queued_clients_mutex;
 
 	// Deferred commands that should be run from the do_work() thread as soon as possible.
 	// We defer these for two reasons:
@@ -75,7 +76,7 @@ private:
 	//    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>.
+	// Protected by <queued_clients_mutex>.
 	std::vector<int> queued_add_clients;
 
 	// All variables below this line are protected by the mutex.
@@ -90,6 +91,19 @@ private:
 	// Map from file descriptor to client.
 	std::map<int, Client> clients;
 
+	// A list of all clients, ordered by the time they connected (first element),
+	// and their file descriptor (second element). It is ordered by connection time
+	// (and thus also by read timeout time) so that we can read clients from the
+	// start and stop processing once we get to one that isn't ready to be
+	// timed out yet (which means we only have to look at each client exactly once,
+	// save for the first element of the queue, which is always checked).
+	//
+	// Note that when we delete a client, we don't update this queue.
+	// 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;
+
 	// Used for epoll implementation (obviously).
 	int epoll_fd;
 	epoll_event events[EPOLL_MAX_EVENTS];