diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 01:36:36 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 01:36:36 +0000 |
commit | a8cafa088ab562774a27bd0eb17eebf91b7dc8c3 (patch) | |
tree | 46660333e5ba676be7388017de51d2619a283092 /res | |
parent | 95c96418356816b0ef2cb6688a44fb11bd61f0e5 (diff) |
Merged revisions 222176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r222176 | kpfleming | 2009-10-05 20:24:24 -0500 (Mon, 05 Oct 2009) | 27 lines
Recorded merge of revisions 222152 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r222152 | kpfleming | 2009-10-05 20:16:36 -0500 (Mon, 05 Oct 2009) | 20 lines
Fix ao2_iterator API to hold references to containers being iterated.
See Mantis issue for details of what prompted this change.
Additional notes:
This patch changes the ao2_iterator API in two ways: F_AO2I_DONTLOCK
has become an enum instead of a macro, with a name that fits our
naming policy; also, it is now necessary to call
ao2_iterator_destroy() on any iterator that has been
created. Currently this only releases the reference to the container
being iterated, but in the future this could also release other
resources used by the iterator, if the iterator implementation changes
to use additional resources.
(closes issue #15987)
Reported by: kpfleming
Review: https://reviewboard.asterisk.org/r/383/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@222186 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 4 | ||||
-rw-r--r-- | res/res_odbc.c | 7 | ||||
-rw-r--r-- | res/res_phoneprov.c | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 66f87e270..fde175e13 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1571,7 +1571,6 @@ static char *handle_cli_moh_show_files(struct ast_cli_entry *e, int cmd, struct return CLI_SHOWUSAGE; i = ao2_iterator_init(mohclasses, 0); - for (; (class = ao2_t_iterator_next(&i, "Show files iterator")); mohclass_unref(class, "Unref iterator in moh show files")) { int x; @@ -1584,6 +1583,7 @@ static char *handle_cli_moh_show_files(struct ast_cli_entry *e, int cmd, struct ast_cli(a->fd, "\tFile: %s\n", class->filearray[x]); } } + ao2_iterator_destroy(&i); return CLI_SUCCESS; } @@ -1608,7 +1608,6 @@ static char *handle_cli_moh_show_classes(struct ast_cli_entry *e, int cmd, struc return CLI_SHOWUSAGE; i = ao2_iterator_init(mohclasses, 0); - for (; (class = ao2_t_iterator_next(&i, "Show classes iterator")); mohclass_unref(class, "Unref iterator in moh show classes")) { ast_cli(a->fd, "Class: %s\n", class->name); ast_cli(a->fd, "\tMode: %s\n", S_OR(class->mode, "<none>")); @@ -1620,6 +1619,7 @@ static char *handle_cli_moh_show_classes(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, "\tFormat: %s\n", ast_getformatname(class->format)); } } + ao2_iterator_destroy(&i); return CLI_SUCCESS; } diff --git a/res/res_odbc.c b/res/res_odbc.c index 546fe974b..947dde952 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -564,6 +564,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c break; } } + ao2_iterator_destroy(&aoi); if (!ret && !strncasecmp(a->word, "all", length) && ++which > a->n) { ret = ast_strdup("all"); } @@ -598,6 +599,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c ast_mutex_unlock(¤t->lock); ao2_ref(current, -1); } + ao2_iterator_destroy(&aoi2); } else { /* Should only ever be one of these */ struct ao2_iterator aoi2 = ao2_iterator_init(class->obj_container, 0); @@ -605,11 +607,13 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c ast_cli(a->fd, " Pooled: No\n Connected: %s\n", current->up && ast_odbc_sanity_check(current) ? "Yes" : "No"); ao2_ref(current, -1); } + ao2_iterator_destroy(&aoi2); } ast_cli(a->fd, "\n"); } ao2_ref(class, -1); } + ao2_iterator_destroy(&aoi); return CLI_SUCCESS; } @@ -880,6 +884,7 @@ static int reload(void) class->delme = 1; ao2_ref(class, -1); } + ao2_iterator_destroy(&aoi); load_odbc_config(); @@ -919,6 +924,7 @@ static int reload(void) * b) the object has already been destroyed. */ } + ao2_iterator_destroy(&aoi2); ao2_unlink(class_container, class); /* unlink C-ref from container (reference handled implicitly) */ /* At this point, either * a) there's an outstanding O-ref, which holds an outstanding C-ref, or @@ -928,6 +934,7 @@ static int reload(void) } ao2_ref(class, -1); /* C-ref-- (by iterator) */ } + ao2_iterator_destroy(&aoi); /* Empty the cache; it will get rebuilt the next time the tables are needed. */ AST_RWLIST_WRLOCK(&odbc_tables); diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index 218cfc1b9..c1bd6784b 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -829,6 +829,7 @@ static void delete_users(void) ao2_unlink(users, user); user = unref_user(user); } + ao2_iterator_destroy(&i); } /*! \brief Build and return a user structure based on gathered config data */ @@ -1065,6 +1066,7 @@ static void delete_routes(void) ao2_unlink(http_routes, route); route = unref_route(route); } + ao2_iterator_destroy(&i); } /*! \brief Delete all phone profiles, freeing their memory */ @@ -1078,6 +1080,7 @@ static void delete_profiles(void) ao2_unlink(profiles, profile); profile = unref_profile(profile); } + ao2_iterator_destroy(&i); } /*! \brief A dialplan function that can be used to print a string for each phoneprov user */ @@ -1105,6 +1108,7 @@ static int pp_each_user_exec(struct ast_channel *chan, const char *cmd, char *da ast_build_string(&buf, &len, "%s", expand_buf); user = unref_user(user); } + ao2_iterator_destroy(&i); return 0; } @@ -1212,6 +1216,7 @@ static char *handle_show_routes(struct ast_cli_entry *e, int cmd, struct ast_cli ast_cli(a->fd, FORMAT, route->uri, route->file->template); route = unref_route(route); } + ao2_iterator_destroy(&i); ast_cli(a->fd, "\nDynamic routes\n\n"); ast_cli(a->fd, FORMAT, "Relative URI", "Template"); @@ -1222,6 +1227,7 @@ static char *handle_show_routes(struct ast_cli_entry *e, int cmd, struct ast_cli ast_cli(a->fd, FORMAT, route->uri, route->file->template); route = unref_route(route); } + ao2_iterator_destroy(&i); return CLI_SUCCESS; } |