Changeset e3c8f105af17e80c10e566366bb11a9f2a510c20

Timestamp:

01/30/08 03:16:56 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[f59d8ed0e12bf7351fe924612229a1b69cf00fd5]

git-author:

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

Message:

oh my... http

Files:

• configure.in (modified) (3 diffs)
• src/eventer/eventer.c (modified) (2 diffs)
• src/eventer/eventer.h (modified) (2 diffs)
• src/eventer/eventer_kqueue_impl.c (modified) (7 diffs)
• src/modules/Makefile.in (modified) (1 diff)
• src/modules/http.c (added)
• src/modules/ping_icmp.c (modified) (2 diffs)
• src/noit_conf.c (modified) (1 diff)
• src/noit_poller.c (modified) (1 diff)
• src/sample.conf (modified) (2 diffs)

configure.in

@@ -36 +36 @@
-        ;;
-esac
-SHCFLAGS="$PICFLAGS $CFLAGS"
-AC_SUBST(MODULELD)
-AC_SUBST(MODULEEXT)
@@ -63 +62 @@
-LIBS="$LIBS $XML2LIBS"
-AC_MSG_RESULT([$XML2LIBS])
+
+AC_MSG_CHECKING([libserf cflags])
+SERFCFLAGS="`apr-1-config --cflags --cppflags`"
+SERFCFLAGS="$SERFCFLAGS -I`apu-1-config --includedir` -I`apr-1-config --includedir`"
+AC_SUBST(SERFCFLAGS)
+AC_MSG_RESULT([$SERFCFLAGS])
+
+AC_MSG_CHECKING([libserf libs])
+SERFLIBS="`apu-1-config --link-ld --libs` `apr-1-config --link-ld --libs`"
+AC_SUBST(SERFLIBS)
+AC_MSG_RESULT([$SERFLIBS])
-
-AC_MSG_CHECKING([whether sem_init works])
@@ -252 +262 @@
-
-CPPFLAGS='-I$(top_srcdir)/src'
+SHCFLAGS="$PICFLAGS $CFLAGS"
-AC_SUBST(SHCFLAGS)
-

src/eventer/eventer.c

@@ -31 +31 @@
-static noit_hash_table __func_to_name = NOIT_HASH_EMPTY;
-int eventer_name_callback(const char *name, eventer_func_t f) {
+  void **fptr = malloc(sizeof(*fptr));
+  *fptr = (void *)f;
-  noit_hash_replace(&__name_to_func, strdup(name), strlen(name), f, free, NULL);
-, sizeof(f
-NULL
+ptr, sizeof(*fptr
+free
-  return 0;
-}
@@ -44 +46 @@
-const char *eventer_name_for_callback(eventer_func_t f) {
-  const char *name;
-
+&
-    return name;
-  return NULL;

src/eventer/eventer.h

@@ -67 +67 @@
-  void              (*update)(eventer_t e);
-  eventer_t         (*remove_fd)(int fd);
+  eventer_t         (*find_fd)(int fd);
-  int               (*loop)();
-} *eventer_impl_t;
@@ -81 +82 @@
-#define eventer_update        __eventer->update
-#define eventer_remove_fd     __eventer->remove_fd
-attach        __eventer->attach
+find_fd       __eventer->find_fd
-#define eventer_loop          __eventer->loop
-

src/eventer/eventer_kqueue_impl.c

@@ -24 +24 @@
-  noit_spinlock_t lock;
-} *master_fds = NULL;
+static int *masks;
-
-typedef enum { EV_OWNED, EV_ALREADY_OWNED } ev_lock_state_t;
@@ -112 +113 @@
-  maxfds = rlim.rlim_cur;
-  master_fds = calloc(maxfds, sizeof(*master_fds));
+  masks = calloc(maxfds, sizeof(*masks));
-  timed_events = calloc(1, sizeof(*timed_events));
-  noit_skiplist_init(timed_events);
@@ -126 +128 @@
-  assert(e->mask);
-  ev_lock_state_t lockstate;
-
-  /* Timed events are simple */
-  if(e->mask == EVENTER_TIMER) {
@@ -196 +197 @@
-  return eiq;
-}
+static eventer_t eventer_kqueue_impl_find_fd(int fd) {
+  return master_fds[fd].e;
+}
-static void eventer_kqueue_impl_loop() {
-  int is_master_thread = 0;
@@ -287 +291 @@
-    else {
-      int idx;
+      /* loop once to clear */
-      for(idx = 0; idx < fd_cnt; idx++) {
+        struct kevent *ke;
+        ke = &ke_vec[idx];
+        if(ke->flags & EV_ERROR) continue;
+        masks[ke->ident] = 0;
+      }
+      /* Loop again to aggregate */
+      for(idx = 0; idx < fd_cnt; idx++) {
+        struct kevent *ke;
+        ke = &ke_vec[idx];
+        if(ke->flags & EV_ERROR) continue;
+        if(ke->filter == EVFILT_READ) masks[ke->ident] |= EVENTER_READ;
+        if(ke->filter == EVFILT_WRITE) masks[ke->ident] |= EVENTER_WRITE;
+      }
+      /* Loop a last time to process */
+      for(idx = 0; idx < fd_cnt; idx++) {
+        const char *cbname;
-        ev_lock_state_t lockstate;
-        struct kevent *ke;
-        eventer_t e;
-evmask, 
+
-
-        ke = &ke_vec[idx];
@@ -301 +322 @@
-        e = (eventer_t)ke->udata;
-        fd = ke->ident;
+        if(!masks[fd]) continue;
-        assert(e == master_fds[fd].e);
-        lockstate = acquire_master_fd(fd);
-        assert(lockstate == EV_OWNED);
-
-        evmask = 0;
-        if(ke->filter == EVFILT_READ) evmask = EVENTER_READ;
-        if(ke->filter == EVFILT_WRITE) evmask = EVENTER_WRITE;
-        gettimeofday(&__now, NULL);
-        oldmask = e->mask;
-
+
+
+
+
+
-
-        if(newmask) {
@@ -349 +372 @@
-  eventer_kqueue_impl_update,
-  eventer_kqueue_impl_remove_fd,
+  eventer_kqueue_impl_find_fd,
-  eventer_kqueue_impl_loop
-};

src/modules/Makefile.in

@@ -16 +16 @@
-top_srcdir=@top_srcdir@
-
-
+ http.@MODULEEXT@
-
-all:    $(MODULES)
+
+http.@MODULEEXT@:       http.lo
+        $(MODULELD) $(LDFLAGS) -o $@ http.lo @SERFLIBS@ ../serf/.libs/libserf-0.a -lz -lssl -lcrypto
+
+http.lo:        http.c
+        $(CC) $(CPPFLAGS) $(SHCFLAGS) -I$(top_srcdir)/src/serf @SERFCFLAGS@ -c http.c -o $@
-
-.lo.@MODULEEXT@:

src/modules/ping_icmp.c

@@ -56 +56 @@
-} ping_icmp_data_t;
-
-static int ping_icmp_onload(noit_module_t *self) {
-  nlerr = noit_log_stream_find("error/ping_icmp");
-  nldeb = noit_log_stream_find("debug/ping_icmp");
-  if(!nlerr) nlerr = noit_stderr;
-  if(!nldeb) nldeb = noit_debug;
-  return 0;
-}
-static int ping_icmp_config(noit_module_t *self, noit_hash_table *options) {
-  return 0;
@@ -494 +487 @@
-}
-
+static int ping_icmp_onload(noit_module_t *self) {
+  nlerr = noit_log_stream_find("error/ping_icmp");
+  nldeb = noit_log_stream_find("debug/ping_icmp");
+  if(!nlerr) nlerr = noit_stderr;
+  if(!nldeb) nldeb = noit_debug;
+  eventer_name_callback("ping_icmp/recur_handler", ping_icmp_recur_handler);
+  eventer_name_callback("ping_icmp/timeout", ping_icmp_timeout);
+  eventer_name_callback("ping_icmp/handler", ping_icmp_handler);
+  return 0;
+}
-noit_module_t ping_icmp = {
-  NOIT_MODULE_MAGIC,

src/noit_conf.c

@@ -125 +125 @@
-                                            int *cnt) {
-  int i;
-
+ = NULL
-  xmlXPathObjectPtr pobj;
-  xmlXPathContextPtr current_ctxt;

src/noit_poller.c

@@ -96 +96 @@
-        continue;
-      }
+    }
+    if(timeout >= period) {
+      noit_log(noit_stderr, NULL, "check uuid: '%s' timeout > period\n", uuid_str);
+      timeout = period/2;
-    }
-    options = noit_conf_get_hash(sec[i], "config");

src/sample.conf

@@ -9 +9 @@
-      <image>ping_icmp</image>
-      <name>ping_icmp</name>
+      <config>
+        <key1>value2</key1>
+        <key2>value2</key2>
+      </config>
+    </module>
+    <module>
+      <image>http</image>
+      <name>http</name>
-      <config>
-        <key1>value2</key1>
@@ -36 +44 @@
-      </check>
-    </checkgroup>
+    <checkgroup>
+      <module>http</module>
+      <period>2000</period>
+      <timeout>1000</timeout>
+      <check uuid="1b4e28ba-2fa1-11d2-883f-b9a761bde3fc">
+        <target>66.225.209.7</target>
+      </check>
+    </checkgroup>
-  </checks>
-</noit>