aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-05-05 19:11:40 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-05-11 15:29:49 +0200
commit22cba30f139a006fadb5fdf521f9c4c5bfbfac4a (patch)
treed0776a679a296c8aaf0799a186afe5203b898e24
parent7094d29121c6f95e74cde026f938578aea497c1b (diff)
refactor hsrv using jobs queue
Change-Id: I3d0c70efc2053340fcec93695006e01bb6b49e2c Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/afb-hsrv.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 87895a7b..51502a64 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 "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;
};
@@ -235,19 +235,22 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
}
}
-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)