X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=320fcbcd8da8a274277a9633fbc0e0f1ca95a90c;hp=343adf9bfd28f1513fcd6c9ccbec011919b9e147;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=195dc469133d0daed6ac69cdef373dc8dade9637 diff --git a/server.h b/server.h index 343adf9..320fcbc 100644 --- a/server.h +++ b/server.h @@ -1,23 +1,30 @@ #ifndef _SERVER_H #define _SERVER_H 1 -#include #include +#include +#include #include +#include #include -#include #include +#include +#include #include #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 +#define REQUEST_READ_TIMEOUT_SEC 60 class CubemapStateProto; -class MarkPool; class StreamProto; class Server : public Thread { @@ -29,30 +36,39 @@ public: 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 &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. + // 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(const std::string &stream_id, 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. // 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, size_t bytes_received); - void add_stream_from_serialized(const StreamProto &stream); + int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_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_prebuffering_bytes(int stream_index, size_t new_amount); + void set_encoding(int stream_index, Stream::Encoding encoding); + void set_src_encoding(int stream_index, Stream::Encoding encoding); + void add_gen204(const std::string &url, const std::string &allow_origin); private: - // 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; + // Mutex protecting queued_add_clients. + // Note that if you want to hold both this and below, + // you will need to take before this one. + 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: @@ -63,19 +79,37 @@ private: // add_data(), since they want to do add_data() rather often, and // can be taken a lot of the time. // - // Protected by . + // 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; + // All streams. + std::vector streams; + + // Map from URL to index into . + std::map stream_url_map; + + // Map from URL to CORS Allow-Origin header (or empty string). + std::map ping_url_map; // Map from file descriptor to client. std::map 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 > clients_ordered_by_connect_time; + // Used for epoll implementation (obviously). int epoll_fd; epoll_event events[EPOLL_MAX_EVENTS]; @@ -101,7 +135,7 @@ private: // 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). + // Parse the HTTP request. Returns a HTTP status code (200/204/400/404). int parse_request(Client *client); // Construct the HTTP header, and set the client into @@ -109,16 +143,16 @@ private: void construct_header(Client *client); // Construct a generic error with the given line, and set the client into - // the SENDING_ERROR state. + // the SENDING_SHORT_RESPONSE state. void construct_error(Client *client, int error_code); - // TODO: This function should probably die. - Stream *find_stream(const std::string &stream_id); + // Construct a 204, and set the client into the SENDING_SHORT_RESPONSE state. + void construct_204(Client *client); 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, ssize_t bytes); }; #endif // !defined(_SERVER_H)