Changeset 3999 for pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjlib/src/pj/os_core_symbian.cpp (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

@@ -76 +76 @@
 };
 
+/* Flag and reference counter for PJLIB instance */
+static int initialized;
+
 /* Flags to indicate which TLS variables have been used */
 static int tls_vars[PJ_MAX_TLS];
@@ -82 +85 @@
 static unsigned atexit_count;
 static void (*atexit_func[32])(void);
-
-
 
 
@@ -336 +337 @@
     pj_status_t status;
     
+    /* Check if PJLIB have been initialized */
+    if (initialized) {
+        ++initialized;
+        return PJ_SUCCESS;
+    }
+
     pj_ansi_strcpy(main_thread.obj_name, "pjthread");
 
@@ -369 +376 @@
 #endif
 
+    /* Flag PJLIB as initialized */
+    ++initialized;
+    pj_assert(initialized == 1);
+
     PJ_LOG(5,(THIS_FILE, "PJLIB initialized."));
     return PJ_SUCCESS;
@@ -391 +402 @@
 PJ_DEF(void) pj_shutdown(void)
 {
+    /* Only perform shutdown operation when 'initialized' reaches zero */
+    pj_assert(initialized > 0);
+    if (--initialized != 0)
+        return;
+
     /* Call atexit() functions */
     while (atexit_count > 0) {