X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=94fdb67e735e996c46f8c0472f570366bd97a556;hp=e9b74315f1b3d5fdd6227d67c2c4160ccf89be58;hb=ae994771c0747d43bd1ed422224f4caacb95ca9f;hpb=c5cdeee3a4c99abbf7303b47634b0a748e50bcb4

diff --git a/server.h b/server.h
index e9b7431..94fdb67 100644
--- a/server.h
+++ b/server.h
@@ -1,131 +1,30 @@
 #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 "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();
-
-	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.q
-	//
-	// We store our data in a file, so that we can send the data to the
-	// kernel only once (with write()). We then use sendfile() for each
-	// client, which effectively zero-copies it out of the kernel's buffer
-	// cache. This is significantly more efficient than doing write() from
-	// a userspace memory buffer, since the latter makes the kernel copy
-	// the same data from userspace many times.
-	int data_fd;
-
-	// 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();
@@ -152,7 +51,7 @@ public:
 	// 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(const std::string &stream_id, size_t bytes_received);
 	void add_stream_from_serialized(const StreamProto &stream);
 
 private:
@@ -224,7 +123,6 @@ private:
 	void process_queued_data();
 
 	void add_client(int sock);
-	void add_data(const std::string &stream_id, const char *data, ssize_t bytes);
 };
 
 #endif  // !defined(_SERVER_H)