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 c98feb46e3bb2e09f5913c1ea31a018e02680075..17df7f35dade3fc17b577e481031af24ffe2eb8c 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -9,22 +9,18 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <deque>
+#include <mutex>
 #include <string>
 #include <vector>
 
 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 };
 
-       Stream(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding);
+       Stream(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding, Encoding src_encoding);
        ~Stream();
 
        // Serialization/deserialization.
@@ -37,7 +33,7 @@ struct Stream {
        // 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;
+       mutable std::mutex queued_data_mutex;
 
        std::string url;
 
@@ -51,6 +47,9 @@ struct Stream {
        // be Metacube, for reflecting to another Cubemap instance).
        Encoding encoding;
 
+       // What encoding we expect the incoming data to be in (usually Metacube).
+       Encoding src_encoding;
+
        // The stream data itself, stored in a circular buffer.
        //
        // We store our data in a file, so that we can send the data to the
@@ -74,7 +73,7 @@ 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;
+       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.
@@ -90,13 +89,13 @@ struct Stream {
        std::vector<Client *> to_process;
 
        // Maximum pacing rate for the stream.
-       uint32_t pacing_rate;
+       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;
-               StreamStartSuitability suitable_for_stream_start;
+               uint16_t metacube_flags;
        };
        std::vector<DataElement> queued_data;
 
@@ -107,7 +106,7 @@ struct Stream {
 
        // 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, StreamStartSuitability suitable_for_stream_start);
+       void add_data_deferred(const char *data, size_t bytes, uint16_t metacube_flags);
 
        // Add queued data to the stream, if any.
        // You should hold the owning Server's <mutex>.