diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-03-28 07:32:42 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-03-28 07:32:42 +0000 |
commit | 7d69da12d3c52fbd1ebea6f4a6a56d9595c05078 (patch) | |
tree | 95023be1918dab5aa4ddd41e3673de9255cad2c5 /pjmedia | |
parent | 4db56d31d12520c8221ccf846af4e5138e12695c (diff) |
Re #1466: Moved down the atexit callbacks execution in pjmedia & pjsip endpoints to the very end of endpoint destroy sequence.
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3988 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/include/pjmedia/endpoint.h | 5 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/endpoint.c | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pjmedia/include/pjmedia/endpoint.h b/pjmedia/include/pjmedia/endpoint.h index 2455bcea..108dee62 100644 --- a/pjmedia/include/pjmedia/endpoint.h +++ b/pjmedia/include/pjmedia/endpoint.h @@ -212,7 +212,10 @@ PJ_DECL(pj_status_t) pjmedia_endpt_dump(pjmedia_endpt *endpt); /** * Register cleanup function to be called by media endpoint when - * #pjmedia_endpt_destroy() is called. + * #pjmedia_endpt_destroy() is called. Note that application should not + * use or access any endpoint resource (such as pool, ioqueue) from within + * the callback as such resource may have been released when the callback + * function is invoked. * * @param endpt The media endpoint. * @param func The function to be registered. diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index 43ed4ccf..bf9d3c91 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -219,13 +219,6 @@ PJ_DEF(pj_status_t) pjmedia_endpt_destroy (pjmedia_endpt *endpt) } } - /* Call all registered exit callbacks */ - ecb = endpt->exit_cb_list.next; - while (ecb != &endpt->exit_cb_list) { - (*ecb->func)(endpt); - ecb = ecb->next; - } - /* Destroy internal ioqueue */ if (endpt->ioqueue && endpt->own_ioqueue) { pj_ioqueue_destroy(endpt->ioqueue); @@ -236,6 +229,14 @@ PJ_DEF(pj_status_t) pjmedia_endpt_destroy (pjmedia_endpt *endpt) pjmedia_codec_mgr_destroy(&endpt->codec_mgr); pjmedia_aud_subsys_shutdown(); + + /* Call all registered exit callbacks */ + ecb = endpt->exit_cb_list.next; + while (ecb != &endpt->exit_cb_list) { + (*ecb->func)(endpt); + ecb = ecb->next; + } + pj_pool_release (endpt->pool); return PJ_SUCCESS; |