Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index a4aa642b1b81cbb5a336cd138e3fe8d94122c6f7..d762869e281572278c3603afc0bbd70d657ceb19 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>
 
@@ -15,20 +16,30 @@ class StreamProto;
 struct Client;
 
 struct Stream {
-       Stream(const std::string &stream_id, size_t backlog_size);
+       // 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();
 
        // Serialization/deserialization.
-       Stream(const StreamProto &serialized);
+       Stream(const StreamProto &serialized, int data_fd);
        StreamProto serialize();
 
        // 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;
+
+       // The video stream header (if any).
+       std::string stream_header;
 
-       // The HTTP response header, plus the video stream header (if any).
-       std::string header;
+       // What encoding we apply to the outgoing data (usually raw, but can also
+       // be Metacube, for reflecting to another Cubemap instance).
+       Encoding encoding;
 
        // The stream data itself, stored in a circular buffer.
        //
@@ -59,20 +70,31 @@ 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;
+
        // 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);
 
-       // 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);
+
+       // 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)