Changeset caa7b86e0a2913bf4f9e3254320a05dd636b2e06

Timestamp:

01/26/08 20:48:28 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[2c65def60e6630d515d47a2135e89e7961c4c5b9]

git-author:

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

Message:

glue up some actual XML

Files:

• src/eventer/eventer.c (modified) (2 diffs)
• src/eventer/eventer.h (modified) (1 diff)
• src/noit_conf.c (modified) (8 diffs)
• src/noit_conf.h (modified) (2 diffs)
• src/noit_console.c (modified) (1 diff)
• src/noit_console.h (modified) (1 diff)
• src/noit_listener.c (modified) (4 diffs)
• src/noit_listener.h (modified) (1 diff)
• src/noit_module.c (modified) (1 diff)
• src/noit_module.h (modified) (2 diffs)
• src/noitd.c (modified) (3 diffs)
• src/sample.conf (added)

src/eventer/eventer.c

@@ -2 +2 @@
-#include "eventer/eventer_impl.h"
-#include "eventer/eventer_POSIX_fd_opset.h"
+#include "utils/noit_hash.h"
-
-eventer_t eventer_alloc() {
@@ -27 +28 @@
-}
-
+static noit_hash_table __name_to_func = NOIT_HASH_EMPTY;
+static noit_hash_table __func_to_name = NOIT_HASH_EMPTY;
+int eventer_name_callback(const char *name, eventer_func_t f) {
+  noit_hash_replace(&__name_to_func, strdup(name), strlen(name), f, free, NULL);
+  noit_hash_replace(&__func_to_name, (char *)f, sizeof(f), strdup(name),
+                    NULL, free);
+  return 0;
+}
+eventer_func_t eventer_callback_for_name(const char *name) {
+  eventer_func_t f;
+  if(noit_hash_retrieve(&__name_to_func, name, strlen(name), (void **)&f))
+    return f;
+  return (eventer_func_t)NULL;
+}
+const char *eventer_name_for_callback(eventer_func_t f) {
+  const char *name;
+  if(noit_hash_retrieve(&__func_to_name, (char *)f, sizeof(f), (void **)&name))
+    return name;
+  return NULL;
+}
+
-int eventer_choose(const char *name) {
-  eventer_impl_t choice;

src/eventer/eventer.h

@@ -53 +53 @@
-API_EXPORT(void)      eventer_free(eventer_t);
-API_EXPORT(int)       eventer_timecompare(void *a, void *b);
+API_EXPORT(int)       eventer_name_callback(const char *name, eventer_func_t f);
+API_EXPORT(const char *)
+                      eventer_name_for_callback(eventer_func_t f);
+API_EXPORT(eventer_func_t)
+                      eventer_callback_for_name(const char *name);
-
-typedef struct _eventer_impl {

src/noit_conf.c

@@ -5 +5 @@
-
-#include "noit_defines.h"
+
-#include <stdio.h>
+#include <assert.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
-#include "noit_conf.h"
-#include "utils/noit_hash.h"
@@ -11 +17 @@
-/* tmp hash impl, replace this with something nice */
-static noit_hash_table _tmp_config = NOIT_HASH_EMPTY;
-
+
+
-
-static noit_hash_table _compiled_fallback = NOIT_HASH_EMPTY;
@@ -38 +45 @@
-                    (void *)strdup(config_info[i].val));
-  }
+  xmlInitParser();
+  xmlXPathInit();
-}
-
-int noit_conf_load(const char *path) {
+  xmlDocPtr new_config;
+  new_config = xmlParseFile(path);
+  if(new_config) {
+    if(master_config) xmlFreeDoc(master_config);
+    if(xpath_ctxt) xmlXPathFreeContext(xpath_ctxt);
+
+    master_config = new_config;
+    xpath_ctxt = xmlXPathNewContext(master_config);
+    return 0;
+  }
-  return -1;
-}
@@ -47 +66 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  if(noit_hash_retrieve(&_compiled_fallback,
-                        path, strlen(path), (void **)&str)) {
+    *value = str;
+    goto found;
+  }
+  return 0;
+ found:
+  if(current_ctxt && current_ctxt != xpath_ctxt)
+    xmlXPathFreeContext(current_ctxt);
+  return 1;
+}
+int noit_conf_get_string(noit_conf_section_t section,
+                         const char *path, char **value) {
+  char *str;
+  if(_noit_conf_get_string(section,path,&str)) {
-    *value = strdup(str);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  noit_hash_replace(&_tmp_config,
-                    strdup(path), strlen(path), (void *)strdup(value),
@@ -65 +179 @@
-  return 1;
-}
-
+
+
-  char *str;
-  long longval;
-path, 
+section,path,
-    int base = 10;
-    if(str[0] == '0') {
@@ -81 +196 @@
-  return 0;
-}
-
+
+
-  char buffer[32];
-  snprintf(buffer, 32, "%d", value);
-
-
-
-
-
+
+
+
+
+
+
-    *value = atof(str);
-    free(str);
@@ -95 +212 @@
-  return 0;
-}
-
+
+
-  char buffer[32];
-  snprintf(buffer, 32, "%f", value);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    free(str);
-    return 1;
@@ -110 +229 @@
-  return 0;
-}
-
-
-
-
-
-
+
+
+
+
+
+
+

src/noit_conf.h

@@ -9 +9 @@
-#include "noit_defines.h"
-
-
+
+
-
-API_EXPORT(void) noit_conf_init();
@@ -15 +16 @@
-API_EXPORT(int) noit_conf_save(const char *path);
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#endif

src/noit_console.c

@@ -9 +9 @@
-#include <unistd.h>
-
+#include "eventer/eventer.h"
-#include "utils/noit_log.h"
-#include "noit_listener.h"
-#include "noit_poller.h"
+#include "noit_console.h"
+
+void
+noit_console_init() {
+  eventer_name_callback("noit_console", noit_console_handler);
+}
-
-int

src/noit_console.h

@@ -10 +10 @@
-#include "eventer/eventer.h"
-
-
-
-
+
+
+
+
+
-
-#endif

src/noit_listener.c

@@ -17 +17 @@
-#include "utils/noit_log.h"
-#include "noit_listener.h"
+#include "noit_conf.h"
-
-static int
@@ -71 +72 @@
-    struct sockaddr_in6 addr6;
-  } s;
+  const char *event_name;
-
+  noit_log(noit_debug, NULL, "noit_listener(%s, %d, %d, %d, %s, %p)\n",
+           host, port, type, backlog,
+           (event_name = eventer_name_for_callback(handler))?event_name:"??",
+           closure);
-  family = AF_INET;
-  rv = inet_pton(family, host, &a);
@@ -78 +84 @@
-    rv = inet_pton(family, host, &a);
-    if(rv != 1) {
-
-
+
+
+
+
+
+
+
-    }
-  }
@@ -133 +144 @@
-  return 0;
-}
+
+void
+noit_listener_init() {
+  int i, cnt = 0;
+  noit_conf_section_t *listener_configs;
+
+  listener_configs = noit_conf_get_sections(NULL, "/global/listeners/listener",
+                                            &cnt);
+  noit_log(noit_stderr, NULL, "Found %d /global/listeners/listener stanzas\n",
+           cnt);
+  for(i=0; i<cnt; i++) {
+    char address[256];
+    char type[256];
+    unsigned short port;
+    int portint;
+    int backlog;
+    eventer_func_t f;
+
+    if(!noit_conf_get_stringbuf(listener_configs[i],
+                                "type", type, sizeof(type))) {
+      noit_log(noit_stderr, NULL,
+               "No type specified in listener stanza %d\n", i+1);
+      continue;
+    }
+    f = eventer_callback_for_name(type);
+    if(!f) {
+      noit_log(noit_stderr, NULL,
+               "Cannot find handler for listener type: '%s'\n", type);
+      continue;
+    }
+    if(!noit_conf_get_int(listener_configs[i], "port", &portint))
+      portint = 0;
+    port = (unsigned short) portint;
+    if(portint == 0 || (port != portint)) {
+      noit_log(noit_stderr, NULL,
+               "Invalid port [%d] specified in stanza %d\n", port, i+1);
+      continue;
+    }
+    if(!noit_conf_get_stringbuf(listener_configs[i],
+                                "address", address, sizeof(address))) {
+      address[0] = '*';
+      address[1] = '\0';
+    }
+    if(!noit_conf_get_int(listener_configs[i], "backlog", &backlog))
+      backlog = 5;
+
+    noit_listener(address, port, SOCK_STREAM, backlog, f, NULL);
+  }
+}

src/noit_listener.h

@@ -17 +17 @@
-} * listener_closure_t;
-
-
+
+
+
-noit_listener(char *host, unsigned short port, int type,
-              int backlog, eventer_func_t handler, void *closure);

src/noit_module.c

@@ -5 +5 @@
-
-#include "noit_defines.h"
+
+#include <stdio.h>
+#include <dlfcn.h>
+
-#include "noit_module.h"
+#include "noit_conf.h"
-#include "utils/noit_hash.h"
+#include "utils/noit_log.h"
-
-static noit_hash_table modules = NOIT_HASH_EMPTY;
-
-int noit_module_load(const char *file, const char *name) {
+  char module_file[PATH_MAX];
+  char *base;
+  void *dlhandle;
+  void *dlsymbol;
+  noit_module_t *module;
+
+  if(!noit_conf_get_string("/global/modules/directory", &base))
+    base = strdup("");
+
+  if(file[0] == '/')
+    strlcpy(module_file, file, sizeof(module_file));
+  else
+    snprintf(module_file, sizeof(module_file), "%s/%s.%s",
+             base, name, MODULEEXT);
+  free(base);
+
+  dlhandle = dlopen(module_file, RTLD_LAZY | RTLD_GLOBAL);
+  if(!dlhandle) {
+    noit_log(noit_stderr, NULL, "Cannot open image '%s': %s\n",
+             module_file, dlerror());
+    return -1;
+  }
+
+  dlsymbol = dlsym(dlhandle, name);
+  if(!dlsymbol) {
+    noit_log(noit_stderr, NULL, "Cannot find '%s' in image '%s': %s\n",
+             name, module_file, dlerror());
+    dlclose(dlhandle);
+    return -1;
+  }
+
+  module = (noit_module_t *)dlsymbol;
+  if(noit_module_validate_magic(module) == -1) {
+    noit_log(noit_stderr, NULL, "I can't understand module %s\n", name);
+    dlclose(dlhandle);
+    return -1;
+  }
+
+  noit_hash_store(&modules, module->name, strlen(module->name), module);
+  return 0;
-}
+
-noit_module_t * noit_module_lookup(const char *name) {
-  noit_module_t *module;

src/noit_module.h

@@ -11 +11 @@
-#include "noit_poller.h"
-
+#define NOIT_MODULE_MAGIC 0x4017DA7A
+
-typedef struct {
+  uint32_t magic;
+  uint32_t version;
-  char *name;
-  char *description;
@@ -20 +24 @@
-} noit_module_t;
-
+#define MODULE_MAGIC(a)          ((a)->magic)
+#define MODULE_VERSION(a)        ((a)->version)
+
+#define noit_module_validate_magic(a) \
+  ((MODULE_MAGIC(a) == NOIT_MODULE_MAGIC)?0:-1)
+
-API_EXPORT(int)
-  noit_module_load(const char *file, const char *name);

src/noitd.c

@@ -8 +8 @@
-#include <fcntl.h>
-
-#include "getopt_long.h"
-#include "eventer/eventer.h"
-#include "utils/noit_log.h"
@@ -35 +34 @@
-
-int main(int argc, char **argv) {
+  char conf_str[1024];
-  parse_clargs(argc, argv);
-
+  /* First initialize logging, so we can log errors */
-  noit_log_init();
-  if(debug)
@@ -42 +43 @@
-  noit_log_stream_add_stream(noit_error, noit_stderr);
-
+  /* Next load the configs */
-  noit_conf_init();
-  if(noit_conf_load(config_file) == -1) {
-    fprintf(stderr, "Cannot load config: '%s'\n", config_file);
-  }
-
-
+
+
+
+
+
+
+
+
+
+
-    exit(-1);
-  }
-  if(eventer_init() == -1) {
-fprintf(stderr, "Cannot init kqueue\n"
+noit_log(noit_stderr, NULL, "Cannot init eventer %s\n", conf_str
-    exit(-1);
-  }
+  noit_console_init();
-
-
+
+
-  eventer_loop();
-  return 0;