diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-11-21 12:39:31 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-11-21 12:39:31 +0000 |
commit | 271cf23083b38b3f0d12a36bb1f28e458ee43861 (patch) | |
tree | d3c5bc170635051fd0aaa3fa41ba26fc421693f1 /pjlib/src/pj/os_core_unix.c | |
parent | c0cd0b4450fdcf785bb9184b4d6231d452cb8df5 (diff) |
Fixed handles leak upon program exit, by introducing pj_shutdown() and pj_atexit(). Also fixed handle leaks in SIP transaction layer and SIP endpoint.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@815 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj/os_core_unix.c')
-rw-r--r-- | pjlib/src/pj/os_core_unix.c | 51 |
1 files changed, 44 insertions, 7 deletions
diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c index a65c8e89..db55062b 100644 --- a/pjlib/src/pj/os_core_unix.c +++ b/pjlib/src/pj/os_core_unix.c @@ -147,13 +147,6 @@ PJ_DEF(pj_status_t) pj_init(void) guid.ptr = dummy_guid; pj_generate_unique_string( &guid ); - /* Initialize exception ID for the pool. - * Must do so after critical section is configured. - */ - rc = pj_exception_id_alloc("PJLIB/No memory", &PJ_NO_MEMORY_EXCEPTION); - if (rc != PJ_SUCCESS) - return rc; - /* Startup timestamp */ #if defined(PJ_HAS_HIGH_RES_TIMER) && PJ_HAS_HIGH_RES_TIMER != 0 { @@ -171,6 +164,50 @@ PJ_DEF(pj_status_t) pj_init(void) } /* + * pj_atexit() + */ +PJ_DEF(pj_status_t) pj_atexit(void (*func)(void)) +{ + if (atexit_count >= PJ_ARRAY_SIZE(atexit_func)) + return PJ_ETOOMANY; + + atexit_func[atexit_count++] = func; + return PJ_SUCCESS; +} + +/* + * pj_shutdown(void) + */ +PJ_DEF(void) pj_shutdown() +{ + int i; + + /* Call atexit() functions */ + for (i=atexit_count-1; i>=0; --i) { + (*atexit_func[i])(); + } + atexit_count = 0; + + /* Free exception ID */ + if (PJ_NO_MEMORY_EXCEPTION != -1) { + pj_exception_id_free(PJ_NO_MEMORY_EXCEPTION); + PJ_NO_MEMORY_EXCEPTION = -1; + } + +#if PJ_HAS_THREADS + /* Destroy PJLIB critical section */ + pj_mutex_destroy(&critical_section); + + /* Free PJLIB TLS */ + if (thread_tls_id != -1) { + pj_thread_local_free(thread_tls_id); + thread_tls_id = -1; + } +#endif +} + + +/* * pj_getpid(void) */ PJ_DEF(pj_uint32_t) pj_getpid(void) |