diff options
| author | Corey Farrell <git@cfware.com> | 2016-07-15 20:28:16 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-07-21 13:58:26 -0400 |
| commit | a36a174c4b15b9aaf915a89824bdfffa468cc112 (patch) | |
| tree | 639253a2f7254cb262367bf72651d131b23e88d6 /utils | |
| parent | 3ca6407dab1d40478d656d3e46b1122ee0995037 (diff) | |
pbx: Create pbx_sw.c for management of 'struct ast_sw'.
This changes context switches from a linked list to a vector, makes
'struct ast_sw' opaque to pbx.c.
Although ast_walk_context_switches is maintained the procedure is no
longer efficient except for the first call (inc==NULL). This
functionality is replaced by two new functions implemented by vector
macros.
* ast_context_switches_count (AST_VECTOR_SIZE)
* ast_context_switches_get (AST_VECTOR_GET)
As with ast_walk_context_switches callers of these functions are
expected to have locked contexts. Only a few places in Asterisk walked
the switches, they have been converted to use the new functions.
Change-Id: I08deb016df22eee8288eb03de62593e45a1f0998
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/conf2ael.c | 6 | ||||
| -rw-r--r-- | utils/extconf.c | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/utils/conf2ael.c b/utils/conf2ael.c index f0cb83f30..3136fe378 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -670,12 +670,6 @@ const struct ast_include *ast_walk_context_includes(const struct ast_context *co return NULL; } -struct ast_sw *ast_walk_context_switches(struct ast_context *con, struct ast_sw *sw); -struct ast_sw *ast_walk_context_switches(struct ast_context *con, struct ast_sw *sw) -{ - return NULL; -} - struct ast_exten *pbx_find_extension(struct ast_channel *chan, struct ast_context *bypass, struct pbx_find_info *q, diff --git a/utils/extconf.c b/utils/extconf.c index 049882334..8588d1a28 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -4448,6 +4448,19 @@ struct ast_sw *localized_walk_context_switches(struct ast_context *con, return ast_walk_context_switches(con, sw); } +int ast_context_switches_count(struct ast_context *con); +int ast_context_switches_count(struct ast_context *con) +{ + int c = 0; + struct ast_sw *sw = NULL; + + while ((sw = ast_walk_context_switches(con, sw))) { + c++; + } + + return c; +} + static struct ast_context *ast_context_find(const char *name); |