Use C++11 std::mutex and std::lock_guard instead of our RAII wrapper.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index a4aa642b1b81cbb5a336cd138e3fe8d94122c6f7..17df7f35dade3fc17b577e481031af24ffe2eb8c 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -7,28 +7,48 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <sys/uio.h>
+#include <deque>
+#include <mutex>
 #include <string>
 #include <vector>
 
-class MarkPool;
 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, size_t prebuffering_bytes, Encoding encoding, Encoding src_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;
+       // 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 std::mutex queued_data_mutex;
+
+       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;
+
+       // What encoding we apply to the outgoing data (usually raw, but can also
+       // be Metacube, for reflecting to another Cubemap instance).
+       Encoding encoding;
 
-       // The HTTP response header, plus the video stream header (if any).
-       std::string header;
+       // What encoding we expect the incoming data to be in (usually Metacube).
+       Encoding src_encoding;
 
        // The stream data itself, stored in a circular buffer.
        //
@@ -43,9 +63,21 @@ 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;
+       size_t bytes_received = 0;
+
+       // A list of points in the stream that is suitable to start new clients at
+       // (after having sent the header). Empty if no such point exists yet.
+       std::deque<size_t> suitable_starting_points;
        
        // Clients that are in SENDING_DATA, but that we don't listen on,
        // because we currently don't have any data for them.
@@ -56,23 +88,43 @@ 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.
+       uint32_t pacing_rate = ~0U;
+
+       // Queued data, if any. Protected by <queued_data_mutex>.
+       // The data pointers in the iovec are owned by us.
+       struct DataElement {
+               iovec data;
+               uint16_t metacube_flags;
+       };
+       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
        // 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>.
+       void add_data_deferred(const char *data, size_t bytes, uint16_t metacube_flags);
 
-       // 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>.
+       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>, and probably call
+       // remove_obsolete_starting_points() afterwards.
+       void add_data_raw(const std::vector<DataElement> &data);
+
+       // Remove points from <suitable_starting_points> that are no longer
+       // in the backlog.
+       // You should hold the owning Server's <mutex>.
+       void remove_obsolete_starting_points();
 };
 
 #endif  // !defined(_STREAM_H)