Avoid lock when child dies

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

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 4ef4b28..3421be8 100644 (file)
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -43,7 +43,7 @@
 #include "afb-apiset.h"
 #include "afb-autoset.h"
 #include "afb-api-so.h"
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 #   include "afb-api-dbus.h"
 #endif
 #include "afb-api-ws.h"
@@ -60,7 +60,7 @@
 #include "afb-hook-flags.h"
 #endif
 #include "afb-debug.h"
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 #   include "afb-supervision.h"
 #endif
 
@@ -358,8 +358,12 @@ static struct afb_hsrv *start_http_server()
        }
 
        if (afb_hreq_init_download_path(uploaddir)) {
-               ERROR("unable to set the upload directory %s", uploaddir);
-               return NULL;
+               static const char fallback_uploaddir[] = "/tmp";
+               WARNING("unable to set the upload directory %s", uploaddir);
+               if (afb_hreq_init_download_path(fallback_uploaddir)) {
+                       ERROR("unable to fallback to upload directory %s", fallback_uploaddir);
+                       return NULL;
+               }
        }
 
        hsrv = afb_hsrv_create();
@@ -399,6 +403,27 @@ static struct afb_hsrv *start_http_server()
  | execute_command
  +--------------------------------------------------------- */
 
+static void exit_at_end()
+{
+       exit(0);
+}
+
+static void wait_child(int signum, void* arg)
+{
+       pid_t pid = (pid_t)(intptr_t)arg;
+       pid_t pidchld = childpid;
+
+       if (pidchld == pid) {
+               childpid = 0;
+               if (!SELF_PGROUP)
+                       killpg(pidchld, SIGKILL);
+               waitpid(pidchld, NULL, 0);
+               jobs_exit(exit_at_end);
+       } else {
+               waitpid(pid, NULL, 0);
+       }
+}
+
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 {
        if (info->si_pid == childpid) {
@@ -406,11 +431,9 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx)
                case CLD_EXITED:
                case CLD_KILLED:
                case CLD_DUMPED:
-                       childpid = 0;
-                       if (!SELF_PGROUP)
-                               killpg(info->si_pid, SIGKILL);
-                       waitpid(info->si_pid, NULL, 0);
-                       exit(0);
+                       jobs_queue_lazy(0, 0, wait_child, (void*)(intptr_t)info->si_pid);
+               default:
+                       break;
                }
        }
 }
@@ -796,7 +819,7 @@ static void start(int signum, void *arg)
                ERROR("failed to setup monitor");
                goto error;
        }
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
        if (afb_supervision_init(main_apiset, main_config) < 0) {
                ERROR("failed to setup supervision");
                goto error;
@@ -826,11 +849,13 @@ static void start(int signum, void *arg)
 
        /* load bindings and apis */
        afb_debug("start-load");
+#if WITH_DYNAMIC_BINDING
        apiset_start_list("binding", afb_api_so_add_binding, "the binding");
        apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
        apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
+#endif
        apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
        apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
 #endif
        apiset_start_list("ws-client", afb_api_ws_add_client_weak, "the afb-websocket client");
@@ -847,7 +872,7 @@ static void start(int signum, void *arg)
 
        /* export started apis */
        apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
        apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
 #endif
 
@@ -924,7 +949,7 @@ int main(int argc, char *argv[])
        afb_debug("main-start");
 
        /* enter job processing */
-       jobs_start(3, 0, 50, start, NULL);
+       jobs_start(3, 0, 100, start, NULL);
        WARNING("hoops returned from jobs_enter! [report bug]");
        return 1;
 }