public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: master - xmlconfig: major rework
@ 2008-11-19 10:35 Fabio M. Di Nitto
0 siblings, 0 replies; only message in thread
From: Fabio M. Di Nitto @ 2008-11-19 10:35 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=08ad05091ab2b390feb68944e46ffbcb12cec247
Commit: 08ad05091ab2b390feb68944e46ffbcb12cec247
Parent: bf240100dc6e654489f151713bd140d5715c4845
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed Nov 19 11:30:46 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Nov 19 11:30:46 2008 +0100
xmlconfig: major rework
cleanup completely our dependency on xpath.
use XML internal data structure to get objects and keys associated to
objects.
speed up the whole config load time a lot.
remote completely all exception handling that's now done using xml data
instead.
considerably reduce the amount of memory required to load the config.
cleanup other bits (drop unrequired includes and invoke some XML cleanup
code).
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
config/plugins/xml/config.c | 289 +++++++++----------------------------------
1 files changed, 61 insertions(+), 228 deletions(-)
diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
index 50a9172..9da448b 100644
--- a/config/plugins/xml/config.c
+++ b/config/plugins/xml/config.c
@@ -1,12 +1,7 @@
#include <string.h>
-#include <limits.h>
#include <syslog.h>
-#include <arpa/inet.h>
-#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
#include <corosync/lcr/lcr_comp.h>
#include <corosync/engine/objdb.h>
@@ -15,8 +10,10 @@
#include "logging.h"
static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string);
-static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, char **error_string);
-static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, char *error_string);
+static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush,
+ char **error_string);
+static int init_config(struct objdb_iface_ver0 *objdb, char *configfile,
+ char *error_string);
static char error_reason[1024];
#define DEFAULT_CONFIG DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE
@@ -26,235 +23,71 @@ static char error_reason[1024];
*/
static struct config_iface_ver0 xmlconfig_iface_ver0 = {
- .config_readconfig = xml_readconfig,
- .config_reloadconfig = xml_reloadconfig
+ .config_readconfig = xml_readconfig,
+ .config_reloadconfig = xml_reloadconfig
};
static struct lcr_iface ifaces_ver0[2] = {
{
- .name = "xmlconfig",
- .version = 0,
- .versions_replace = 0,
- .versions_replace_count = 0,
- .dependencies = 0,
- .dependency_count = 0,
- .constructor = NULL,
- .destructor = NULL,
- .interfaces = NULL,
- }
+ .name = "xmlconfig",
+ .version = 0,
+ .versions_replace = 0,
+ .versions_replace_count = 0,
+ .dependencies = 0,
+ .dependency_count = 0,
+ .constructor = NULL,
+ .destructor = NULL,
+ .interfaces = NULL,
+ }
};
static struct lcr_comp xml_comp_ver0 = {
- .iface_count = 1,
- .ifaces = ifaces_ver0,
+ .iface_count = 1,
+ .ifaces = ifaces_ver0,
};
-__attribute__ ((constructor)) static void xml_comp_register(void) {
+__attribute__ ((constructor))
+static void xml_comp_register(void)
+{
lcr_interfaces_set(&ifaces_ver0[0], &xmlconfig_iface_ver0);
lcr_component_register(&xml_comp_ver0);
};
-static char *do_xml_query(xmlXPathContextPtr ctx, char *query, char **previous_query, int *xmllistindex, int list) {
- xmlXPathObjectPtr obj = NULL;
- xmlNodePtr node = NULL;
- char *rtn = NULL;
- int size = 0, nnv = 0, child = 0;
-
- if (list && !strcmp(query, *previous_query)) {
- *xmllistindex = *xmllistindex + 1;
- } else {
- memset(*previous_query, 0, PATH_MAX);
- *xmllistindex = 0;
- }
-
- obj = xmlXPathEvalExpression((xmlChar *)query, ctx);
- if (obj && obj->nodesetval && (obj->nodesetval->nodeNr > 0)) {
- if (*xmllistindex >= obj->nodesetval->nodeNr) {
- memset(*previous_query, 0, PATH_MAX);
- *xmllistindex = 0;
- goto fail;
- }
-
- node = obj->nodesetval->nodeTab[*xmllistindex];
- if (!node)
- goto fail;
-
- if (((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) ||
- ((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))) {
- if (node->children && node->children->content) {
- size = strlen((char *)node->children->content) +
- strlen((char *)node->name)+2;
- child = 1;
- } else
- size = strlen((char *)node->name)+2;
-
- nnv = 1;
- } else {
- if (node->children && node->children->content)
- size = strlen((char *)node->children->content)+1;
- else
- goto fail;
- }
-
- rtn = malloc(size);
- if (!rtn)
- goto fail;
-
- memset(rtn, 0, size);
-
- if (nnv) {
- if (child)
- sprintf(rtn, "%s=%s", node->name, (char *)node->children->content);
- else
- sprintf(rtn, "%s=", node->name);
- } else
- sprintf(rtn, "%s", node->children ? node->children->content : node->name);
-
- if(list)
- strncpy(*previous_query, query, PATH_MAX-1);
- }
-
-fail:
- if (obj)
- xmlXPathFreeObject(obj);
-
- return rtn;
-}
-
-static int should_alloc(xmlXPathContextPtr ctx, char *key)
+static void addkeys(xmlAttrPtr tmpattr, struct objdb_iface_ver0 *objdb,
+ unsigned int object_handle)
{
- int keyerror = 1, childerr = 1;
- char path[256];
- char previous_query_local[PATH_MAX];
- char *previous_query = previous_query_local;
- int xmllistindex = 0;
- char *str = NULL;
-
- memset(previous_query, 0, PATH_MAX);
- sprintf(path, "%s/@*", key);
- str = do_xml_query(ctx, path, &previous_query, &xmllistindex, 1);
- if (str) {
- keyerror = 0;
- free(str);
- str = NULL;
- }
-
- memset(previous_query, 0, PATH_MAX);
- sprintf(path, "%s/child::*", key);
- str = do_xml_query(ctx, path, &previous_query, &xmllistindex, 1);
- if(str) {
- childerr = 0;
- free(str);
- str = NULL;
+ for (tmpattr = tmpattr; tmpattr; tmpattr = tmpattr->next) {
+ if (tmpattr->type == XML_ATTRIBUTE_NODE)
+ objdb->object_key_create(object_handle,
+ (char *)tmpattr->name,
+ strlen((char *)tmpattr->name),
+ (char *)tmpattr->children->
+ content,
+ strlen((char *)tmpattr->
+ children->content) + 1);
}
-
- if (childerr && keyerror)
- return 0;
-
- return 1;
}
-static int read_config_for(xmlXPathContextPtr ctx, struct objdb_iface_ver0 *objdb, unsigned int parent,
- char *object, char *key, int always_create)
+static void xml2objdb(xmlNodePtr tmpnode, struct objdb_iface_ver0 *objdb,
+ unsigned int parent)
{
- char *str, *prevstr = NULL;
unsigned int object_handle = 0;
- char path[PATH_MAX];
- char previous_query_local[PATH_MAX];
- char *previous_query = previous_query_local;
- int xmllistindex = 0;
- int ret = 0;
- int nodecount = 1;
-
- if (should_alloc(ctx, key) || always_create) {
- objdb->object_create(parent, &object_handle, object, strlen(object));
- }
-
- memset(previous_query, 0, PATH_MAX);
- sprintf(path, "%s/@*", key);
- /* Get the keys */
- for (;;)
- {
- char *equal;
-
- str = do_xml_query(ctx, path, &previous_query, &xmllistindex, 1);
- if (!str)
- break;
-
- ret++;
- equal = strchr(str, '=');
- if (equal)
- {
- *equal = 0;
- objdb->object_key_create(object_handle, str, strlen(str),
- equal+1, strlen(equal+1)+1);
+ for (tmpnode = tmpnode; tmpnode; tmpnode = tmpnode->next) {
+ if (tmpnode->type == XML_ELEMENT_NODE) {
+ objdb->object_create(parent, &object_handle,
+ (char *)tmpnode->name,
+ strlen((char *)tmpnode->name));
+ if (tmpnode->properties)
+ addkeys(tmpnode->properties, objdb,
+ object_handle);
}
- free(str);
+ xml2objdb(tmpnode->children, objdb, object_handle);
}
-
- /* Now look for sub-objects.
- CCS can't cope with recursive queries so we have to store the result of
- the subkey search */
- memset(previous_query, 0, PATH_MAX);
- xmllistindex = 0;
- sprintf(path, "%s/child::*", key);
- for (;;)
- {
- char *equal;
- char subpath[PATH_MAX];
-
- str = do_xml_query(ctx, path, &previous_query, &xmllistindex, 1);
- if (!str)
- break;
-
- ret++;
-
- if(!prevstr) {
- prevstr = strndup(str, (strstr(str, "=") - str));
- } else {
- if(!strncmp(str, prevstr, (strstr(str, "=") - str))) {
- nodecount++;
- } else {
- nodecount = 1;
- free(prevstr);
- prevstr = strndup(str, (strstr(str, "=") - str));
- }
- }
-
- /* CCS returns duplicate values for the numbered entries we use below.
- eg. if there are 4 <clusternode/> entries it will return
- clusternode=
- clusternode=
- clusternode=
- clusternode=
- which is not helpful to us cos we retrieve them as
- clusternode[1]
- clusternode[2]
- clusternode[3]
- clusternode[4]
- so we just store unique keys.
- */
- equal = strchr(str, '=');
- if (equal)
- *equal = 0;
-
- memset(subpath, 0, PATH_MAX);
-
- /* Found a subkey, iterate through it's sub sections */
- sprintf(subpath, "%s/%s[%d]", key, str, nodecount);
- if (!read_config_for(ctx, objdb, object_handle, str, subpath, 0)) {
- free(str);
- break;
- }
-
- free(str);
- }
-
- return ret;
}
-static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, char **error_string)
+static int xml_reloadconfig(struct objdb_iface_ver0 *objdb, int flush,
+ char **error_string)
{
return xml_readconfig(objdb, error_string);
}
@@ -265,28 +98,30 @@ static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string)
char *configfile = DEFAULT_CONFIG;
/* We need to set this up to internal defaults too early */
- openlog("corosync", LOG_CONS|LOG_PID, SYSLOGFACILITY);
+ openlog("corosync", LOG_CONS | LOG_PID, SYSLOGFACILITY);
- if(getenv("COROSYNC_CLUSTER_CONFIG_FILE"))
+ if (getenv("COROSYNC_CLUSTER_CONFIG_FILE"))
configfile = getenv("COROSYNC_CLUSTER_CONFIG_FILE");
/* Read low-level totem/aisexec etc config from cluster.conf */
- if ( !(ret = init_config(objdb, configfile, error_reason)) )
- sprintf (error_reason, "Successfully read config from %s\n", configfile);
+ if (!(ret = init_config(objdb, configfile, error_reason)))
+ sprintf(error_reason, "Successfully read config from %s\n",
+ configfile);
else
- sprintf (error_reason, "Unable to read config from %s\n", configfile);
+ sprintf(error_reason, "Unable to read config from %s\n",
+ configfile);
- *error_string = error_reason;
+ *error_string = error_reason;
return ret;
}
-
-static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, char *error_string)
+static int init_config(struct objdb_iface_ver0 *objdb, char *configfile,
+ char *error_string)
{
int err = 0;
xmlDocPtr doc = NULL;
- xmlXPathContextPtr ctx = NULL;
+ xmlNodePtr root_node = NULL;
/* openfile */
@@ -296,22 +131,20 @@ static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, char *e
goto fail;
}
- ctx = xmlXPathNewContext(doc);
- if (!ctx) {
+ root_node = xmlDocGetRootElement(doc);
+ if (!root_node) {
err = -1;
goto fail;
}
/* load it in objdb */
- read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "cluster", "/cluster", 1);
+ xml2objdb(root_node, objdb, OBJECT_PARENT_HANDLE);
fail:
-
- if (ctx)
- xmlXPathFreeContext(ctx);
-
if (doc)
xmlFreeDoc(doc);
+ xmlCleanupParser();
+
return err;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-19 10:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-19 10:35 cluster: master - xmlconfig: major rework Fabio M. Di Nitto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).