X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=1db59cd327a88a52db762c8b1114ef2232fa9e3c;hb=ac7a95223a6314cca6250495ea59c3cf7e46e89e;hp=f0866f82e14f6fb9ef9500bc61bdd834190b4b80;hpb=6797f9722dd3e5463e0f7c118397955bb59a40c7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index f0866f82..1db59cd3 100644
--- 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>
@@ -34,11 +35,11 @@
 #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
@@ -63,7 +64,6 @@ struct afb_hsrv {
 	struct hsrv_handler *handlers;
 	struct MHD_Daemon *httpd;
 	sd_event_source *evsrc;
-	int in_run;
 	char *cache_to;
 };
 
@@ -231,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)
@@ -399,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 */
@@ -419,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;