Changeset 6154

Timestamp:

05/11/10 15:04:24 (3 years ago)

Author:

Cyrus

Message:

upsd/appsd: Add support for watching and automatically restarting daemons

Location:

luci2

Files:

• appsd/appsd.h (modified) (1 diff)
• appsd/initd.c (modified) (6 diffs)
• openwrt-feed/upsd/Makefile (modified) (1 diff)
• upsd/core.h (modified) (2 diffs)
• upsd/upsd-extension.h (added)

luci2/appsd/appsd.h

@@ -12 +12 @@
 #ifndef APPSD_RUNLEVEL_DEFAULT
 #define APPSD_RUNLEVEL_DEFAULT 2
+#endif
+
+#ifndef APPSD_BARRIER_DEFAULT
+#define APPSD_BARRIER_DEFAULT 60
 #endif
 

luci2/appsd/initd.c

@@ -26 +26 @@
 #include <syslog.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <ctype.h>
 
 #include "ucix.h"
 #include "uloop.h"
-#include "upsd.h"
+#include "upsd-extension.h"
 #include "appsd.h"
 
@@ -48 +50 @@
     char name[];
 } *spawns = NULL;
+
+static struct appsd_init_watch {
+    struct appsd_init_watch *next;
+    pid_t pid;
+    time_t barrier;
+    char name[];
+} *watched = NULL;
 
 static volatile pid_t checkpid = 0;
@@ -190 +199 @@
 
         s->pid = pid;
+    }
+}
+
+
+static void appsd_check_watched(pid_t pid) {
+    struct appsd_init_watch *watched = context, *c, *d = NULL;
+    for (c = watched; c; d = c, c = c->next) {
+        if (c->pid == pid) {
+            if (c->barrier < time(NULL)) {
+                libupsd_service_control(state, c->name, UPSD_ACTION_START, 0);
+            } else {
+                APPSD_LOG_WARN("%s failed too fast. Giving Up.");
+            }
+            if (d) {
+                d->next = c->next;
+            } else {
+                watched = c->next;
+            }
+            free(c);
+            break;
+        }
     }
 }
@@ -215 +245 @@
             if (s) {
                 appsd_init_spawn(s->name, NULL);
+            } else {
+                appsd_check_watched(checkpid);
             }
             checkpid = 0;
@@ -231 +263 @@
 }
 
+static int appsd_hook_start
+(void *context, upsd_init_t *init, upsd_action_t action, uint16_t flags) {
+    if (action != UPSD_ACTION_START && action != UPSD_ACTION_RESTART
+    && action != UPSD_ACTION_FORCERELOAD) {
+        return 0;
+    }
+
+    struct appsd_init_watch *watched = context, *c;
+    int respawn = 0;
+    pid_t pid = 0;
+    const char *pidfile = NULL;
+
+    for (char **c = init->options; *c; c++) {   /* Parsing daemon options */
+        if (!strncmp(*c, "X-Daemon-Pidfile:", 17)) {
+            pidfile = *c + 17;
+            while (isspace(*pidfile)) {
+                pidfile++;
+            }
+        } else if (!strncmp(*c, "X-Daemon-Respawn:", 17)) {
+            respawn = 1;
+        }
+    }
+
+    if (respawn) {
+        char line[16];
+        FILE *fp = fopen(pidfile, "r");
+        if (fp) {
+            if (fgets(line, sizeof(line), fp)) {
+                pid = (pid_t)atoi(line);
+            }
+            fclose(fp);
+        }
+        if (pid) {
+            for (c = watched; c; c = c->next) {
+                if (!strcmp(c->name, *init->provides)) {
+                    break;
+                }
+            }
+            if (!c) {
+                if ((c = malloc(sizeof(struct appsd_init_watch)
+                            + strlen(*init->provides) + 1))) {
+                    c->next = watched;
+                    memcpy(c->name, *init->provides, strlen(*init->provides)+1);
+                    watched = c;
+                }
+            }
+
+            if (c) {
+                c->pid = pid;
+                c->barrier = time(NULL) + APPSD_BARRIER_DEFAULT;
+            }
+        }
+    }
+    return 0;
+}
+
+static int appsd_hook_stop
+(void *context, upsd_init_t *init, upsd_action_t action, uint16_t flags) {
+    if (action != UPSD_ACTION_STOP && action != UPSD_ACTION_RESTART
+    && action != UPSD_ACTION_FORCERELOAD) {
+        return 0;
+    }
+
+    struct appsd_init_watch *watched = context, *c, *d = NULL;
+    int respawn = 0;
+
+    for (char **c = init->options; *c; c++) {   /* Parsing daemon options */
+        if (!strncmp(*c, "X-Daemon-Respawn:", 17)) {
+            respawn = 1;
+            break;
+        }
+    }
+
+    if (respawn) {
+        for (c = watched; c; d = c, c = c->next) {
+            if (!strcmp(c->name, *init->provides)) {
+                if (d) {
+                    d->next = c->next;
+                } else {
+                    watched = c->next;
+                }
+                free(c);
+                break;
+            }
+        }
+    }
+    return 0;
+}
+
 
 int appsd_init(int argc, const char **argv) {
@@ -273 +394 @@
     libupsd_scan_inscfg(state, NULL);
     libupsd_scan_initdir(state, NULL);
+    libupsd_hook_register(state, appsd_hook_start, watched, 0, UPSD_HOOK_AFTER);
+    libupsd_hook_register(state, appsd_hook_stop, watched, 0, UPSD_HOOK_BEFORE);
 
     ubus_ctx = ubus_ctx_alloc("init", "initd");

luci2/openwrt-feed/upsd/Makefile

@@ -16 +16 @@
     $(INSTALL_DIR) $(1)/usr/include/
     $(CP) $(PKG_BUILD_DIR)/upsd.h $(1)/usr/include/
+    $(CP) $(PKG_BUILD_DIR)/upsd-extension.h $(1)/usr/include/
     $(INSTALL_DIR) $(1)/usr/lib/
     $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/

luci2/upsd/core.h

@@ -5 +5 @@
 #include <sys/types.h>
 #include <stdint.h>
-#include "upsd.h"
+#include "upsd-extension.h"
 #include "upsd_config.h"
 
@@ -31 +31 @@
 typedef struct upsd_inst upsd_inst_t;
 typedef struct upsd_initlist upsd_initlist_t;
-typedef struct upsd_handler upsd_handler_t;
 typedef struct upsd_extension upsd_extension_t;
-typedef union upsd_handle upsd_handle_t;
 
-#define UPSD_ACTION_INTERNAL_CLEAN  ((upsd_action_t) -1)
-
-/* Status handle for asynchronous init actions */
-union upsd_handle {
-    pid_t pid;
-    int descriptor;
-    void *pointer;
-};
-
-/* Dynamic state part of a service, changing throughout commands */
-struct upsd_handler {
-    uint16_t flags;
-    uint16_t awaiting;
-    int16_t status;
-    time_t timeout;
-    upsd_handle_t handle;
-};
-
-/* Service dataset */
-struct upsd_init {
-    uint16_t flags;
-    void *identifier;
-    char **options;
-    char **provides;
-    upsd_worker_t *worker;
-    upsd_handler_t hndl;
-};
 
 /* Event listener instance */