#ifndef _SERVER_H
#define _SERVER_H 1
-#include <pthread.h>
#include <stddef.h>
#include <stdint.h>
#include <sys/epoll.h>
#include <sys/types.h>
#include <time.h>
-#include <map>
+#include <memory>
+#include <mutex>
#include <queue>
#include <string>
+#include <unordered_map>
#include <vector>
#include "tlse.h"
// and the order between them are undefined.
// XXX: header should ideally be ordered with respect to data.
void add_client_deferred(int sock, Acceptor *acceptor);
- void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags);
+ void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags, const RationalPTS &pts);
// 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);
- int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
+ CubemapStateProto serialize(std::unordered_map<const std::string *, size_t> *short_response_pool);
+ void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
+ int add_stream(const std::string &url,
+ const std::string &hls_url,
+ size_t bytes_received,
+ size_t prebuffering_bytes,
+ Stream::Encoding encoding,
+ Stream::Encoding src_encoding,
+ unsigned hls_frag_duration,
+ size_t hls_backlog_margin,
+ const std::string &allow_origin);
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 set_hls_frag_duration(int stream_index, unsigned hls_frag_duration);
+ void set_hls_backlog_margin(int stream_index, size_t hls_backlog_margin);
+ void set_allow_origin(int stream_index, const std::string &allow_origin);
+ void register_hls_url(int stream_index, const std::string &hls_url);
void add_gen204(const std::string &url, const std::string &allow_origin);
void create_tls_context_for_acceptor(const Acceptor *acceptor);
private:
// Mutex protecting queued_add_clients.
- // 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_clients_mutex;
+ // Note that if you want to hold both this and <mu> below,
+ // you will need to take <mu> before this one.
+ mutable std::mutex queued_clients_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 <mutex> when doing
- // add_data(), since they want to do add_data() rather often, and <mutex>
+ // - We don't want the input thread(s) hanging on <mu> when doing
+ // add_data(), since they want to do add_data() rather often, and <mu>
// can be taken a lot of the time.
//
// Protected by <queued_clients_mutex>.
- std::vector<std::pair<int, Acceptor *> > queued_add_clients;
+ std::vector<std::pair<int, Acceptor *>> queued_add_clients;
// All variables below this line are protected by the mutex.
- mutable pthread_mutex_t mutex;
+ mutable std::mutex mu;
// All streams.
- std::vector<Stream *> streams;
+ std::vector<std::unique_ptr<Stream>> streams;
// Map from URL to index into <streams>.
- std::map<std::string, int> stream_url_map;
+ std::unordered_map<std::string, int> stream_url_map, stream_hls_url_map;
// Map from URL to CORS Allow-Origin header (or empty string).
- std::map<std::string, std::string> ping_url_map;
+ std::unordered_map<std::string, std::string> ping_url_map;
// Map from file descriptor to client.
- std::map<int, Client> clients;
+ std::unordered_map<int, Client> 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
// 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<std::pair<timespec, int> > clients_ordered_by_connect_time;
+ std::queue<std::pair<timespec, int>> clients_ordered_by_connect_time;
// Used for epoll implementation (obviously).
int epoll_fd;
epoll_event events[EPOLL_MAX_EVENTS];
// For each TLS-enabled acceptor, our private server context for its key pair.
- std::map<const Acceptor *, TLSContext *> tls_server_contexts;
+ std::unordered_map<const Acceptor *, TLSContext *> tls_server_contexts;
// The actual worker thread.
virtual void do_work();
// Listen for a different set of epoll events.
void change_epoll_events(Client *client, uint32_t events);
+ // If we're supposed to listen for more requests (persistent HTTP connections),
+ // puts the client back into READING_REQUEST, changes its epoll flags and returns
+ // true.
+ bool more_requests(Client *client);
+
// 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
+ // Construct the HTTP header for a regular stream, and set the client into
+ // the SENDING_HEADER state.
+ void construct_stream_header(Client *client);
+
+ // Construct a HLS playlist (or get it from the cache), and set the client into
// the SENDING_HEADER state.
- void construct_header(Client *client);
+ void construct_hls_playlist(Client *client);
// Construct a generic error with the given line, and set the client into
// the SENDING_SHORT_RESPONSE state.
projects / cubemap / blobdiff