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

pbx: Create pbx_sw.c for management of 'struct ast_sw'.

Browse Source 
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
This commit is contained in:
Corey Farrell
2016-07-15 20:28:16 -04:00
parent 3ca6407dab
commit a36a174c4b
8 changed files with 235 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pbx/pbx_config.c
View File

@@ -928,7 +928,6 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
int context_header_written = 0;
struct ast_exten *ext, *last_written_e = NULL;
int idx;
struct ast_sw *sw;
/* try to lock context and fireout all info */
if (ast_rdlock_context(c)) { /* lock failure */
@@ -1016,7 +1015,9 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
}
/* walk through switches */
for (sw = NULL; (sw = ast_walk_context_switches(c, sw)) ; ) {
for (idx = 0; idx < ast_context_switches_count(c); idx++) {
const struct ast_sw *sw = ast_context_switches_get(c, idx);
if (strcmp(ast_get_switch_registrar(sw), registrar) != 0)
continue; /* not mine */
PUT_CTX_HDR;
@@ -1024,8 +1025,9 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
ast_get_switch_name(sw), ast_get_switch_data(sw));
}
if (ast_walk_context_switches(c, NULL))
if (ast_context_switches_count(c)) {
fprintf(output, "\n");
}
/* fireout ignorepats ... */
for (idx = 0; idx < ast_context_ignorepats_count(c); idx++) {