Changeset 37daa37bbc546da8db4d76945b9c4b523e02d77b

Timestamp:

09/21/09 00:10:13 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[d9fd356e6dcff42e03b313c5d8753a6dff82f36d]

git-author:

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

Message:

online configuration filters, refs #182

Files:

• src/noit_conf.h (modified) (1 diff)
• src/noit_conf_checks.c (modified) (11 diffs)
• src/noit_conf_checks.h (modified) (1 diff)
• src/noit_filters.c (modified) (7 diffs)

src/noit_conf.h

@@ -47 +47 @@
-  char *path;
-  uuid_t current_check;
+  char filter_name[50];
-  char prompt[50];
-} noit_conf_t_userdata_t;

src/noit_conf_checks.c

@@ -1 @@
-
-/*
- * Copyright (c) 2007, OmniTI Computer Consulting, Inc.
@@ -45 +44 @@
-#include "noit_conf.h"
-#include "noit_conf_private.h"
+#include "noit_conf_checks.h"
-#include "noit_check.h"
-#include "noit_check_tools.h"
@@ -53 +53 @@
-
-static void register_console_config_commands();
-static int noit_console_config_cd(noit_console_closure_t ncct,
-                                  int argc, char **argv,
-                                  noit_console_state_t *state, void *closure);
-
-static struct _valid_attr_t {
@@ -71 +68 @@
-  { "/checks", "filterset", "@filterset", 0 },
-  { "/checks", "module", "@module", 1 },
-/filterset", "target", "@target", 1
-/filterset", "module", "@module", 1
-/filterset", "name", "@name", 1
-/filterset", "metric", "@metric", 1
+", "target", "@target", 0
+", "module", "@module", 0
+", "name", "@name", 0
+", "metric", "@metric", 0
-};
-
-void
-noit_console_state_add_check_attrs(noit_console_state_t *state,
-
+
+
-  int i;
-  for(i = 0;
-      i < sizeof(valid_attrs)/sizeof(valid_attrs[0]);
-      i++) {
+    if(strcmp(valid_attrs[i].scope, scope)) continue;
-    noit_console_state_add_cmd(state,
-      NCSCMD(valid_attrs[i].name, f, NULL,
@@ -90 +89 @@
-}
-static noit_hash_table check_attrs = NOIT_HASH_EMPTY;
+
-void noit_conf_checks_init(const char *toplevel) {
-  int i;
@@ -265 +265 @@
-    uuid_t out;
-    creating_new = noit_true;
+    if(strncmp(info->path, "/checks/", strlen("/checks/")) &&
+       strcmp(info->path, "/checks")) {
+      nc_printf(ncct, "New checks must be under /checks/\n");
+      return -1;
+    }
-    if(noit_conf_mkcheck_under(info->path, argc - 1, argv + 1, out)) {
-      nc_printf(ncct, "Error creating new check\n");
@@ -621 +626 @@
-    return -1;
-  }
+  if(!strcmp(argv[0], "filterset")) {
+    nc_printf(ncct, "use 'filterset' to create checks\n");
+    return -1;
+  }
-  if(!strcmp(argv[0], "config")) {
-    nc_printf(ncct, "use 'config' to set check config options\n");
@@ -698 +707 @@
-}
-
-static 
+
-noit_console_config_cd(noit_console_closure_t ncct,
-                       int argc, char **argv,
@@ -875 +884 @@
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
-    if(!strcmp((char *)node->name, "check")) continue;
+    if(!strcmp((char *)node->name, "filterset")) continue;
-    if(!strcmp((char *)xmlGetNodePath(node) + cliplen, "config")) continue;
-    if(!(node->children && node->children == xmlGetLastChild(node) &&
@@ -886 +896 @@
-  for(i=0; i<cnt; i++) {
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      int busted = 1;
-      xmlAttr *attr;
@@ -1320 +1343 @@
-  /* attribute <attrname> <value> */
-  NEW_STATE(_attr_state);
-
+
+
- 
-  /* no attribute <attrname> <value> */
-  NEW_STATE(_uattr_state);
-
+
+
-
-  NEW_STATE(_unset_state);

src/noit_conf_checks.h

@@ -38 +38 @@
-#include "noit_console.h"
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#endif

src/noit_filters.c

@@ -34 +34 @@
-
-#include "utils/noit_hash.h"
+#include "utils/noit_atomic.h"
-#include "noit_conf.h"
-#include "noit_check.h"
+#include "noit_conf_checks.h"
-#include "noit_filters.h"
-
-#include <pcre.h>
+#include <assert.h>
+#include <libxml/tree.h>
-
-static noit_hash_table *filtersets = NULL;
+static pthread_mutex_t filterset_lock;
+#define LOCKFS() pthread_mutex_lock(&filterset_lock)
+#define UNLOCKFS() pthread_mutex_unlock(&filterset_lock)
-
-typedef enum { NOIT_FILTER_ACCEPT, NOIT_FILTER_DENY } noit_ruletype_t;
@@ -57 +64 @@
-
-typedef struct {
+  noit_atomic32_t ref_cnt;
-  char *name;
-  filterrule_t *rules;
-} filterset_t;
-
-void
-noit_refresh_filtersets(noit_console_closure_t ncct,
-                        noit_conf_t_userdata_t *info) {
-  noit_filters_init();
-  nc_printf(ncct, "Reloaded %d filtersets.\n",
-            filtersets ? filtersets->size : 0);
-}
-
-#define FRF(r,a) do { \
@@ -87 +87 @@
-  filterset_t *fs = vp;
-  filterrule_t *r;
+  if(noit_atomic_dec32(&fs->ref_cnt) != 0) return;
+  noitL(noit_error, "Freeing filterset [%d]: %s\n", fs->ref_cnt, fs->name);
-  while(fs->rules) {
-    r = fs->rules->next;
@@ -96 +98 @@
-}
-void
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      continue;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-#define RULE_COMPILE(rname) do { \
-  if(noit_conf_get_stringbuf(rules[j], "@" #rname, buffer, sizeof(buffer))) { \
@@ -152 +148 @@
-} while(0)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  free(sets);
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -187 +199 @@
-  if(!filtersets || !filterset) return noit_true;
-
+  LOCKFS();
-  if(noit_hash_retrieve(filtersets, filterset, strlen(filterset), &vfs)) {
-    filterset_t *fs = (filterset_t *)vfs;
-    filterrule_t *r;
+    noit_atomic_inc32(&fs->ref_cnt);
+    UNLOCKFS();
-#define MATCHES(rname, value) noit_apply_filterrule(r->rname, r->rname##_e, value)
-    for(r = fs->rules; r; r = r->next) {
@@ -198 +213 @@
-        return (r->type == NOIT_FILTER_ACCEPT) ? noit_true : noit_false;
-    }
-
+
+
+
-  return noit_true;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+