From b23389219855875161ca52097fae81f404e8a14f Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 31 Jan 2007 21:35:15 +0000 Subject: Merged revisions 53046 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines Merged revisions 53045 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines Fix a bunch of places where pthread_attr_init() was called, but pthread_attr_destroy() was not. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53047 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_h323.c | 2 ++ channels/chan_iax2.c | 7 ++++++- channels/chan_mgcp.c | 1 + channels/chan_sip.c | 2 ++ channels/chan_skinny.c | 1 + channels/chan_zap.c | 17 ++++++++++------- 6 files changed, 22 insertions(+), 8 deletions(-) (limited to 'channels') diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 5de07ab24..3e16a85cc 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -2610,8 +2610,10 @@ static int restart_monitor(void) monitor_thread = AST_PTHREADT_NULL; ast_mutex_unlock(&monlock); ast_log(LOG_ERROR, "Unable to start monitor thread.\n"); + pthread_attr_destroy(&attr); return -1; } + pthread_attr_destroy(&attr); } ast_mutex_unlock(&monlock); return 0; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 66f0b97b6..f9a4d3f94 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6163,6 +6163,8 @@ static void spawn_dp_lookup(int callno, const char *context, const char *calledn if (ast_pthread_create(&newthread, &attr, dp_lookup_thread, dpr)) { ast_log(LOG_WARNING, "Unable to start lookup thread!\n"); } + + pthread_attr_destroy(&attr); } struct iax_dual { @@ -6237,8 +6239,11 @@ static int iax_park(struct ast_channel *chan1, struct ast_channel *chan2) d->chan1 = chan1m; d->chan2 = chan2m; - if (!ast_pthread_create_background(&th, &attr, iax_park_thread, d)) + if (!ast_pthread_create_background(&th, &attr, iax_park_thread, d)) { + pthread_attr_destroy(&attr); return 0; + } + pthread_attr_destroy(&attr); free(d); } return -1; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index ce685527c..69a0cc03f 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -3007,6 +3007,7 @@ static void handle_hd_hf(struct mgcp_subchannel *sub, char *ev) /*ast_queue_control(sub->owner, AST_CONTROL_ANSWER);*/ } } + pthread_attr_destroy(&attr); } static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, struct sockaddr_in *sin) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c1478a53c..a937c053a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12841,8 +12841,10 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct /* Could not start thread */ free(d); /* We don't need it anymore. If thread is created, d will be free'd by sip_park_thread() */ + pthread_attr_destroy(&attr); return 0; } + pthread_attr_destroy(&attr); } return -1; } diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index c07d361a4..f6f68ea16 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4307,6 +4307,7 @@ static void *accept_thread(void *ignore) if (skinnydebug) ast_verbose("killing accept thread\n"); close(as); + pthread_attr_destroy(&attr); return 0; } diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 8c5620832..99faf8c26 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3837,9 +3837,6 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) pthread_attr_t attr; struct ast_channel *chan; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - index = zt_get_index(ast, p, 0); mysig = p->sig; if (p->outsigmod > -1) @@ -4438,6 +4435,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) if (res) ast_log(LOG_WARNING, "Unable to start dial recall tone on channel %d\n", p->channel); p->owner = chan; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); if (!chan) { ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", p->channel); } else if (ast_pthread_create(&threadid, &attr, ss_thread, chan)) { @@ -4455,7 +4454,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0); } p->subs[SUB_THREEWAY].needhold = 1; - } + } + pthread_attr_destroy(&attr); } } else { /* Already have a 3 way call */ @@ -7049,6 +7049,7 @@ static int handle_init_event(struct zt_pvt *i, int event) "interface %d\n", i->channel); } } + pthread_attr_destroy(&attr); return 0; } @@ -7273,10 +7274,12 @@ static int restart_monitor(void) if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) { ast_mutex_unlock(&monlock); ast_log(LOG_ERROR, "Unable to start monitor thread.\n"); + pthread_attr_destroy(&attr); return -1; } } ast_mutex_unlock(&monlock); + pthread_attr_destroy(&attr); return 0; } @@ -9180,9 +9183,6 @@ static void *pri_dchannel(void *vpri) char plancallingani[256]; char calledtonstr[10]; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - gettimeofday(&lastidle, NULL); if (!ast_strlen_zero(pri->idledial) && !ast_strlen_zero(pri->idleext)) { /* Need to do idle dialing, check to be sure though */ @@ -9674,6 +9674,8 @@ static void *pri_dchannel(void *vpri) pbx_builtin_setvar_helper(c, "PRIREDIRECTREASON", redirectingreason2str(e->ring.redirectingreason)); ast_mutex_lock(&pri->lock); + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) { if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Accepting overlap call from '%s' to '%s' on channel %d/%d, span %d\n", @@ -9689,6 +9691,7 @@ static void *pri_dchannel(void *vpri) pri->pvts[chanpos]->call = NULL; } } + pthread_attr_destroy(&attr); } else { ast_mutex_unlock(&pri->lock); /* Release PRI lock while we create the channel */ -- cgit v1.2.3