Add NEWS file for upcoming release.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index d762869e281572278c3603afc0bbd70d657ceb19..2cdba11ad46b48a1d07801dccd7821efa11568ce 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -15,6 +15,11 @@ class MarkPool;
 class StreamProto;
 struct Client;
 
+enum StreamStartSuitability {
+       NOT_SUITABLE_FOR_STREAM_START,
+       SUITABLE_FOR_STREAM_START,
+};
+
 struct Stream {
        // Must be in sync with StreamConfig::Encoding.
        enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
@@ -29,6 +34,11 @@ struct Stream {
        // Changes the backlog size, restructuring the data as needed.
        void set_backlog_size(size_t new_size);
 
+       // Mutex protecting <queued_data> and <queued_data_last_starting_point>.
+       // Note that if you want to hold both this and the owning server's
+       // <mutex> you will need to take <mutex> before this one.
+       mutable pthread_mutex_t queued_data_mutex;
+
        std::string url;
 
        // The HTTP response header, without the trailing double newline.
@@ -57,6 +67,10 @@ struct Stream {
        // How many bytes this stream have received. Can very well be larger
        // than <backlog_size>, since the buffer wraps.
        size_t bytes_received;
+
+       // The last point in the stream that is suitable to start new clients at
+       // (after having sent the header). -1 if no such point exists yet.
+       ssize_t last_suitable_starting_point;
        
        // Clients that are in SENDING_DATA, but that we don't listen on,
        // because we currently don't have any data for them.
@@ -70,10 +84,14 @@ struct Stream {
        // What pool to fetch marks from, or NULL.
        MarkPool *mark_pool;
 
-       // Queued data, if any. Protected by the owning Server's <queued_data_mutex>.
+       // 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;
+
        // 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.
@@ -81,11 +99,10 @@ struct Stream {
 
        // Add more data to <queued_data>, adding Metacube headers if needed.
        // Does not take ownership of <data>.
-       // You should hold the owning Server's <queued_data_mutex>.
-       void add_data_deferred(const char *data, size_t bytes);
+       void add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
 
        // Add queued data to the stream, if any.
-       // You should hold the owning Server's <mutex> _and_ <queued_data_mutex>.
+       // You should hold the owning Server's <mutex>.
        void process_queued_data();
 
 private: