Changeset 5b63423e3ea22c19a8187dfcce162d43e0159643

Timestamp:

05/20/09 14:25:34 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[661f070c138a0744279b82279757660688235692]

git-author:

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

Message:

pull out the watchdog stuff into utils and integrate it back into noitd and now into stratcond, refs #131

Files:

• src/noitd.c (modified) (6 diffs)
• src/stratcond.c (modified) (4 diffs)
• src/utils/Makefile.in (modified) (1 diff)
• src/utils/noit_watchdog.c (added)
• src/utils/noit_watchdog.h (added)

src/noitd.c

@@ -49 +49 @@
-#include "utils/noit_hash.h"
-#include "utils/noit_security.h"
+#include "utils/noit_watchdog.h"
-#include "noit_listener.h"
-#include "noit_console.h"
@@ -133 +134 @@
-}
-
-/* Watchdog stuff */
-static int *lifeline = NULL;
-static unsigned long last_tick_time() {
-  static struct timeval lastchange = { 0, 0 };
-  static int lastcheck = 0;
-  struct timeval now, diff;
-
-  gettimeofday(&now, NULL);
-  if(lastcheck != *lifeline) {
-    lastcheck = *lifeline;
-    memcpy(&lastchange, &now, sizeof(lastchange));
-  }
-  sub_timeval(now, lastchange, &diff);
-  return (unsigned long)diff.tv_sec;
-}
-static void it_ticks() {
-  (*lifeline)++;
-}
-static void setup_mmap() {
-  lifeline = mmap(NULL, sizeof(int), PROT_READ|PROT_WRITE,
-                  MAP_SHARED|MAP_ANON, -1, 0);
-  if(lifeline == (void *)-1) {
-    noitL(noit_error, "Failed to mmap anon for watchdog\n");
-    exit(-1);
-  }
-}
-
-static int watch_over_child(int (*func)()) {
-  int child_pid;
-  while(1) {
-    child_pid = fork();
-    if(child_pid == -1) {
-      noitL(noit_error, "fork failed: %s\n", strerror(errno));
-      exit(-1);
-    }
-    if(child_pid == 0) {
-      /* This sets up things so we start alive */
-      it_ticks();
-      /* run the program */
-      exit(func());
-    }
-    else {
-      int sig = -1, exit_val = -1;
-      signal(SIGHUP, SIG_IGN);
-      while(1) {
-        unsigned long ltt;
-        int status, rv;
-        sleep(1); /* Just check child status every second */
-        rv = waitpid(child_pid, &status, WNOHANG);
-        if(rv == 0) {
-          /* Nothing */
-        }
-        else if (rv == child_pid) {
-          /* We died!... we need to relaunch, unless the status was a requested exit (2) */
-          sig = WTERMSIG(status);
-          exit_val = WEXITSTATUS(status);
-          if(sig == SIGINT || sig == SIGQUIT ||
-             (sig == 0 && (exit_val == 2 || exit_val < 0))) {
-            noitL(noit_error, "noitd shutdown acknowledged.\n");
-            exit(0);
-          }
-          break;
-        }
-        else {
-          noitL(noit_error, "Unexpected return from waitpid: %d\n", rv);
-          exit(-1);
-        }
-        /* Now check out timeout */
-        if((ltt = last_tick_time()) > CHILD_WATCHDOG_TIMEOUT) {
-          noitL(noit_error,
-                "Watchdog timeout (%lu s)... terminating child\n",
-                ltt);
-          kill(child_pid, SIGKILL);
-        }
-      }
-      noitL(noit_error, "noitd child died [%d/%d], restarting.\n", exit_val, sig);
-    }
-  }
-}
-
-static int __reload_needed = 0;
-static void request_conf_reload(int sig) {
@@ -219 +140 @@
-  }
-}
-
-
+
-  if(__reload_needed) {
-    noitL(noit_error, "SIGHUP received, performing reload\n");
@@ -249 +169 @@
-  }
-
-
+
+
+
-  e = eventer_alloc();
-  e->mask = EVENTER_RECURRENT;
-watchdog_tick
+noitice_hup
-  eventer_add_recurrent(e);
-
@@ -325 +247 @@
-  }
-
-setup_mmap
+noit_watchdog_prefork_init
-
-  if(chdir("/") != 0) {
@@ -340 +262 @@
-  if(fork()) exit(0);
-
-
-
+
+
+

src/stratcond.c

@@ -45 +45 @@
-#include "utils/noit_hash.h"
-#include "utils/noit_security.h"
+#include "utils/noit_watchdog.h"
-#include "noit_listener.h"
-#include "noit_console.h"
@@ -127 +128 @@
-}
-
-int main(int argc, char **argv
+static int child_main(
-  char conf_str[1024];
-
-  parse_clargs(argc, argv);
-
-  if(chdir("/") != 0) {
-    fprintf(stderr, "cannot chdir(\"/\"): %s\n", strerror(errno));
-    exit(2);
-  }
-  if(!foreground) {
-    close(STDIN_FILENO);
-    close(STDOUT_FILENO);
-    close(STDERR_FILENO);
-    if(fork()) exit(0);
-    setsid();
-    if(fork()) exit(0);
-  }
-
-  /* First initialize logging, so we can log errors */
@@ -181 +167 @@
-    exit(-1);
-  }
+
+  noit_watchdog_child_eventer_heartbeat();
+
-  noit_console_init(APPNAME);
-  stratcon_realtime_http_init(APPNAME);
@@ -206 +195 @@
-  return 0;
-}
+
+int main(int argc, char **argv) {
+  parse_clargs(argc, argv);
+
+  if(chdir("/") != 0) {
+    fprintf(stderr, "cannot chdir(\"/\"): %s\n", strerror(errno));
+    exit(2);
+  }
+
+  noit_watchdog_prefork_init();
+
+  if(foreground) exit(child_main());
+
+  close(STDIN_FILENO);
+  close(STDOUT_FILENO);
+  close(STDERR_FILENO);
+  if(fork()) exit(0);
+  setsid();
+  if(fork()) exit(0);
+
+  return noit_watchdog_start_child("stratcond", child_main, 0);
+}

src/utils/Makefile.in

@@ -11 +11 @@
-
-OBJS=noit_hash.o noit_skiplist.o noit_log.o noit_sem.o noit_str.o \
-
+noit_watchdog.o 
-        @ATOMIC_OBJS@
-