diff options
author | Sean Bright <sean.bright@gmail.com> | 2017-12-01 09:29:43 -0500 |
---|---|---|
committer | Sean Bright <sean.bright@gmail.com> | 2017-12-01 09:29:43 -0500 |
commit | 077ceacd48b796933dd22198beefcacfe6f8ff0f (patch) | |
tree | 9469116170f20addcc3bb6a6046b241d5ed34395 /main | |
parent | 0f4152307ad2b831df10fb23605b033d6f1b0ae1 (diff) |
config: Speed up ACO & sorcery initialization
When starting Asterisk in the foreground, there is a perceptible delay
when loading modules that use the ACO and sorcery config frameworks.
For example, a lightly configured res_pjsip took 853ms to load on my
VM.
I tracked down the slowness to the XPath queries used to associate the
relevant documentation with the config options. One improvement was
adding a call to xmlXPathOrderDocElems after loading an XML document.
From the libxml2 docs:
Call this routine to speed up XPath computation on static documents.
The second change was to remove recursive descent and wildcard
operators from the XPath queries. After these changes, res_pjsip takes
85ms to load on my VM and there is no longer a perceptible delay when
starting Asterisk in the foreground.
Change-Id: I45d457f1580e26bf5a2b0dab16e8e9ae46dcbd82
Diffstat (limited to 'main')
-rw-r--r-- | main/config_options.c | 6 | ||||
-rw-r--r-- | main/xml.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/config_options.c b/main/config_options.c index 484eaf6e4..f52d3c410 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -1000,11 +1000,11 @@ static int xmldoc_update_config_type(const char *module, const char *name, const /* If we already have a syntax element, bail. This isn't an error, since we may unload a module which * has updated the docs and then load it again. */ - if ((results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']/syntax", module, name))) { + if ((results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']/syntax", module, name))) { return 0; } - if (!(results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']", module, name))) { + if (!(results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']", module, name))) { ast_log(LOG_WARNING, "Cannot update type '%s' in module '%s' because it has no existing documentation!\n", name, module); return XMLDOC_STRICT ? -1 : 0; } @@ -1070,7 +1070,7 @@ static int xmldoc_update_config_option(struct aco_type **types, const char *modu return XMLDOC_STRICT ? -1 : 0; } - if (!(results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']/configOption[@name='%s']", module, object_name, name))) { + if (!(results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']/configOption[@name='%s']", module, object_name, name))) { ast_log(LOG_WARNING, "Could not find option '%s' with type '%s' in module '%s'\n", name, object_name, module); return XMLDOC_STRICT ? -1 : 0; } diff --git a/main/xml.c b/main/xml.c index dee249711..bd82b5cbf 100644 --- a/main/xml.c +++ b/main/xml.c @@ -98,6 +98,9 @@ struct ast_xml_doc *ast_xml_open(char *filename) ast_log(LOG_NOTICE, "XSLT support not found. XML documentation may be incomplete.\n"); #endif /* HAVE_LIBXSLT */ + /* Optimize for XPath */ + xmlXPathOrderDocElems(doc); + return (struct ast_xml_doc *) doc; } |