[asterisk-commits] tilghman: branch 1.6.1 r176644 - in /branches/1.6.1: ./ channels/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 17 15:16:53 CST 2009
Author: tilghman
Date: Tue Feb 17 15:16:53 2009
New Revision: 176644
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176644
Log:
Merged revisions 176592,176642 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r176592 | tilghman | 2009-02-17 12:49:20 -0600 (Tue, 17 Feb 2009) | 4 lines
Add assertions in the quest to track down a refcount leak.
(closes issue #14485)
Reported by: davevg
........
r176642 | tilghman | 2009-02-17 15:14:18 -0600 (Tue, 17 Feb 2009) | 8 lines
Prior to masquerade, move the group definitions to the channel performing the
masq, so that the group count lingers past the bridge.
(closes issue #14275)
Reported by: kowalma
Patches:
20090216__bug14275.diff.txt uploaded by Corydon76 (license 14)
Tested by: kowalma
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/channels/chan_local.c
branches/1.6.1/res/res_odbc.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/channels/chan_local.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=176644&r1=176643&r2=176644
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Tue Feb 17 15:16:53 2009
@@ -106,8 +106,8 @@
char exten[AST_MAX_EXTENSION]; /* Extension to call */
int reqformat; /* Requested format */
struct ast_jb_conf jb_conf; /*!< jitterbuffer configuration for this local channel */
- struct ast_channel *owner; /* Master Channel */
- struct ast_channel *chan; /* Outbound channel */
+ struct ast_channel *owner; /* Master Channel - Bridging happens here */
+ struct ast_channel *chan; /* Outbound channel - PBX is run here */
struct ast_module_user *u_owner; /*! reference to keep the module loaded while in use */
struct ast_module_user *u_chan; /*! reference to keep the module loaded while in use */
AST_LIST_ENTRY(local_pvt) list; /* Next entity */
@@ -303,6 +303,7 @@
p->chan->audiohooks = p->owner->audiohooks;
p->owner->audiohooks = audiohooks_swapper;
}
+ ast_app_group_update(p->chan, p->owner);
ast_channel_masquerade(p->owner, p->chan->_bridge);
ast_set_flag(p, LOCAL_ALREADY_MASQED);
}
Modified: branches/1.6.1/res/res_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/res_odbc.c?view=diff&rev=176644&r1=176643&r2=176644
==============================================================================
--- branches/1.6.1/res/res_odbc.c (original)
+++ branches/1.6.1/res/res_odbc.c Tue Feb 17 15:16:53 2009
@@ -99,9 +99,11 @@
static void odbc_obj_destructor(void *data)
{
struct odbc_obj *obj = data;
+ struct odbc_class *class = obj->parent;
+ obj->parent = NULL;
odbc_obj_disconnect(obj);
ast_mutex_destroy(&obj->lock);
- ao2_ref(obj->parent, -1);
+ ao2_ref(class, -1);
}
static void destroy_table_cache(struct odbc_cache_tables *table) {
@@ -556,10 +558,11 @@
while ((class = ao2_iterator_next(&aoi))) {
if (!strncasecmp(a->word, class->name, length) && ++which > a->n) {
ret = ast_strdup(class->name);
- ao2_ref(class, -1);
+ }
+ ao2_ref(class, -1);
+ if (ret) {
break;
}
- ao2_ref(class, -1);
}
if (!ret && !strncasecmp(a->word, "all", length) && ++which > a->n) {
ret = ast_strdup("all");
@@ -674,6 +677,8 @@
if (!class)
return NULL;
+ ast_assert(ao2_ref(class, 0) > 1);
+
if (class->haspool) {
/* Recycle connections before building another */
aoi = ao2_iterator_init(class->obj_container, 0);
@@ -687,6 +692,10 @@
ao2_ref(obj, -1);
}
+ if (obj) {
+ ast_assert(ao2_ref(obj, 0) > 1);
+ }
+
if (!obj && (class->count < class->limit)) {
class->count++;
obj = ao2_alloc(sizeof(*obj), odbc_obj_destructor);
@@ -694,12 +703,14 @@
ao2_ref(class, -1);
return NULL;
}
+ ast_assert(ao2_ref(obj, 0) == 1);
ast_mutex_init(&obj->lock);
/* obj inherits the outstanding reference to class */
obj->parent = class;
if (odbc_obj_connect(obj) == ODBC_FAIL) {
ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
ao2_ref(obj, -1);
+ ast_assert(ao2_ref(class, 0) > 0);
obj = NULL;
} else {
obj->used = 1;
@@ -721,12 +732,14 @@
if (obj) {
/* Object is not constructed, so delete outstanding reference to class. */
+ ast_assert(ao2_ref(class, 0) > 1);
ao2_ref(class, -1);
class = NULL;
} else {
/* No entry: build one */
obj = ao2_alloc(sizeof(*obj), odbc_obj_destructor);
if (!obj) {
+ ast_assert(ao2_ref(class, 0) > 1);
ao2_ref(class, -1);
return NULL;
}
@@ -739,6 +752,7 @@
obj = NULL;
} else {
ao2_link(class->obj_container, obj);
+ ast_assert(ao2_ref(obj, 0) > 1);
}
class = NULL;
}
@@ -758,6 +772,9 @@
#endif
ast_assert(class == NULL);
+ if (obj) {
+ ast_assert(ao2_ref(obj, 0) > 1);
+ }
return obj;
}
@@ -777,10 +794,12 @@
res = SQLDisconnect(obj->con);
- if (res == SQL_SUCCESS || res == SQL_SUCCESS_WITH_INFO) {
- ast_log(LOG_DEBUG, "Disconnected %d from %s [%s]\n", res, obj->parent->name, obj->parent->dsn);
- } else {
- ast_log(LOG_DEBUG, "res_odbc: %s [%s] already disconnected\n", obj->parent->name, obj->parent->dsn);
+ if (obj->parent) {
+ if (res == SQL_SUCCESS || res == SQL_SUCCESS_WITH_INFO) {
+ ast_log(LOG_DEBUG, "Disconnected %d from %s [%s]\n", res, obj->parent->name, obj->parent->dsn);
+ } else {
+ ast_log(LOG_DEBUG, "res_odbc: %s [%s] already disconnected\n", obj->parent->name, obj->parent->dsn);
+ }
}
if ((res = SQLFreeHandle(SQL_HANDLE_DBC, obj->con) == SQL_SUCCESS)) {
More information about the asterisk-commits
mailing list