afb-systemd: Isolate systemd main entries

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

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 577ef85..1db59cd 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -18,6 +18,7 @@
 #define _GNU_SOURCE
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -31,15 +32,14 @@
 
 #include "afb-method.h"
 #include "afb-context.h"
+#include "afb-xreq.h"
 #include "afb-hreq.h"
 #include "afb-hsrv.h"
-#include <afb/afb-req-itf.h>
 #include "verbose.h"
 #include "locale-root.h"
 
-#include "afb-common.h"
-
-
+#include "afb-systemd.h"
+#include "jobs.h"
 
 #define JSON_CONTENT  "application/json"
 #define FORM_CONTENT  MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
@@ -64,12 +64,9 @@ struct afb_hsrv {
        struct hsrv_handler *handlers;
        struct MHD_Daemon *httpd;
        sd_event_source *evsrc;
-       int in_run;
        char *cache_to;
 };
 
-static int global_reqids = 0;
-
 static void reply_error(struct MHD_Connection *connection, unsigned int status)
 {
        struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
@@ -124,7 +121,7 @@ static int access_handler(
                }
 
                /* create the request */
-               hreq = calloc(1, sizeof *hreq);
+               hreq = afb_hreq_create();
                if (hreq == NULL) {
                        ERROR("Can't allocate 'hreq'");
                        reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
@@ -132,13 +129,8 @@ static int access_handler(
                }
 
                /* init the request */
-               hreq->refcount = 1;
                hreq->hsrv = hsrv;
                hreq->cacheTimeout = hsrv->cache_to;
-               hreq->reqid = ++global_reqids;
-               hreq->scanned = 0;
-               hreq->suspended = 0;
-               hreq->replied = 0;
                hreq->connection = connection;
                hreq->method = method;
                hreq->version = version;
@@ -239,25 +231,26 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
 
        hreq = *recordreq;
        if (hreq) {
-               if (hreq->upgrade)
-                       MHD_suspend_connection (connection);
                afb_hreq_unref(hreq);
        }
 }
 
-void run_micro_httpd(struct afb_hsrv *hsrv)
+static void do_run(int signum, void *arg)
 {
-       if (hsrv->in_run != 0)
-               hsrv->in_run = 2;
-       else {
-               sd_event_source_set_io_events(hsrv->evsrc, 0);
-               do {
-                       hsrv->in_run = 1;
-                       MHD_run(hsrv->httpd);
-               } while(hsrv->in_run == 2);
-               hsrv->in_run = 0;
-               sd_event_source_set_io_events(hsrv->evsrc, EPOLLIN);
+       MHD_UNSIGNED_LONG_LONG to;
+       struct afb_hsrv *hsrv = arg;
+
+       if (!signum) {
+               do { MHD_run(hsrv->httpd); } while(MHD_get_timeout(hsrv->httpd, &to) == MHD_YES && !to);
        }
+       sd_event_source_set_io_events(hsrv->evsrc, EPOLLIN);
+}
+
+void run_micro_httpd(struct afb_hsrv *hsrv)
+{
+       sd_event_source_set_io_events(hsrv->evsrc, 0);
+       if (jobs_queue(hsrv, 0, do_run, hsrv) < 0)
+               do_run(0, hsrv);
 }
 
 static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *hsrv)
@@ -407,7 +400,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
        const union MHD_DaemonInfo *info;
 
        httpd = MHD_start_daemon(
-               MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
+               MHD_USE_EPOLL | MHD_ALLOW_UPGRADE | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
                port,                           /* port */
                new_client_handler, NULL,       /* Tcp Accept call back + extra attribute */
                access_handler, hsrv,   /* Http Request Call back + extra attribute */
@@ -427,7 +420,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
                return 0;
        }
 
-       rc = sd_event_add_io(afb_common_get_event_loop(), &evsrc, info->listen_fd, EPOLLIN, io_event_callback, hsrv);
+       rc = sd_event_add_io(afb_systemd_get_event_loop(), &evsrc, info->listen_fd, EPOLLIN, io_event_callback, hsrv);
        if (rc < 0) {
                MHD_stop_daemon(httpd);
                errno = -rc;