Fixed spelling

[src/app-framework-binder.git] / src / afb-supervision.c

diff --git a/src/afb-supervision.c b/src/afb-supervision.c
index 6812e00..f1024c3 100644 (file)
--- a/src/afb-supervision.c
+++ b/src/afb-supervision.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,16 +43,19 @@
 #include "afs-supervision.h"
 #include "afb-stub-ws.h"
 #include "afb-debug.h"
+#include "afb-fdev.h"
 #include "verbose.h"
 #include "wrap-json.h"
+#include "jobs.h"
 
 extern struct afb_config *main_config;
 
 /* api and apiset name */
-static const char supervision_apiname[] = AFS_SURPERVISION_APINAME;
+static const char supervision_apiname[] = AFS_SUPERVISION_APINAME;
+static const char supervisor_apiname[] = AFS_SUPERVISOR_APINAME;
 
 /* path of the supervision socket */
-static const char supervisor_socket_path[] = AFS_SURPERVISION_SOCKET;
+static const char supervisor_socket_path[] = AFS_SUPERVISION_SOCKET;
 
 /* mutual exclusion */
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -111,20 +114,24 @@ static int open_supervisor_socket(const char *path)
        return fd;
 }
 
-static void cleanup_supervisor(void *nada)
+static void disconnect_supervisor()
 {
-       struct afb_trace *t = __atomic_exchange_n(&trace, NULL, __ATOMIC_RELAXED);
+       struct afb_stub_ws *s;
+       struct afb_trace *t;
+
+       INFO("Disconnecting supervision");
+       s = __atomic_exchange_n(&supervisor, NULL, __ATOMIC_RELAXED);
+       t = __atomic_exchange_n(&trace, NULL, __ATOMIC_RELAXED);
+       if (s)
+               afb_stub_ws_unref(s);
        if (t)
                afb_trace_unref(t);
-       supervisor = NULL;
 }
 
-static void disconnect_supervisor()
+static void on_supervisor_hangup(struct afb_stub_ws *s)
 {
-       struct afb_stub_ws *s = __atomic_exchange_n(&supervisor, NULL, __ATOMIC_RELAXED);
-
-       if (s)
-               afb_stub_ws_unref(s);
+       if (s && s == supervisor)
+               disconnect_supervisor();
 }
 
 /* try to connect to supervisor */
@@ -133,6 +140,7 @@ static void try_connect_supervisor()
        int fd;
        ssize_t srd;
        struct afs_supervision_initiator initiator;
+       struct fdev *fdev;
 
        /* get the mutex */
        pthread_mutex_lock(&mutex);
@@ -154,7 +162,7 @@ static void try_connect_supervisor()
                goto end;
        }
 
-       /* negociation */
+       /* negotiation */
        do { srd = read(fd, &initiator, sizeof initiator); } while(srd < 0 && errno == EINTR);
        if (srd < 0) {
                NOTICE("Can't read supervisor %s: %m", supervisor_socket_path);
@@ -168,7 +176,7 @@ static void try_connect_supervisor()
                ERROR("Bad interface of supervisor %s", supervisor_socket_path);
                goto end2;
        }
-       if (strcmp(initiator.interface, AFS_SURPERVISION_INTERFACE_1)) {
+       if (strcmp(initiator.interface, AFS_SUPERVISION_INTERFACE_1)) {
                ERROR("Unknown interface %s for supervisor %s", initiator.interface, supervisor_socket_path);
                goto end2;
        }
@@ -190,11 +198,17 @@ static void try_connect_supervisor()
        }
 
        /* make the supervisor link */
-       supervisor = afb_stub_ws_create_server(fd, supervision_apiname, supervision_apiset);
+       fdev = afb_fdev_create(fd);
+       if (!fdev) {
+               ERROR("Creation of fdev failed: %m");
+               goto end2;
+       }
+       supervisor = afb_stub_ws_create_server(fdev, supervision_apiname, supervision_apiset);
        if (!supervisor) {
                ERROR("Creation of supervisor failed: %m");
-               goto end2;
+               goto end;
        }
+       afb_stub_ws_on_hangup(supervisor, on_supervisor_hangup);
 
        /* successful termination */
        goto end;
@@ -205,13 +219,20 @@ end:
        pthread_mutex_unlock(&mutex);
 }
 
-static void on_sighup(int signum)
+static void try_connect_supervisor_job(int signum, void *args)
 {
+       INFO("Try to connect supervisor after SIGHUP");
        try_connect_supervisor();
 }
 
+static void on_sighup(int signum)
+{
+       INFO("Supervision received a SIGHUP");
+       jobs_queue(NULL, 0, try_connect_supervisor_job, NULL);
+}
+
 /**
- * initalize the supervision
+ * initialize the supervision
  */
 int afb_supervision_init()
 {
@@ -271,7 +292,6 @@ static const char *verbs[] = {
        "break", "config", "do", "exit", "sclose", "slist", "trace", "wait" };
 enum  {  Break ,  Config ,  Do ,  Exit ,  Sclose ,  Slist ,  Trace ,  Wait  };
 
-
 static void on_supervision_call(void *closure, struct afb_xreq *xreq)
 {
        int i, rc;
@@ -296,7 +316,7 @@ static void on_supervision_call(void *closure, struct afb_xreq *xreq)
                i = 0;
                if (wrap_json_unpack(args, "i", &i))
                        wrap_json_unpack(args, "{si}", "code", &i);
-               ERROR("existing from supervision with code %d -> %d", i, i & 127);
+               ERROR("exiting from supervision with code %d -> %d", i, i & 127);
                exit(i & 127);
                break;
        case Sclose:
@@ -327,9 +347,10 @@ static void on_supervision_call(void *closure, struct afb_xreq *xreq)
                break;
        case Trace:
                if (!trace)
-                       trace = afb_trace_create(supervision_apiname, NULL /* not bound to any session */);
+                       trace = afb_trace_create(supervisor_apiname, NULL /* not bound to any session */);
 
-               req = afb_xreq_unstore((struct afb_stored_req*)xreq);
+               req = xreq_to_req(xreq);
+               add = drop = NULL;
                wrap_json_unpack(args, "{s?o s?o}", "add", &add, "drop", &drop);
                if (add) {
                        rc = afb_trace_add(req, add, trace);