dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Increment usage count at first reference, to avoid a race condition with many threads creating connections all at once. 

(issue #18156)
 Reported by: asgaroth
 Patches: 
       20110214__issue18156.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@307792 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2011-02-14 20:10:28 +00:00
parent b54eb6e1d8
commit 41fe6df427
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_odbc.c
View File

@ -1177,10 +1177,11 @@ struct odbc_obj *ast_odbc_request_obj2(const char *name, struct ast_flags flags)
ast_assert(ao2_ref(obj, 0) > 1);
}
if (!obj && (class->count < class->limit)) {
if (!obj && (ast_atomic_fetchadd_int(&class->count, +1) < class->limit)) {
obj = ao2_alloc(sizeof(*obj), odbc_obj_destructor);
if (!obj) {
ao2_ref(class, -1);
ast_atomic_fetchadd_int(&class->count, -1);
return NULL;
}
ast_assert(ao2_ref(obj, 0) == 1);
@ -1191,14 +1192,18 @@ struct odbc_obj *ast_odbc_request_obj2(const char *name, struct ast_flags flags)
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;
ast_assert(ao2_ref(class, 0) > 0);
ast_atomic_fetchadd_int(&class->count, -1);
} else {
obj->used = 1;
ao2_link(obj->parent->obj_container, obj);
ast_atomic_fetchadd_int(&obj->parent->count, +1);
}
} else {
/* If construction fails due to the limit, remove our increment. */
if (!obj) {
ast_atomic_fetchadd_int(&class->count, -1);
}
/* Object is not constructed, so delete outstanding reference to class. */
ao2_ref(class, -1);
class = NULL;