Changeset 3986 for pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c

Timestamp:

Mar 22, 2012 11:29:20 AM (12 years ago)

Author:

nanang

Message:

Close #1466 (using PJLIB outside PJSUA-LIB context):

• static reference counter for PJLIB init/shutdown.
• implemented atexit() in PJMEDIA and PJSIP level: pjmedia_endpt_atexit() & pjsip_endpt_atexit().
• updated pjmedia/transport_srtp.c, pjsip/sip_timer.c, and pjsip/sip_replaces.c to use the new atexit() functions.
• API change: pjmedia_srtp_init_lib() now requires 'pjmedia_endpt' param.

File:

• pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c (modified) (4 diffs)

pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c

@@ -118 +118 @@
 
 /*
+ * Flag and reference counter for PJLIB instance.
+ */
+static int initialized;
+
+/*
  * Static global variables.
  */
@@ -142 +147 @@
     pj_str_t guid;
     pj_status_t rc;
+
+    /* Check if PJLIB have been initialized */
+    if (initialized) {
+        ++initialized;
+        return PJ_SUCCESS;
+    }
 
     /* Init Winsock.. */
@@ -188 +199 @@
 #endif   
 
+    /* Flag PJLIB as initialized */
+    ++initialized;
+    pj_assert(initialized == 1);
+
     PJ_LOG(4,(THIS_FILE, "pjlib %s for win32 initialized",
               PJ_VERSION));
@@ -213 +228 @@
 {
     int i;
+
+    /* Only perform shutdown operation when 'initialized' reaches zero */
+    pj_assert(initialized > 0);
+    if (--initialized != 0)
+        return;
 
     /* Display stack usage */