Changeset 71803743714376fc12fb54b3506df6a4c17a8828

Timestamp:

08/04/08 02:12:25 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[3be398539c4bcd0e77acf4390c6dda1635329b58]

git-author:

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

Message:

oh my word... basic function, refs #49

Files:

• src/noit_check.c (modified) (6 diffs)
• src/noit_check.h (modified) (6 diffs)
• src/noit_check_log.c (modified) (5 diffs)
• src/noit_conf_checks.c (modified) (3 diffs)
• src/noit_console.c (modified) (6 diffs)
• src/noit_console.h (modified) (1 diff)
• src/noit_console_state.c (modified) (1 diff)
• src/utils/noit_skiplist.c (modified) (1 diff)

src/noit_check.c

@@ -27 +27 @@
-
-static noit_hash_table polls = NOIT_HASH_EMPTY;
+static noit_skiplist watchlist = { 0 };
-static noit_skiplist polls_by_name = { 0 };
-static u_int32_t __config_load_generation = 0;
@@ -62 +63 @@
-  if((rv = strcmp(ac->name, bc->name)) != 0) return rv;
-  return 0;
+}
+static int __watchlist_compare(const void *a, const void *b) {
+  const noit_check_t *ac = a;
+  const noit_check_t *bc = b;
+  int rv;
+  if((rv = memcmp(ac->checkid, bc->checkid, sizeof(ac->checkid))) != 0) return rv;
+  if(ac->period < bc->period) return -1;
+  if(ac->period == bc->period) return 0;
+  return 1;
-}
-int
@@ -198 +208 @@
-}
-
+int
+noit_check_activate(noit_check_t *check) {
+  noit_module_t *mod;
+  mod = noit_module_lookup(check->module);
+  if(mod && mod->initiate_check && !NOIT_CHECK_LIVE(check)) {
+    if((check->flags & NP_DISABLED) == 0) {
+      mod->initiate_check(mod, check, 0, NULL);
+      return 1;
+    }
+    else
+      noitL(noit_debug, "Skipping %s`%s, disabled.\n",
+            check->target, check->name);
+  }
+  else {
+    noitL(noit_stderr, "Cannot find module '%s'\n", check->module);
+    check->flags |= NP_DISABLED;
+  }
+  return 0;
+}
+
-void
-noit_poller_initiate() {
@@ -206 +236 @@
-  while(noit_hash_next(&polls, &iter, (const char **)key_id, &klen,
-                       (void **)&check)) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-}
@@ -321 +336 @@
-  noit_skiplist_set_compare(&polls_by_name, __check_name_compare,
-                            __check_name_compare);
+  noit_skiplist_init(&watchlist);
+  noit_skiplist_set_compare(&watchlist, __watchlist_compare,
+                            __watchlist_compare);
-  register_console_check_commands();
-  noit_poller_reload(NULL);
+}
+
+noit_check_t *
+noit_check_clone(uuid_t in) {
+  noit_check_t *checker, *new_check;
+  if(noit_hash_retrieve(&polls,
+                        (char *)in, UUID_SIZE,
+                        (void **)&checker) == 0) {
+    return NULL;
+  }
+  if(checker->oncheck) {
+    return NULL;
+  }
+  new_check = calloc(1, sizeof(*new_check));
+  memcpy(new_check, checker, sizeof(*new_check));
+  new_check->target = strdup(new_check->target);
+  new_check->module = strdup(new_check->module);
+  new_check->name = strdup(new_check->name);
+  new_check->filterset = strdup(new_check->filterset);
+  new_check->flags = 0;
+  new_check->fire_event = NULL;
+  memset(&new_check->last_fire_time, 0, sizeof(new_check->last_fire_time));
+  memset(&new_check->stats, 0, sizeof(new_check->stats));
+  new_check->closure = NULL;
+  new_check->config = calloc(1, sizeof(*new_check->config));
+  noit_hash_merge_as_dict(new_check->config, checker->config);
+  return new_check;
+}
+
+noit_check_t *
+noit_check_watch(uuid_t in, int period) {
+  /* First look for a copy that is being watched */
+  noit_check_t n, *f;
+
+  uuid_copy(n.checkid, in);
+  n.period = period;
+
+  f = noit_skiplist_find(&watchlist, &n, NULL);
+  if(f) return f;
+  f = noit_check_clone(in);
+  if(!f) return NULL;
+  f->period = period;
+  f->timeout = period - 1;
+  f->flags |= NP_TRANSIENT;
+  noit_skiplist_insert(&watchlist, f);
+  return f;
+}
+
+noit_check_t *
+noit_check_get_watch(uuid_t in, int period) {
+  noit_check_t n, *f;
+
+  uuid_copy(n.checkid, in);
+  n.period = period;
+
+  f = noit_skiplist_find(&watchlist, &n, NULL);
+  return f;
+}
+
+void
+noit_check_transient_add_feed(noit_check_t *check, const char *feed) {
+  char *feedcopy;
+  if(!check->feeds) {
+    check->feeds = calloc(1, sizeof(*check->feeds));
+    noit_skiplist_init(check->feeds);
+    noit_skiplist_set_compare(check->feeds,
+                              (noit_skiplist_comparator_t)strcmp,
+                              (noit_skiplist_comparator_t)strcmp);
+  }
+  feedcopy = strdup(feed);
+  /* No error on failure -- it's already there */
+  if(noit_skiplist_insert(check->feeds, feedcopy) == NULL) free(feedcopy);
+}
+void
+noit_check_transient_remove_feed(noit_check_t *check, const char *feed) {
+  if(!check->feeds) return;
+  if(feed) noit_skiplist_remove(check->feeds, feed, free);
+  if(check->feeds->size == 0) {
+    noit_skiplist_remove(&watchlist, check, NULL);
+    noit_skiplist_destroy(check->feeds, free);
+    free(check->feeds);
+    check->feeds = NULL;
+    if(check->flags & NP_TRANSIENT) {
+      noitL(noit_debug, "check %s`%s @ %dms has no more listeners.\n",
+            check->target, check->name, check->period);
+      check->flags |= NP_KILLED;
+    }
+  }
-}
-
@@ -385 +491 @@
-  new_check->flags = (new_check->flags & ~mask) | flags;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  }
-  noit_check_log_check(new_check);

src/noit_check.h

@@ -14 +14 @@
-#include "eventer/eventer.h"
-#include "utils/noit_hash.h"
+#include "utils/noit_skiplist.h"
-#include "noit_conf.h"
-#include "noit_console.h"
@@ -34 +35 @@
- */
-
-
-
-
-
+
+
+
+
+
-
-#define NP_UNKNOWN '0'             /* stats_t.{available,state} */
@@ -98 +100 @@
-  u_int32_t period;            /* period of checks in milliseconds */
-  u_int32_t timeout;           /* timeout of check in milliseconds */
-
+, NP_TRANSIENT
-
-  dep_list_t *causal_checks;
@@ -109 +111 @@
-  u_int32_t generation;        /* This can roll, we don't care */
-  void *closure;
+
+  noit_skiplist *feeds;
-} noit_check_t;
-
@@ -152 +156 @@
-
-API_EXPORT(int)
+  noit_check_activate(noit_check_t *check);
+
+API_EXPORT(int)
-  noit_poller_deschedule(uuid_t in);
-
@@ -178 +185 @@
-  noit_stats_snprint_metric(char *b, int l, metric_t *m);
-
+API_EXPORT(noit_check_t *)
+  noit_check_clone(uuid_t in);
+API_EXPORT(noit_check_t *)
+  noit_check_watch(uuid_t in, int period);
+API_EXPORT(noit_check_t *)
+  noit_check_get_watch(uuid_t in, int period);
+API_EXPORT(void)
+  noit_check_transient_add_feed(noit_check_t *check, const char *feed);
+API_EXPORT(void)
+  noit_check_transient_remove_feed(noit_check_t *check, const char *feed);
+
-/* These are from noit_check_log.c */
-API_EXPORT(void) noit_check_log_check(noit_check_t *check);

src/noit_check_log.c

@@ -33 +33 @@
-#define SECPART(a) ((unsigned long)(a)->tv_sec)
-#define MSECPART(a) ((unsigned long)((a)->tv_usec / 1000))
+
+static void
+handle_extra_feeds(noit_check_t *check,
+                   void (*log_f)(noit_log_stream_t ls, noit_check_t *check)) {
+  noit_log_stream_t ls;
+  noit_skiplist_node *curr, *next;
+  const char *feed_name;
+
+  if(!check->feeds) return;
+  curr = next = noit_skiplist_getlist(check->feeds);
+  while(curr) {
+    /* We advance next here (before we try to use curr).
+     * We may need to remove the node we're looking at and that would
+     * disturb the iterator, so advance in advance. */
+    noit_skiplist_next(check->feeds, &next);
+    feed_name = (char *)curr->data;
+    ls = noit_log_stream_find(feed_name);
+    if(ls) log_f(ls, check);
+    else {
+      noit_skiplisti_remove(check->feeds, curr, free);
+    }
+    curr = next;
+  }
+  /* We're done... we may have destroyed the last feed.
+   * that combined with transience means we should kill the check */
+  noit_check_transient_remove_feed(check, NULL);
+}
+
+static void
+_noit_check_log_check(noit_log_stream_t ls,
+                      noit_check_t *check) {
+  struct timeval __now;
+  char uuid_str[37];
+
+  uuid_unparse_lower(check->checkid, uuid_str);
+  gettimeofday(&__now, NULL);
+  noitL(ls, "C\t%lu.%03lu\t%s\t%s\t%s\t%s\n",
+        SECPART(&__now), MSECPART(&__now),
+        uuid_str, check->target, check->module, check->name);
+}
+
-void
-noit_check_log_check(noit_check_t *check) {
-
+
+
+
+
+
+
+
+
+
+
+
-  char uuid_str[37];
-
-
-
+
-  uuid_unparse_lower(check->checkid, uuid_str);
-
-
-
+
+
+
+
-}
-void
-noit_check_log_status(noit_check_t *check) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  char uuid_str[37];
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
@@ -65 +111 @@
-  metric_t *m;
-  stats_t *c;
-  SETUP_LOG(metrics, return);
-
-  uuid_unparse_lower(check->checkid, uuid_str);
@@ -74 +119 @@
-
-    if(!m->metric_value.s) { /* they are all null */
-metrics_log
+ls
-            SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-            m->metric_name, m->metric_type);
@@ -81 +126 @@
-      switch(m->metric_type) {
-        case METRIC_INT32:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, *(m->metric_value.i));
-          break;
-        case METRIC_UINT32:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, *(m->metric_value.I));
-          break;
-        case METRIC_INT64:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, *(m->metric_value.l));
-          break;
-        case METRIC_UINT64:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, *(m->metric_value.L));
-          break;
-        case METRIC_DOUBLE:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, *(m->metric_value.n));
-          break;
-        case METRIC_STRING:
-metrics_log
+ls
-                SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-                m->metric_name, m->metric_type, m->metric_value.s);
@@ -117 +162 @@
-  }
-}
+void
+noit_check_log_metrics(noit_check_t *check) {
+  handle_extra_feeds(check, _noit_check_log_metrics);
+  if(!(check->flags & NP_TRANSIENT)) {
+    SETUP_LOG(metrics, return);
+    _noit_check_log_metrics(metrics_log, check);
+  }
+}
+
-int
-noit_stats_snprint_metric(char *b, int l, metric_t *m) {

src/noit_conf_checks.c

@@ -305 +305 @@
-    }
-    goto out;
+  }
+ out:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return 0;
+}
+static int
+noit_console_watch_check(noit_console_closure_t ncct,
+                         int argc, char **argv,
+                         noit_console_state_t *state, void *closure) {
+  int i, cnt;
+  int adding = (int)closure;
+  int period = 0;
+  char xpath[1024];
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL;
+
+  noit_conf_xml_xpath(NULL, &xpath_ctxt);
+  if(argc < 1 || argc > 2) {
+    nc_printf(ncct, "requires one or two arguments\n");
+    return -1;
+  }
+  /* An alternate period */
+  if(argc == 2) period = atoi(argv[1]);
+
+  if(noit_console_mkcheck_xpath(xpath, sizeof(xpath), NULL,
+                                argc ? argv[0] : NULL)) {
+    nc_printf(ncct, "ERROR: could not find check '%s'\n", argv[0]);
+    return -1;
+  }
+
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    nc_printf(ncct, "no checks found\n");
+    goto out;
+  }
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  for(i=0; i<cnt; i++) {
+    uuid_t checkid;
+    noit_check_t *check;
+    xmlNodePtr node;
+    char *uuid_conf;
+
+    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
+    uuid_conf = (char *)xmlGetProp(node, (xmlChar *)"uuid");
+    if(!uuid_conf || uuid_parse(uuid_conf, checkid)) {
+      nc_printf(ncct, "%s has invalid or missing UUID!\n",
+                (char *)xmlGetNodePath(node) + strlen("/noit"));
+      continue;
+    }
+    if(period == 0) {
+      check = noit_poller_lookup(checkid);
+      if(!check) continue;
+      if(adding) noit_check_transient_add_feed(check, ncct->feed_path);
+      else noit_check_transient_remove_feed(check, ncct->feed_path);
+    }
+    else {
+      if(adding) {
+        check = noit_check_watch(checkid, period);
+        /* This check must be watched from the console */
+        noit_check_transient_add_feed(check, ncct->feed_path);
+        /* Note the check */
+        noit_check_log_check(check);
+        /* kick it off, if it isn't running already */
+        if(!NOIT_CHECK_LIVE(check)) noit_check_activate(check);
+      }
+      else {
+        check = noit_check_get_watch(checkid, period);
+        if(check) noit_check_transient_remove_feed(check, ncct->feed_path);
+      }
+    }
-  }
- out:
@@ -1226 +1297 @@
-static
-void register_console_config_commands() {
-
+, *nocmd
-  noit_console_state_t *tl, *_conf_state, *_conf_t_state,
-                       *_conf_t_check_state,
@@ -1276 +1347 @@
-  ADD_CMD(showcmd->dstate, "check", noit_console_show_check, NULL, NULL);
-
+  ADD_CMD(tl, "watch", noit_console_watch_check, NULL, (void *)1);
+
+  nocmd = noit_console_state_get_cmd(tl, "no");
+  ADD_CMD(nocmd->dstate, "watch", noit_console_watch_check, NULL, (void *)0);
+
-  DELEGATE_CMD(_conf_t_state, "write", _write_state);
-  DELEGATE_CMD(_conf_t_state, "attribute", _attr_state);

src/noit_console.c

@@ -156 +156 @@
-void
-noit_console_closure_free(noit_console_closure_t ncct) {
+  noit_log_stream_t lf;
-  if(ncct->el) el_end(ncct->el);
-  if(ncct->hist) history_end(ncct->hist);
@@ -168 +169 @@
-    ncct->state_stack = tmp->last;
-    free(tmp);
+  }
+  lf = noit_log_stream_find(ncct->feed_path);
+  noit_log_stream_remove(ncct->feed_path);
+  if(lf) {
+    noit_log_stream_free(lf);
-  }
-  free(ncct);
@@ -234 +240 @@
-
-void
-noit_console_init() {
-  el_multi_init();
-  signal(SIGTTOU, SIG_IGN);
-  eventer_name_callback("noit_console", noit_console_handler);
-}
-
-void
-noit_console_dispatch(eventer_t e, const char *buffer,
-                      noit_console_closure_t ncct) {
@@ -313 +312 @@
-socket_error:
-    /* Exceptions cause us to simply snip the connection */
+
+    /* This removes the log feed which is important to do before calling close */
-    eventer_remove_fd(e->fd);
-    e->opset->close(e->fd, &newmask, e);
-    if(ncct) noit_console_closure_free(ncct);
-    if(ac) acceptor_closure_free(ac);
+    e->opset->close(e->fd, &newmask, e);
-    return 0;
-  }
@@ -350 +351 @@
-      noit_console_state_init(ncct);
-    }
+    snprintf(ncct->feed_path, sizeof(ncct->feed_path), "console/%d", e->fd);
+    noit_log_stream_new(ncct->feed_path, "noit_console", ncct->feed_path,
+                        ncct, NULL);
-    noit_console_motd(e, ac, ncct);
-    ncct->initialized = 1;
@@ -416 +420 @@
-}
-
+static int
+noit_console_logio_open(noit_log_stream_t ls) {
+  return 0;
+}
+static int
+noit_console_logio_reopen(noit_log_stream_t ls) {
+  /* no op */
+  return 0;
+}
+static int
+noit_console_logio_write(noit_log_stream_t ls, const void *buf, size_t len) {
+  noit_console_closure_t ncct = ls->op_ctx;
+  int rv, rlen, mask;
+  if(!ncct) return 0;
+  rlen = nc_write(ls->op_ctx, buf, len);
+  while((rv = noit_console_continue_sending(ncct, &mask)) == -1 && errno == EINTR);
+  if(rv == -1 && errno == EAGAIN) {
+    ncct->e->mask = mask | EVENTER_EXCEPTION;
+    eventer_update(ncct->e);
+  }
+  return rlen;
+}
+static int
+noit_console_logio_close(noit_log_stream_t ls) {
+  ls->op_ctx = NULL;
+  return 0;
+}
+static logops_t noit_console_logio_ops = {
+  noit_console_logio_open,
+  noit_console_logio_reopen,
+  noit_console_logio_write,
+  noit_console_logio_close,
+};
+
+void
+noit_console_init() {
+  el_multi_init();
+  signal(SIGTTOU, SIG_IGN);
+  noit_register_logops("noit_console", &noit_console_logio_ops);
+  eventer_name_callback("noit_console", noit_console_handler);
+}
+

src/noit_console.h

@@ -66 +66 @@
-typedef struct __noit_console_closure {
-  int initialized;
+  char feed_path[128];
-  eventer_t e;           /* The event it is attached to.  This
-                          * is needed so it can write itself out */

src/noit_console_state.c

@@ -338 +338 @@
-  static noit_console_state_t *_top_level_state = NULL;
-  if(!_top_level_state) {
-show
+no
-    _top_level_state = noit_console_state_alloc();
-    noit_console_state_add_cmd(_top_level_state, &console_command_exit);
-    show_state = noit_console_state_alloc();
-    noit_console_state_add_cmd(_top_level_state,
-
+
+
+
+
+
+
+
-    noit_console_state_add_cmd(_top_level_state, &console_command_shutdown);
-    noit_console_state_add_cmd(_top_level_state, &console_command_restart);

src/utils/noit_skiplist.c

@@ -375 +375 @@
-  while(noit_skiplist_pop(sl->index, noit_skiplisti_destroy) != NULL);
-  noit_skiplist_remove_all(sl, myfree);
-  free(sl);
-}
-void *noit_skiplist_pop(noit_skiplist * a, noit_freefunc_t myfree)