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 9995765b2db95042fbe1c6369e9d3c2114896400..17df7f35dade3fc17b577e481031af24ffe2eb8c 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <deque>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -32,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;
 
@@ -72,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.
@@ -88,7 +89,7 @@ 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.