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

[cubemap] / server.h

diff --git a/server.h b/server.h
index dfcac0b0414d4addc9dacbabce40234c037f7cec..68e72c4d543165e938a3e63810395727629c85ae 100644 (file)
--- a/server.h
+++ b/server.h
@@ -1,7 +1,6 @@
 #ifndef _SERVER_H
 #define _SERVER_H 1
 
-#include <pthread.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/epoll.h>
@@ -9,6 +8,7 @@
 #include <time.h>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <queue>
 #include <string>
 #include <vector>
@@ -71,24 +71,24 @@ public:
 
 private:
        // Mutex protecting queued_add_clients.
-       // Note that if you want to hold both this and <mutex> below,
-       // you will need to take <mutex> before this one.
-       mutable pthread_mutex_t queued_clients_mutex;
+       // Note that if you want to hold both this and <mu> below,
+       // you will need to take <mu> before this one.
+       mutable std::mutex queued_clients_mutex;
 
        // Deferred commands that should be run from the do_work() thread as soon as possible.
        // We defer these for two reasons:
        //
        //  - We only want to fiddle with epoll from one thread at any given time,
        //    and doing add_client() from the acceptor thread would violate that.
-       //  - We don't want the input thread(s) hanging on <mutex> when doing
-       //    add_data(), since they want to do add_data() rather often, and <mutex>
+       //  - We don't want the input thread(s) hanging on <mu> when doing
+       //    add_data(), since they want to do add_data() rather often, and <mu>
        //    can be taken a lot of the time.
        //      
        // Protected by <queued_clients_mutex>.
        std::vector<std::pair<int, Acceptor *>> queued_add_clients;
 
        // All variables below this line are protected by the mutex.
-       mutable pthread_mutex_t mutex;
+       mutable std::mutex mu;
 
        // All streams.
        std::vector<std::unique_ptr<Stream>> streams;