Reduce contention of queued_data_mutex.

[cubemap] / server.h

diff --git a/server.h b/server.h
index f0eb622c5ac2d62a188092448143a2d95fef0974..4b3aab8e9b7250eb47e634805f1978c5a4071ce2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -61,10 +61,10 @@ public:
        void set_encoding(int stream_index, Stream::Encoding encoding);
 
 private:
-       // Mutex protecting queued_add_clients and streams[..]->queued_data.
+       // 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_data_mutex;
+       mutable pthread_mutex_t queued_clients_mutex;
 
        // Deferred commands that should be run from the do_work() thread as soon as possible.
        // We defer these for two reasons:
@@ -75,7 +75,7 @@ private:
        //    add_data(), since they want to do add_data() rather often, and <mutex>
        //    can be taken a lot of the time.
        //      
-       // Protected by <queued_data_mutex>.
+       // Protected by <queued_clients_mutex>.
        std::vector<int> queued_add_clients;
 
        // All variables below this line are protected by the mutex.