Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
packaging: Update spec and deb packaging
[src/app-framework-binder.git]
/
src
/
afb-hsrv.c
diff --git
a/src/afb-hsrv.c
b/src/afb-hsrv.c
index
f0866f8
..
d06d8fc
100644
(file)
--- a/
src/afb-hsrv.c
+++ b/
src/afb-hsrv.c
@@
-18,6
+18,7
@@
#define _GNU_SOURCE
#include <stdint.h>
#define _GNU_SOURCE
#include <stdint.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <assert.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-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 "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
#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;
struct hsrv_handler *handlers;
struct MHD_Daemon *httpd;
sd_event_source *evsrc;
- int in_run;
char *cache_to;
};
char *cache_to;
};
@@
-231,25
+231,26
@@
static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
hreq = *recordreq;
if (hreq) {
hreq = *recordreq;
if (hreq) {
- if (hreq->upgrade)
- MHD_suspend_connection (connection);
afb_hreq_unref(hreq);
}
}
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)
}
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(
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 */
port, /* port */
new_client_handler, NULL, /* Tcp Accept call back + extra attribute */
access_handler, hsrv, /* Http Request Call back + extra attribute */