Changeset 5904

Timestamp:

Nov 5, 2018 2:40:54 AM (6 years ago)

Author:

ming

Message:

Fixed #2159: Add synchronization for Endpoint::libRegisterThread()

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/endpoint.hpp (modified) (2 diffs)
• src/pjsua2/endpoint.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -29 +29 @@
 #include <list>
 #include <map>
+#include <mutex>
 
 /** PJSUA2 API is inside pj namespace */
@@ -1597 +1598 @@
     CodecInfoVector              videoCodecInfoList;
     std::map<pj_thread_t*, pj_thread_desc*> threadDescMap;
+    std::mutex                   threadDescMutex;
 
     /* Pending logging */

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1711 +1711 @@
     status = pj_thread_register(name.c_str(), *desc, &thread);
     if (status == PJ_SUCCESS) {
+        std::lock_guard<std::mutex> guard(threadDescMutex);
         threadDescMap[thread] = desc;
     } else {
@@ -1721 +1722 @@
 {
     if (pj_thread_is_registered()) {
+        std::lock_guard<std::mutex> guard(threadDescMutex);
         /* Recheck again if it exists in the thread description map */
         return (threadDescMap.find(pj_thread_this()) != threadDescMap.end());