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 /include/asterisk | |
| 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 'include/asterisk')
| -rw-r--r-- | include/asterisk/pbx.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 67cdccf90..d44a245e3 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -1229,9 +1229,9 @@ const char *ast_get_extension_name(struct ast_exten *exten); struct ast_context *ast_get_extension_context(struct ast_exten *exten); const char *ast_get_include_name(const struct ast_include *include); const char *ast_get_ignorepat_name(const struct ast_ignorepat *ip); -const char *ast_get_switch_name(struct ast_sw *sw); -const char *ast_get_switch_data(struct ast_sw *sw); -int ast_get_switch_eval(struct ast_sw *sw); +const char *ast_get_switch_name(const struct ast_sw *sw); +const char *ast_get_switch_data(const struct ast_sw *sw); +int ast_get_switch_eval(const struct ast_sw *sw); /*! @} */ @@ -1251,7 +1251,7 @@ const char *ast_get_context_registrar(struct ast_context *c); const char *ast_get_extension_registrar(struct ast_exten *e); const char *ast_get_include_registrar(const struct ast_include *i); const char *ast_get_ignorepat_registrar(const struct ast_ignorepat *ip); -const char *ast_get_switch_registrar(struct ast_sw *sw); +const char *ast_get_switch_registrar(const struct ast_sw *sw); /*! @} */ /*! @name Walking functions ... */ @@ -1265,7 +1265,8 @@ const struct ast_include *ast_walk_context_includes(const struct ast_context *co const struct ast_include *inc); const struct ast_ignorepat *ast_walk_context_ignorepats(const struct ast_context *con, const struct ast_ignorepat *ip); -struct ast_sw *ast_walk_context_switches(struct ast_context *con, struct ast_sw *sw); +const struct ast_sw *ast_walk_context_switches(const struct ast_context *con, + const struct ast_sw *sw); /*! @} */ /*! @name Iterator functions ... */ @@ -1274,6 +1275,8 @@ int ast_context_includes_count(const struct ast_context *con); const struct ast_include *ast_context_includes_get(const struct ast_context *con, int idx); int ast_context_ignorepats_count(const struct ast_context *con); const struct ast_ignorepat *ast_context_ignorepats_get(const struct ast_context *con, int idx); +int ast_context_switches_count(const struct ast_context *con); +const struct ast_sw *ast_context_switches_get(const struct ast_context *con, int idx); /*! @} */ /*! |