Changeset 233

Timestamp:

Feb 26, 2006 9:20:52 PM (19 years ago)

Author:

bennylp

Message:

Fixed bug pj_thread_register() when same thread is re-registered with different descriptor

Location:

pjproject/trunk/pjlib/src/pj

Files:

• config.c (modified) (1 diff)
• os_core_linux_kernel.c (modified) (1 diff)
• os_core_unix.c (modified) (1 diff)
• os_core_win32.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.1.3";
+const char *PJ_VERSION = "0.5.2";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjlib/src/pj/os_core_linux_kernel.c

@@ -252 +252 @@
     /* If a thread descriptor has been registered before, just return it. */
     if (pj_thread_local_get (thread_tls_id) != 0) {
-        *ptr_thread = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
-        return PJ_SUCCESS;
+        // 2006-02-26 bennylp:
+        //  This wouldn't work in all cases!.
+        //  If thread is created by external module (e.g. sound thread),
+        //  thread may be reused while the pool used for the thread descriptor
+        //  has been deleted by application.
+        //*thread_ptr = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
+        //return PJ_SUCCESS;
     }
 

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -190 +190 @@
     /* If a thread descriptor has been registered before, just return it. */
     if (pj_thread_local_get (thread_tls_id) != 0) {
-        *ptr_thread = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
-        return PJ_SUCCESS;
+        // 2006-02-26 bennylp:
+        //  This wouldn't work in all cases!.
+        //  If thread is created by external module (e.g. sound thread),
+        //  thread may be reused while the pool used for the thread descriptor
+        //  has been deleted by application.
+        //*thread_ptr = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
+        //return PJ_SUCCESS;
     }
 

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -203 +203 @@
     /* If a thread descriptor has been registered before, just return it. */
     if (pj_thread_local_get (thread_tls_id) != 0) {
-        *thread_ptr = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
-        return PJ_SUCCESS;
+        // 2006-02-26 bennylp:
+        //  This wouldn't work in all cases!.
+        //  If thread is created by external module (e.g. sound thread),
+        //  thread may be reused while the pool used for the thread descriptor
+        //  has been deleted by application.
+        //*thread_ptr = (pj_thread_t*)pj_thread_local_get (thread_tls_id);
+        //return PJ_SUCCESS;
     }