X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=f0eb622c5ac2d62a188092448143a2d95fef0974;hp=8d5261f6ca9b42fb84bab11776486cd44a67f125;hb=74cd48ffef90d7d0752e37a4515e4ecfb68f7c9d;hpb=e1722a5c0341fd541ce57f1eed4dc76cbd3efe07

diff --git a/server.h b/server.h
index 8d5261f..f0eb622 100644
--- a/server.h
+++ b/server.h
@@ -1,124 +1,31 @@
 #ifndef _SERVER_H
 #define _SERVER_H 1
 
-#include <stdint.h>
 #include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/epoll.h>
+#include <sys/types.h>
 #include <time.h>
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
+#include "client.h"
+#include "stream.h"
 #include "thread.h"
 
-#define BACKLOG_SIZE 1048576
+class ClientProto;
+struct Stream;
+
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
 
-class ClientProto;
 class CubemapStateProto;
 class MarkPool;
-class Stream;
 class StreamProto;
 
-// Digested statistics for writing to logs etc.
-struct ClientStats {
-	std::string stream_id;
-	std::string remote_addr;
-	time_t connect_time;
-	size_t bytes_sent;
-};
-
-struct Client {
-	Client() {}
-	Client(int sock);
-
-	// Serialization/deserialization.
-	Client(const ClientProto &serialized, Stream *stream);
-	ClientProto serialize() const;
-
-	ClientStats get_stats() const;
-
-	// 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;
-
-	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR };
-	State state;
-
-	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
-	// this might not be finished.
-	std::string request;
-
-	// What stream we're connecting to; parsed from <request>.
-	// Not relevant for READING_REQUEST.
-	std::string stream_id;
-	Stream *stream;
-
-	// 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 or SENDING_ERROR; blank otherwise.
-	std::string header_or_error;
-
-	// Number of bytes we've sent of the header. Only relevant for SENDING_HEADER
-	// or SENDING_ERROR.
-	size_t header_or_error_bytes_sent;
-
-	// Number of bytes we've sent of data. Only relevant for SENDING_DATA.
-	size_t bytes_sent;
-};
-
-struct Stream {
-	Stream(const std::string &stream_id);
-	~Stream();
-
-	// Serialization/deserialization.
-	Stream(const StreamProto &serialized);
-	StreamProto serialize() const;
-
-	std::string stream_id;
-
-	// The HTTP response header, plus the video stream header (if any).
-	std::string header;
-
-	// The stream data itself, stored in a circular buffer.
-	char *data;
-
-	// How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
-	// since the buffer wraps.
-	size_t data_size;
-	
-	// 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<Client *> sleeping_clients;
-
-	// Clients that we recently got data for (when they were in
-	// <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.
-	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();
-
-private:
-	Stream(const Stream& other);
-};
-
 class Server : public Thread {
 public:
 	Server();
@@ -128,29 +35,35 @@ public:
 	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);
+	void set_header(int stream_index,
+	                const std::string &http_header,
+	                const std::string &stream_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);
+	void set_mark_pool(int stream_index, 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.
 	void add_client_deferred(int sock);
-	void add_data_deferred(const std::string &stream_id, const char *data, size_t bytes);
+	void add_data_deferred(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
 
 	// 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);
-	void add_stream(const std::string &stream_id);
-	void add_stream_from_serialized(const StreamProto &stream);
+	int add_stream(const std::string &url, size_t bytes_received, 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_data only. Note that if you want to hold both this
-	// and <mutex> below, you will need to take <mutex> before this one.
+	// Mutex protecting queued_add_clients and streams[..]->queued_data.
+	// 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;
 
 	// Deferred commands that should be run from the do_work() thread as soon as possible.
@@ -164,13 +77,15 @@ private:
 	//	
 	// Protected by <queued_data_mutex>.
 	std::vector<int> queued_add_clients;
-	std::map<std::string, std::string> queued_data;
 
 	// All variables below this line are protected by the mutex.
 	mutable pthread_mutex_t mutex;
 
-	// Map from stream ID to stream.
-	std::map<std::string, Stream *> streams;
+	// All streams.
+	std::vector<Stream *> streams;
+
+	// Map from URL to index into <streams>.
+	std::map<std::string, int> url_map;
 
 	// Map from file descriptor to client.
 	std::map<int, Client> clients;
@@ -211,13 +126,10 @@ private:
 	// the SENDING_ERROR state.
 	void construct_error(Client *client, int error_code);
 
-	// TODO: This function should probably die.
-	Stream *find_stream(const std::string &stream_id);
-
 	void process_queued_data();
+	void skip_lost_data(Client *client);
 
 	void add_client(int sock);
-	void add_data(const std::string &stream_id, const char *data, size_t bytes);
 };
 
 #endif  // !defined(_SERVER_H)