#include <vector>
#include "client.h"
+#include "stream.h"
#include "thread.h"
class ClientProto;
std::vector<ClientStats> 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.
// NOTE: This should be set before any clients are connected!
- void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+ void set_mark_pool(int stream_index, 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);
+ 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, Stream::Encoding 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_encoding(int stream_index, Stream::Encoding encoding);
private:
- // Mutex protecting queued_data only. Note that if you want to hold both this
- // and <mutex> below, you will need to take <mutex> before this one.
+ // Mutex protecting queued_add_clients and streams[..]->queued_data.
+ // 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_data_mutex;
// Deferred commands that should be run from the do_work() thread as soon as possible.
//
// Protected by <queued_data_mutex>.
std::vector<int> queued_add_clients;
- std::map<std::string, std::string> 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<std::string, Stream *> streams;
+ // All streams.
+ std::vector<Stream *> streams;
+
+ // Map from URL to index into <streams>.
+ std::map<std::string, int> url_map;
// Map from file descriptor to client.
std::map<int, Client> clients;
// 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 skip_lost_data(Client *client);
void add_client(int sock);
};