Changeset e64e042f4c61e4e3c50af3639e028056d8bbfa88

Timestamp:

01/31/08 23:09:53 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[64e4b06c954e1727bf19b222f32cea893b5cc4c1]

git-author:

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

Message:

fix up some apis, allow for firing checks only once

Files:

• src/modules/http.c (modified) (13 diffs)
• src/modules/ping_icmp.c (modified) (3 diffs)
• src/noit_module.h (modified) (1 diff)
• src/noit_poller.c (modified) (9 diffs)
• src/noit_poller.h (modified) (1 diff)

src/modules/http.c

@@ -76 +76 @@
-  eventer_t fd_event;
-  eventer_t timeout_event;
-
+
+
+
+
+
+
+
-
-typedef struct {
@@ -119 +125 @@
-}
-static void serf_log_results(noit_module_t *self, noit_check_t check) {
-
+serf_
-  struct timeval duration;
-  stats_t current;
@@ -149 +155 @@
-}
-static void resmon_log_results(noit_module_t *self, noit_check_t check) {
-
+
+
-  struct timeval duration;
-  stats_t current;
-  int expect_code = 200;
-  int services = 0;
-
-
+
-  xmlDocPtr resmon_results = NULL;
-  xmlXPathContextPtr xpath_ctxt = NULL;
@@ -172 +177 @@
-  }
-  if(xpath_ctxt) xmlXPathFreeContext(xpath_ctxt);
-
+
+
+
+
+
-
-  sub_timeval(ci->finish_time, check->last_fire_time, &duration);
@@ -194 +203 @@
-                         void *closure, struct timeval *now) {
-  serf_closure_t *ccl = (serf_closure_t *)closure;
-check_info_t *ci = (
+serf_check_info_t *ci = (serf_
-
-  noitLT(nldeb, now, "serf_complete(%s)\n", ccl->check->target);
@@ -219 +228 @@
-  apr_pollfd_t desc = { 0 };
-  serf_closure_t *sct = closure;
-
+serf_
-
-  desc.desc_type = APR_POLL_SOCKET;
@@ -303 +312 @@
-  apr_status_t status;
-  handler_baton_t *ctx = handler_baton;
-
+serf_
-
-  if(response == NULL) {
@@ -447 +456 @@
-  if(pfd->reqevents & APR_POLLERR) e->mask |= EVENTER_EXCEPTION;
-  if(newe) {
-
+serf_
-    eventer_add(newe);
-    ci->fd_event = newe;
@@ -461 +470 @@
-                                        void *serf_baton) {
-  serf_closure_t *sct = user_baton;
-
+serf_
-  eventer_t e;
-
@@ -476 +485 @@
-static int serf_initiate(noit_module_t *self, noit_check_t check) {
-  serf_closure_t *ccl;
-
+serf_
-  struct timeval when, p_int;
-  apr_status_t status;
@@ -484 +493 @@
-
-  mod_config = noit_module_get_userdata(self);
-
+serf_
-  /* We cannot be running */
-  assert(!(check->flags & NP_RUNNING));
@@ -629 +638 @@
-  return 0;
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static int serf_onload(noit_module_t *self) {
@@ -668 +697 @@
-  resmon_config,
-  serf_init,
-serf
+resmon
-};
-

src/modules/ping_icmp.c

@@ -313 +313 @@
-  return 0;
-}
-
-
+
-  struct timeval when, p_int;
-  struct icmp *icp;
@@ -322 +321 @@
-  int packet_len, i;
-  eventer_t newe;
+  const char *config_val;
+
+  int interval = PING_INTERVAL;
+  int count = PING_COUNT;
+  if(noit_hash_retrieve(check->config, "interval", strlen("interval"),
+                        (void **)&config_val))
+    interval = atoi(config_val);
+  if(noit_hash_retrieve(check->config, "count", strlen("count"),
+                        (void **)&config_val))
+    count = atoi(config_val);
-
-  check->flags |= NP_RUNNING;
@@ -436 +445 @@
-  struct ping_closure *cl = (struct ping_closure *)closure;
-  ping_icmp_schedule_next(cl->self, e, cl->check, now);
-, PING_INTERVAL, PING_COUNT
+
-  free(cl);
-  return 0;
-}
-
-
-
+
+
+
+
+
+
+
+
+
-  return 0;
-}

src/noit_module.h

@@ -22 +22 @@
-  int (*config)(struct _noit_module *, noit_hash_table *options);
-  int (*init)(struct _noit_module *);
-
+, int once
-  void *opaque_handle;
-} noit_module_t;

src/noit_poller.c

@@ -14 +14 @@
-#include "utils/noit_log.h"
-#include "utils/noit_hash.h"
+#include "utils/noit_skiplist.h"
-#include "noit_conf.h"
-#include "noit_poller.h"
@@ -20 +21 @@
-
-static noit_hash_table polls = NOIT_HASH_EMPTY;
+static noit_skiplist polls_by_name = { 0 };
-static u_int32_t __config_load_generation = 0;
-struct uuid_dummy {
@@ -43 +45 @@
-  }
-  return "???";
+}
+static int __check_name_compare(void *a, void *b) {
+  noit_check_t ac = a;
+  noit_check_t bc = b;
+  int rv;
+  if((rv = strcmp(ac->target, bc->target)) != 0) return rv;
+  if((rv = strcmp(ac->name, bc->name)) != 0) return rv;
+  return 0;
-}
-void
@@ -55 +65 @@
-    char module[256];
-    char name[256];
-, timeout
+ = 0, timeout = 0
-    uuid_t uuid, out_uuid;
-    noit_hash_table *options;
@@ -119 +129 @@
-    mod = noit_module_lookup(check->module);
-    if(mod) {
-
+, 0
-    }
-    else {
@@ -129 +139 @@
-void
-noit_poller_init() {
+  noit_skiplist_init(&polls_by_name);
+  noit_skiplist_set_compare(&polls_by_name, __check_name_compare,
+                            __check_name_compare);
-  noit_poller_load_checks();
-  noit_poller_initiate();
@@ -192 +205 @@
-                         (char *)new_check->checkid, UUID_SIZE,
-                         new_check));
+  noit_skiplist_insert(&polls_by_name, new_check);
-  uuid_copy(out, new_check->checkid);
-  return 0;
@@ -236 +250 @@
-  }
-  return NULL;
+}
+noit_check_t
+noit_poller_lookup_by_name(char *target, char *name) {
+  noit_check_t check, tmp_check;
+  tmp_check = calloc(1, sizeof(*tmp_check));
+  tmp_check->target = target;
+  tmp_check->name = name;
+  check = noit_skiplist_find(&polls_by_name, &tmp_check, NULL);
+  free(tmp_check);
+  return check;
-}
-
@@ -259 +283 @@
-    report_change = 1;
-
+  noitL(noit_error, "%s/%s <- [%s]\n", check->target, check->module,
+        check->stats.current.status);
-  if(report_change) {
-debug
+error
-          check->target, check->module,
-          __noit_check_available_string(check->stats.current.available),

src/noit_poller.h

@@ -94 +94 @@
-  noit_poller_lookup(uuid_t in);
-
+API_EXPORT(noit_check_t)
+  noit_poller_lookup_by_name(char *target, char *name);
+
-API_EXPORT(void)
-  noit_poller_set_state(noit_check_t check, stats_t *newstate);