Tweak the MutexLock implementation slightly, so as to confuse Coverity less.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index 7e20aef2f02c6147e952c3804c55f705d39f0363..f2ba5d43dccc561ef530cf2445ea302f3a555e05 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <string>
 #include <vector>
 
@@ -14,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 };
@@ -28,7 +34,7 @@ struct Stream {
        // Changes the backlog size, restructuring the data as needed.
        void set_backlog_size(size_t new_size);
 
-       std::string stream_id;
+       std::string url;
 
        // The HTTP response header, without the trailing double newline.
        std::string http_header;
@@ -56,6 +62,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.
@@ -69,22 +79,35 @@ 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>.
+       // 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.
+       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.
        void put_client_to_sleep(Client *client);
 
-       // Add more input data to the stream. You should probably call wake_up_all_clients()
-       // after that.
-       void add_data(const char *data, ssize_t bytes);
+       // 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, StreamStartSuitability suitable_for_stream_start);
 
-       // We have more data, so mark all clients that are sleeping as ready to go.
-       void wake_up_all_clients();
+       // Add queued data to the stream, if any.
+       // You should hold the owning Server's <mutex> _and_ <queued_data_mutex>.
+       void process_queued_data();
 
 private:
        Stream(const Stream& other);
 
-       void add_data_raw(const char *data, ssize_t bytes);
+       // 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);
 };
 
 #endif  // !defined(_STREAM_H)