Changeset 30609 in vbox for trunk/src/VBox/Main/webservice/vboxweb.cpp

Timestamp:

Jul 5, 2010 12:43:41 PM (14 years ago)

Author:

vboxsync

Message:

webservice: add missing mutex for thread logging identifiers (helgrind complaints)

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (6 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -129 +129 @@
 ULONG64             g_iMaxManagedObjectID = 0;
 ULONG64             g_cManagedObjects = 0;
+
+// this mutex protects g_mapThreads
+util::RWLockHandle  *g_pThreadsLockHandle;
 
 // Threads map, so we can quickly map an RTTHREAD struct to a logger prefix
@@ -326 +329 @@
                                              m_soap);
             m_llAllThreads.push_back(pst);
+            util::AutoWriteLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS);
             g_mapThreads[pst->m_pThread] = com::Utf8StrFmt("[%3u]", pst->m_u);
             ++m_cIdleThreads;
@@ -455 +459 @@
 
     const char *pcszPrefix = "[   ]";
+    util::AutoReadLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS);
     ThreadsMap::iterator it = g_mapThreads.find(RTThreadSelf());
     if (it != g_mapThreads.end())
         pcszPrefix = it->second.c_str();
+    thrLock.release();
 
     // terminal
@@ -557 +563 @@
 {
     // store a log prefix for this thread
+    util::AutoWriteLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS);
     g_mapThreads[RTThreadSelf()] = "[ P ]";
+    thrLock.release();
 
     doQueuesLoop();
@@ -701 +709 @@
     g_pAuthLibLockHandle = new util::WriteLockHandle(util::LOCKCLASS_WEBSERVICE);
     g_pSessionsLockHandle = new util::WriteLockHandle(util::LOCKCLASS_WEBSERVICE);
+    g_pThreadsLockHandle = new util::RWLockHandle(util::LOCKCLASS_OBJECTSTATE);
 
     // SOAP queue pumper thread
@@ -765 +774 @@
 {
     // store a log prefix for this thread
+    util::AutoWriteLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS);
     g_mapThreads[RTThreadSelf()] = "[W  ]";
+    thrLock.release();
 
     WEBDEBUG(("Watchdog thread started\n"));