Track stream start suitability separately for each data block added.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index d29b9246a06f76a776385bad4290f69b6cb171be..9a9982a3541d489f72b63a18228f1e1d1910acca 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-class MarkPool;
 class StreamProto;
 struct Client;
 
@@ -24,7 +23,7 @@ struct Stream {
        // Must be in sync with StreamConfig::Encoding.
        enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
 
-       Stream(const std::string &stream_id, size_t backlog_size, Encoding encoding);
+       Stream(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding);
        ~Stream();
 
        // Serialization/deserialization.
@@ -64,6 +63,14 @@ struct Stream {
        // How many bytes <data_fd> can hold (the buffer size).
        size_t backlog_size;
 
+       // How many bytes we need to have in the backlog before we start
+       // sending (in practice, we will then send all of them at once,
+       // and then start sending at the normal rate thereafter).
+       // This is basically to force a buffer on the client, which can help
+       // if the client expects us to be able to fill up the buffer much
+       // faster than realtime (ie., it expects a static file).
+       size_t prebuffering_bytes;
+
        // How many bytes this stream have received. Can very well be larger
        // than <backlog_size>, since the buffer wraps.
        size_t bytes_received;
@@ -81,19 +88,16 @@ struct Stream {
        // <sleeping_clients>).
        std::vector<Client *> to_process;
 
-       // What pool to fetch marks from, or NULL.
-       MarkPool *mark_pool;
-
        // Maximum pacing rate for the stream.
-       int pacing_rate;
+       uint32_t pacing_rate;
 
        // Queued data, if any. Protected by <queued_data_mutex>.
        // The data pointers in the iovec are owned by us.
-       std::vector<iovec> queued_data;
-
-       // Index of the last element in queued_data that is suitable to start streaming at.
-       // -1 if none. Protected by <queued_data_mutex>.
-       int queued_data_last_starting_point;
+       struct DataElement {
+               iovec data;
+               StreamStartSuitability suitable_for_stream_start;
+       };
+       std::vector<DataElement> queued_data;
 
        // 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
@@ -114,7 +118,7 @@ private:
        // Adds data directly to the stream file descriptor, without adding headers or
        // going through <queued_data>.
        // You should hold the owning Server's <mutex>.
-       void add_data_raw(const std::vector<iovec> &data);
+       void add_data_raw(const std::vector<DataElement> &data);
 };
 
 #endif  // !defined(_STREAM_H)