X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=a3e032d88f71a2f66b9613781d64053a6f32b143;hp=d8b9064f492f2ad12e333747b389bd1093b2564a;hb=5cd46e39b4063d94f6dc559ae350beeb8406a8f9;hpb=97bdb597d4847308ce9d6982505b56a3a09e930b diff --git a/server.h b/server.h index d8b9064..a3e032d 100644 --- a/server.h +++ b/server.h @@ -1,73 +1,133 @@ #ifndef _SERVER_H #define _SERVER_H 1 -#include #include -#include +#include +#include +#include +#include +#include #include +#include +#include -#define BACKLOG_SIZE 1048576 - -struct Client { - enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA }; - State state; - - // The HTTP request, as sent by the client. If we are in READING_REQUEST, - // this might not be finished. - std::string client_request; - -#if 0 - // What stream we're connecting to; parsed from client_request. - // Not relevant for READING_REQUEST. - string stream_id; -#endif - - // Number of bytes we've sent of the header. Only relevant for SENDING_HEADER. - size_t header_bytes_sent; - - // Number of bytes we've sent of data. Only relevant for SENDING_DATA. - size_t bytes_sent; -}; +#include "client.h" +#include "stream.h" +#include "thread.h" -struct Stream { - // The HTTP response header, plus the video stream header (if any). - std::string header; +class ClientProto; +struct Stream; - // The stream data itself, stored in a circular buffer. - char data[BACKLOG_SIZE]; +#define EPOLL_MAX_EVENTS 8192 +#define EPOLL_TIMEOUT_MS 20 +#define MAX_CLIENT_REQUEST 16384 - // How many bytes contains. Can very well be larger than BACKLOG_SIZE, - // since the buffer wraps. - size_t data_size; -}; +class CubemapStateProto; +class MarkPool; +class StreamProto; -class Server { +class Server : public Thread { public: Server(); - - // Start a new thread that handles clients. - void run(); - void add_client(int sock); - void add_stream(const std::string &stream_id); - void set_header(const std::string &stream_id, const std::string &header); - void add_data(const std::string &stream_id, const char *data, size_t bytes); + ~Server(); + + // Get the list of all currently connected clients. + std::vector 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 &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); + + // 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); + + // 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, size_t bytes_received, Stream::Encoding encoding); + void add_stream_from_serialized(const StreamProto &stream, int data_fd); + void set_backlog_size(const std::string &stream_id, size_t new_size); + void set_encoding(const std::string &stream_id, Stream::Encoding encoding); private: - pthread_mutex_t mutex; + // Mutex protecting queued_data only. Note that if you want to hold both this + // and below, you will need to take 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. + // 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 when doing + // add_data(), since they want to do add_data() rather often, and + // can be taken a lot of the time. + // + // Protected by . + std::vector queued_add_clients; + std::map 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 streams; + std::map streams; // Map from file descriptor to client. std::map clients; + // Used for epoll implementation (obviously). int epoll_fd; - - // Recover the this pointer, and call do_work(). - static void *do_work_thunk(void *arg); + epoll_event events[EPOLL_MAX_EVENTS]; // 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: + // + // 1. The socket is closed, and the client deleted. + // 2. We are still waiting for more data from the client. + // 3. We've sent all the data we have to the client, + // and put it in . + // 4. The socket buffer is full (which means we still have + // data outstanding). + // + // For #2, we listen for EPOLLIN events. For #3 and #4, we listen + // for EPOLLOUT in edge-triggered mode; it will never fire for #3, + // but it's cheaper than taking it in and out all the time. + void process_client(Client *client); + + // Close a given client socket, and clean up after it. + void close_client(Client *client); + + // Parse the HTTP request. Returns a HTTP status code (200/400/404). + int parse_request(Client *client); + + // Construct the HTTP header, and set the client into + // the SENDING_HEADER state. + void construct_header(Client *client); + + // Construct a generic error with the given line, and set the client into + // 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 add_client(int sock); }; #endif // !defined(_SERVER_H)