Changeset 5912 for pjproject

Timestamp:

Nov 22, 2018 2:39:29 AM (5 years ago)

Author:

ming

Message:

Re #2159: Replace std::mutex with PJSIP's own pj_mutex_t, since std::mutex is only available starting C++11

Location:

pjproject/trunk/pjsip

Files:

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

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

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

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

@@ -480 +480 @@
  */
 Endpoint::Endpoint()
-: writer(NULL), mainThreadOnly(false), mainThread(NULL), pendingJobSize(0)
+: writer(NULL), threadDescMutex(NULL), mainThreadOnly(false), 
+  mainThread(NULL), pendingJobSize(0)
 {
     if (instance_) {
@@ -1689 +1690 @@
             threadDescMap[t] = NULL;
     }
+    
+    PJSUA2_CHECK_EXPR( pj_mutex_create_simple(pjsua_var.pool, "threadDesc",
+                                              &threadDescMutex) );
 }
 
@@ -1711 +1715 @@
     status = pj_thread_register(name.c_str(), *desc, &thread);
     if (status == PJ_SUCCESS) {
-        std::lock_guard<std::mutex> guard(threadDescMutex);
+        pj_mutex_lock(threadDescMutex);
         threadDescMap[thread] = desc;
+        pj_mutex_unlock(threadDescMutex);
     } else {
         free(desc);
@@ -1722 +1727 @@
 {
     if (pj_thread_is_registered()) {
-        std::lock_guard<std::mutex> guard(threadDescMutex);
+        bool found;
+
+        pj_mutex_lock(threadDescMutex);
         /* Recheck again if it exists in the thread description map */
-        return (threadDescMap.find(pj_thread_this()) != threadDescMap.end());
+        found = (threadDescMap.find(pj_thread_this()) != threadDescMap.end());
+        pj_mutex_unlock(threadDescMutex);
+
+        return found;
     }
 
@@ -1744 +1754 @@
 {
     pj_status_t status;
+
+    if (threadDescMutex) {
+        pj_mutex_destroy(threadDescMutex);
+        threadDescMutex = NULL;
+    }
 
     status = pjsua_destroy2(flags);