kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx: Create pbx_include.c for management of 'struct ast_include'.

Browse Source 
This changes context includes from a linked list to a vector, makes
'struct ast_include' opaque to pbx.c.

Although ast_walk_context_includes 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_includes_count (AST_VECTOR_SIZE)
* ast_context_includes_get (AST_VECTOR_GET)

As with ast_walk_context_includes callers of these functions are
expected to have locked contexts.  Only a few places in Asterisk walked
the includes, they have been converted to use the new functions.

const have been applied where possible to parameters for ast_include
functions.

Change-Id: Ib5c882e27cf96fb2aec67a39c18b4c71c9c83b60
This commit is contained in:
Corey Farrell
2016-07-14 14:51:42 -04:00
parent 273052f404
commit be36bd7ca5
10 changed files with 279 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/conf2ael.c
View File

@@ -664,8 +664,8 @@ struct ast_exten *ast_walk_context_extensions(struct ast_context *con, struct as
return NULL;
}
struct ast_include *ast_walk_context_includes(struct ast_context *con, struct ast_include *inc);
struct ast_include *ast_walk_context_includes(struct ast_context *con, struct ast_include *inc)
const struct ast_include *ast_walk_context_includes(const struct ast_context *con, const struct ast_include *inc);
const struct ast_include *ast_walk_context_includes(const struct ast_context *con, const struct ast_include *inc)
{
return NULL;
}

13
utils/extconf.c
View File

@@ -4381,6 +4381,19 @@ static struct ast_include *ast_walk_context_includes(struct ast_context *con,
return inc->next;
}
int ast_context_includes_count(struct ast_context *con);
int ast_context_includes_count(struct ast_context *con)
{
int c = 0;
struct ast_include *inc = NULL;
while ((inc = ast_walk_context_includes(con, inc))) {
c++;
}
return c;
}
struct ast_include *localized_walk_context_includes(struct ast_context *con,
struct ast_include *inc);
struct ast_include *localized_walk_context_includes(struct ast_context *con,