Changeset 4dccf830640c308658d62f7896f78488734381bc

Timestamp:

02/24/08 16:05:26 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1203869126 +0000

git-parent:

[c04dcf560cc5f0df021d665247f1b6d34352c166]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1203869126 +0000

Message:

xpointer-esque inheritence... actually quite neat

Files:

• src/noit_check.c (modified) (1 diff)
• src/noit_conf.c (modified) (4 diffs)
• src/noit_listener.c (modified) (1 diff)
• src/noit_module.c (modified) (1 diff)
• src/noitd.c (modified) (1 diff)
• src/sample.conf (modified) (2 diffs)

src/noit_check.c

@@ -158 +158 @@
-      timeout = period/2;
-    }
-ancestor-or-self::node()/config/*
+config
-
-    INHERIT(boolean, disable, &disabled);

src/noit_conf.c

@@ -76 +76 @@
-}
-
-
-
+
+
+
-  int i, cnt;
-  noit_hash_table *table = NULL;
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr current_ctxt;
@@ -94 +94 @@
-  if(pobj->type != XPATH_NODESET) goto out;
-  if(xmlXPathNodeSetIsEmpty(pobj->nodesetval)) goto out;
-  table = calloc(1, sizeof(*table));
-  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
-  for(i=0; i<cnt; i++) {
@@ -108 +107 @@
-  if(current_ctxt && current_ctxt != xpath_ctxt)
-    xmlXPathFreeContext(current_ctxt);
+}
+void noit_conf_get_into_hash(noit_conf_section_t section,
+                             const char *path,
+                             noit_hash_table *table) {
+  int cnt;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr current_ctxt;
+  xmlNodePtr current_node = (xmlNodePtr)section;
+  xmlNodePtr node, parent_node;
+  char xpath_expr[1024];
+  char *inheritid;
+
+  current_ctxt = xpath_ctxt;
+  if(current_node) {
+    current_ctxt = xmlXPathNewContext(master_config);
+    current_ctxt->node = current_node;
+  }
+  if(path[0] == '/')
+    strlcpy(xpath_expr, path, sizeof(xpath_expr));
+  else
+    snprintf(xpath_expr, sizeof(xpath_expr),
+             "ancestor-or-self::node()/%s", path);
+  pobj = xmlXPathEval((xmlChar *)xpath_expr, current_ctxt);
+  if(!pobj) goto out;
+  if(pobj->type != XPATH_NODESET) goto out;
+  if(xmlXPathNodeSetIsEmpty(pobj->nodesetval)) goto out;
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  /* These are in the order of root to leaf
+   * We want to recurse... apply:
+   *   1. our parent's config
+   *   2. our "inherit" config if it exists.
+   *   3. our config.
+   */
+  node = xmlXPathNodeSetItem(pobj->nodesetval, cnt-1);
+  /* 1. */
+  if(cnt > 1) {
+    parent_node = xmlXPathNodeSetItem(pobj->nodesetval, cnt-2);
+    noit_conf_get_into_hash(parent_node, (const char *)node->name, table);
+  }
+  /* 2. */
+  inheritid = (char *)xmlGetProp(node, (xmlChar *)"inherit");
+  if(inheritid) {
+    snprintf(xpath_expr, sizeof(xpath_expr), "//*[@id=\"%s\"]", inheritid);
+    noit_conf_get_into_hash(NULL, xpath_expr, table);
+  }
+  /* 3. */
+  noit_conf_get_elements_into_hash(node, "*", table);
+
+ out:
+  if(pobj) xmlXPathFreeObject(pobj);
+  if(current_ctxt && current_ctxt != xpath_ctxt)
+    xmlXPathFreeContext(current_ctxt);
+}
+noit_hash_table *noit_conf_get_hash(noit_conf_section_t section,
+                                    const char *path) {
+  noit_hash_table *table = NULL;
+
+  table = calloc(1, sizeof(*table));
+  noit_conf_get_into_hash(section, path, table);
-  return table;
-}
@@ -1296 +1354 @@
-    }
-
-    noitL(noit_debug, "[%d] configuring log %s[%s:%s]\n", i, name, type, path);
-
-    if(noit_conf_get_boolean(log_configs[i],
-                             "ancestor-or-self::node()/@disabled",

src/noit_listener.c

@@ -294 +294 @@
-      backlog = 5;
-
-/*
-/*
+
+
-
-    noit_listener(address, port, SOCK_STREAM, backlog,

src/noit_module.c

@@ -104 +104 @@
-      continue;
-    }
-ancestor-or-self::node()/config/*
+config
-    module = noit_module_lookup(module_name);
-    if(module->config && module->config(module, config)) {

src/noitd.c

@@ -39 +39 @@
-  int rv = 0;
-  noit_hash_table *table;
-/*
+
-  if(table) {
-    noit_hash_iter iter = NOIT_HASH_ITER_ZERO;

src/sample.conf

@@ -82 +82 @@
-      </resmon>
-      <switches module="snmp" period="30000">
-
+
+
+
+
+
+
+
+
+
+
+
-          <oid_description>IF-MIB::ifDescr.%[name]</oid_description>
-          <oid_alias>IF-MIB::ifAlias.%[name]</oid_alias>
@@ -98 +108 @@
-          <oid_innucastpkts>IF-MIB::ifInNUcastPkts.%[name]</oid_innucastpkts>
-          <oid_outnucastpkts>IF-MIB::ifOutNUcastPkts.%[name]</oid_outnucastpkts>
-
-
-
-
-
-
-
-
-
+
+
-</noit>