kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a premature mutex destroy (the destruction callback will end up destroying it) and use a callback to purge remaining classes.

Browse Source 
(closes issue #12677)
Reported by: falves11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2008-05-19 16:22:56 +00:00
parent 452b3e204f
commit 872eaba11d
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
res/res_odbc.c
View File

@@ -543,7 +543,6 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
obj->parent = class; obj->parent = class;
if (odbc_obj_connect(obj) == ODBC_FAIL) { if (odbc_obj_connect(obj) == ODBC_FAIL) {
ast_log(LOG_WARNING, "Failed to connect to %s\n", name); ast_log(LOG_WARNING, "Failed to connect to %s\n", name);
ast_mutex_destroy(&obj->lock);
ao2_ref(obj, -1); ao2_ref(obj, -1);
obj = NULL; obj = NULL;
} else { } else {
@@ -631,10 +630,27 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj)
return ODBC_SUCCESS; return ODBC_SUCCESS;
} }
static int class_is_delme(void *classobj, void *arg, int flags)
{
struct odbc_class *class = classobj;
if (class->delme) {
struct odbc_obj *obj;
struct ao2_iterator aoi = ao2_iterator_init(class->obj_container, OBJ_UNLINK);
while ((obj = ao2_iterator_next(&aoi))) {
ao2_ref(obj, -2);
}
return CMP_MATCH;
}
return 0;
}
static int reload(void) static int reload(void)
{ {
struct odbc_class *class; struct odbc_class *class;
struct odbc_obj *current;
struct ao2_iterator aoi = ao2_iterator_init(class_container, 0); struct ao2_iterator aoi = ao2_iterator_init(class_container, 0);
/* First, mark all to be purged */ /* First, mark all to be purged */
@@ -646,17 +662,7 @@ static int reload(void)
load_odbc_config(); load_odbc_config();
/* Purge remaining classes */ /* Purge remaining classes */
aoi = ao2_iterator_init(class_container, OBJ_UNLINK); ao2_callback(class_container, OBJ_NODATA | OBJ_UNLINK, class_is_delme, 0);
while ((class = ao2_iterator_next(&aoi))) {
if (class->delme) {
struct ao2_iterator aoi2 = ao2_iterator_init(class->obj_container, OBJ_UNLINK);
while ((current = ao2_iterator_next(&aoi2))) {
ao2_ref(current, -2);
}
ao2_ref(class, -1);
}
ao2_ref(class, -1);
}
return 0; return 0;
} }