X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=a3e032d88f71a2f66b9613781d64053a6f32b143;hp=d87e7dfab0d8dd9a08423b7b2c47b998e2b277a2;hb=71fc5575037bead8b6e927a1fffd199e4fc4514b;hpb=4fcea4a90506f45311daf49a58b02a3723e6a5ff diff --git a/server.h b/server.h index d87e7df..a3e032d 100644 --- a/server.h +++ b/server.h @@ -1,130 +1,84 @@ #ifndef _SERVER_H #define _SERVER_H 1 -#include #include +#include +#include #include -#include +#include +#include #include +#include #include -#define BACKLOG_SIZE 1048576 +#include "client.h" +#include "stream.h" +#include "thread.h" + +class ClientProto; +struct Stream; + #define EPOLL_MAX_EVENTS 8192 #define EPOLL_TIMEOUT_MS 20 #define MAX_CLIENT_REQUEST 16384 -class ClientProto; class CubemapStateProto; -class Stream; +class MarkPool; class StreamProto; -struct Client { - Client() {} - Client(int sock); - - // Serialization/deserialization. - Client(const ClientProto &serialized, Stream *stream); - ClientProto serialize() const; - - // The file descriptor associated with this socket. - int sock; - - 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 . - // 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 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 sleeping_clients; - - // Clients that we recently got data for (when they were in - // ). - std::vector to_process; - - // 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 { +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 get_client_stats() const; - CubemapStateProto serialize() 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); - void add_client(int sock); - void add_client_from_serialized(const ClientProto &client); + // 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 add_stream(const std::string &stream_id); - void add_stream_from_serialized(const StreamProto &stream); + // 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 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); + // 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_t worker_thread; + // 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; - // All variables below this line are protected by the mutex. - pthread_mutex_t 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; - // If the thread should stop or not. - bool should_stop; + // All variables below this line are protected by the mutex. + mutable pthread_mutex_t mutex; // Map from stream ID to stream. std::map streams; @@ -136,11 +90,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: @@ -173,6 +124,10 @@ private: // 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)