Changeset c39dbcdedc357e87352f7eb1438aa96afdcbd09e

Timestamp:

05/31/08 17:43:01 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[6390014a64eb9ab5483bc88e66779b6c0ef7a20d]

git-author:

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

Message:

make the loading mechanism generic so that we can load something other than checkers. refs #28

Files:

• src/modules/http.c (modified) (4 diffs)
• src/modules/ping_icmp.c (modified) (2 diffs)
• src/modules/postgres.c (modified) (2 diffs)
• src/modules/snmp.c (modified) (2 diffs)
• src/modules/ssh2.c (modified) (2 diffs)
• src/noit_check.c (modified) (2 diffs)
• src/noit_module.c (modified) (6 diffs)
• src/noit_module.h (modified) (3 diffs)

src/modules/http.c

@@ -880 +880 @@
-}
-
-modul
+imag
-  apr_initialize();
-  atexit(apr_terminate);
@@ -894 +894 @@
-}
-noit_module_t http = {
-
-
-
-
-
+
+
+
+
+
+
+
-  serf_config,
-  serf_init,
@@ -906 +908 @@
-
-noit_module_t resmon = {
-
-
-
-
-
+
+
+
+
+
+
+
-  resmon_config,
-  serf_init,
@@ -918 +922 @@
-
-noit_module_t resmon_part = {
-
-
-
-
-
+
+
+
+
+
+
+
-  resmon_config,
-  serf_init,

src/modules/ping_icmp.c

@@ -501 +501 @@
-}
-
-modul
+imag
-  nlerr = noit_log_stream_find("error/ping_icmp");
-  nldeb = noit_log_stream_find("debug/ping_icmp");
@@ -511 +511 @@
-}
-noit_module_t ping_icmp = {
-
-
-
-
-
+
+
+
+
+
+
+
-  ping_icmp_config,
-  ping_icmp_init,

src/modules/postgres.c

@@ -226 +226 @@
-}
-
-modul
+imag
-  nlerr = noit_log_stream_find("error/postgres");
-  nldeb = noit_log_stream_find("debug/postgres");
@@ -237 +237 @@
-
-noit_module_t postgres = {
-
-
-
-
-
+
+
+
+
+
+
+
-  NULL,
-  NULL,

src/modules/snmp.c

@@ -455 +455 @@
-  return 0;
-}
-modul
+imag
-  nlerr = noit_log_stream_find("error/snmp");
-  nldeb = noit_log_stream_find("debug/snmp");
@@ -466 +466 @@
-}
-noit_module_t snmp = {
-
-
-
-
-
+
+
+
+
+
+
+
-  noit_snmp_config,
-  noit_snmp_init,

src/modules/ssh2.c

@@ -289 +289 @@
-}
-
-modul
+imag
-  nlerr = noit_log_stream_find("error/ssh2");
-  nldeb = noit_log_stream_find("debug/ssh2");
@@ -301 +301 @@
-
-noit_module_t ssh2 = {
-
-
-
-
-
+
+
+
+
+
+
+
-  ssh2_config,
-  ssh2_init,

src/noit_check.c

@@ -208 +208 @@
-    noit_module_t *mod;
-    mod = noit_module_lookup(check->module);
-
+ && mod->initiate_check
-      if(NOIT_CHECK_LIVE(check))
-        continue;
-      if((check->flags & NP_DISABLED) == 0) {
-
-
+
-      }
-      else
@@ -715 +714 @@
-          dep->check->target, dep->check->name,
-          check->target, check->name);
-
+
+
+
-  }
-}

src/noit_module.c

@@ -14 +14 @@
-#include "utils/noit_log.h"
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  void *userdata;
-};
-
+static noit_hash_table loaders = NOIT_HASH_EMPTY;
-static noit_hash_table modules = NOIT_HASH_EMPTY;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  char module_file[PATH_MAX];
-  char *base;
-  void *dlhandle;
-  void *dlsymbol;
-module_t *module
+image_t *obj
-
-  if(!noit_conf_get_string(NULL, "/noit/modules/@directory", &base))
@@ -52 +101 @@
-  }
-
-noit_module_validate_magic((noit_module_t *)
-modul
+validate(
+imag
-    dlclose(dlhandle);
-    return -1;
-  }
-
-module = calloc(1, sizeof(*module)
-module, dlsymbol, sizeof(*module)
-module->opaque_handle = calloc(1, sizeof(struct __extended_modul
-
-module->onload(module
-module
-
-
-&modules, module->name, strlen(module->name), module
+obj = calloc(1, obj_size
+obj, dlsymbol, obj_size
+obj->opaque_handle = calloc(1, sizeof(struct __extended_imag
+
+obj->onload && obj->onload(obj
+obj
+
+
+registry, obj->name, strlen(obj->name), obj
-  return 0;
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -83 +162 @@
-  int i, cnt = 0;
-
+  /* Load our module loaders */
+  sections = noit_conf_get_sections(NULL, "/noit/modules//loader", &cnt);
+  for(i=0; i<cnt; i++) {
+    char loader_name[256];
+    noit_module_loader_t *loader;
+
+    if(!noit_conf_get_stringbuf(sections[i], "ancestor-or-self::node()/@name",
+                                loader_name, sizeof(loader_name))) {
+      noitL(noit_stderr, "No name defined in loader stanza %d\n", i+1);
+      continue;
+    }
+    loader = noit_load_loader_image(&__noit_image_loader, loader_name,
+                                    sections[i]);
+    if(!loader) {
+      noitL(noit_stderr, "Failed to load loader %s\n", loader_name);
+      continue;
+    }
+  }
+  if(sections) free(sections);
+
+  /* Load the modules */
-  sections = noit_conf_get_sections(NULL, "/noit/modules//module", &cnt);
-  if(!sections) return;
-  for(i=0; i<cnt; i++) {
+    noit_module_loader_t *loader = &__noit_image_loader;
-    noit_hash_table *config;
-    noit_module_t *module;
-module_file[PATH_MAX
+loader_name[256
-    char module_name[256];
-
-
-
-
-
+
+
-    if(!noit_conf_get_stringbuf(sections[i], "ancestor-or-self::node()/@name",
-                                module_name, sizeof(module_name))) {
@@ -100 +198 @@
-      continue;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      continue;
-    }
-    config = noit_conf_get_hash(sections[i], "config");
-    module = noit_module_lookup(module_name);
-    if(module->config) {
-      int rv;
@@ -118 +229 @@
-      else if(rv < 0) {
-        noitL(noit_stderr,
-:%s\n", module_file
+\n"
-        continue;
-      }
@@ -124 +235 @@
-    if(module->init && module->init(module)) {
-      noitL(noit_stderr,
-
-
-
-
-
+
+
+
+
-  }
-  free(sections);
-}
-
-
-
-emd = (struct __extended_module_data *)mod->opaque_handle;
-
-
-
-
-
-
-
-
+
+
+return ((struct __extended_image_data *)mod->field)->userdata; \
+
+
+
+
+
+
+
+

src/noit_module.h

@@ -11 +11 @@
-#include "noit_check.h"
-
-MODULE_MAGIC         0x4017DA7A
-MODULE_ABI_VERSION   1
+LOADER_MAGIC         0xA7AD7104
+LOADER_ABI_VERSION   2
-
-modul
+imag
-  uint32_t magic;
-  uint32_t version;
-  char *name;
-  char *description;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  int (*config)(struct _noit_module *, noit_hash_table *options);
-  int (*init)(struct _noit_module *);
@@ -25 +40 @@
-                        int once, noit_check_t *cause);
-  void (*cleanup)(struct _noit_module *, noit_check_t *);
-  void *opaque_handle;
-} noit_module_t;
-
-
-
-
-
-
+
+
-
-API_EXPORT(void)
@@ -42 +53 @@
-
-API_EXPORT(void *)
+  noit_image_get_userdata(noit_image_t *mod);
+API_EXPORT(void)
+  noit_image_set_userdata(noit_image_t *mod, void *newdata);
+API_EXPORT(void *)
+  noit_module_loader_get_userdata(noit_module_loader_t *mod);
+API_EXPORT(void)
+  noit_module_loader_set_userdata(noit_module_loader_t *mod, void *newdata);
+API_EXPORT(void *)
-  noit_module_get_userdata(noit_module_t *mod);
-API_EXPORT(void)
-  noit_module_set_userdata(noit_module_t *mod, void *newdata);
-
+
-#endif