X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;fp=src%2Fhttp-svc.c;h=a358cbd77685d95a9ca46d77e38d52a060c26e32;hb=13549775092afa9215de8468e34f6d194c2fd8db;hp=b36d5f7eaffd6c04ccfc436e6cf60c2496e5be81;hpb=efe18167d6ce59b263c179a6e2d01aa875c05cf8;p=src%2Fapp-framework-binder.git

diff --git a/src/http-svc.c b/src/afb-hsrv.c
similarity index 92%
rename from src/http-svc.c
rename to src/afb-hsrv.c
index b36d5f7e..a358cbd7 100644
--- a/src/http-svc.c
+++ b/src/afb-hsrv.c
@@ -33,6 +33,7 @@
 #include "afb-apis.h"
 #include "afb-req-itf.h"
 #include "verbose.h"
+#include "utils-upoll.h"
 
 #define JSON_CONTENT  "application/json"
 #define FORM_CONTENT  MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
@@ -54,6 +55,8 @@ struct afb_diralias {
 	int dirfd;
 };
 
+static struct upoll *upoll = NULL;
+
 int afb_hreq_one_page_api_redirect(
 		struct afb_hreq *hreq,
 		void *data)
@@ -422,27 +425,36 @@ static int my_default_init(AFB_session * session)
 	if (!afb_hsrv_add_handler(session, session->config->rootbase, afb_hreq_one_page_api_redirect, NULL, -20))
 		return 0;
 
+#if defined(USE_MAGIC_MIME_TYPE)
+	/*TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)] */
+	init_lib_magic (session);
+#endif
+
 	return 1;
 }
 
-AFB_error httpdStart(AFB_session * session)
+/* infinite loop */
+static void hsrv_handle_event(struct MHD_Daemon *httpd)
 {
+	MHD_run(httpd);
+}
+
+int afb_hsrv_start(AFB_session * session)
+{
+	struct MHD_Daemon *httpd;
+	const union MHD_DaemonInfo *info;
+
 	if (!my_default_init(session)) {
 		printf("Error: initialisation of httpd failed");
-		return AFB_FATAL;
+		return 0;
 	}
 
-#if defined(USE_MAGIC_MIME_TYPE)
-	/*TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)] */
-	init_lib_magic (session);
-#endif
-
 	if (verbosity) {
 		printf("AFB:notice Waiting port=%d rootdir=%s\n", session->config->httpdPort, session->config->rootdir);
 		printf("AFB:notice Browser URL= http:/*localhost:%d\n", session->config->httpdPort);
 	}
 
-	session->httpd = MHD_start_daemon(
+	httpd = MHD_start_daemon(
 		MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
 		(uint16_t) session->config->httpdPort,	/* port */
 		new_client_handler, NULL,	/* Tcp Accept call back + extra attribute */
@@ -451,48 +463,37 @@ AFB_error httpdStart(AFB_session * session)
 		MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int)15,	/* 15 seconds */
 		MHD_OPTION_END);	/* options-end */
 
-	if (session->httpd == NULL) {
+	if (httpd == NULL) {
 		printf("Error: httpStart invalid httpd port: %d", session->config->httpdPort);
-		return AFB_FATAL;
+		return 0;
 	}
-	return AFB_SUCCESS;
-}
 
-/* infinite loop */
-AFB_error httpdLoop(AFB_session * session)
-{
-	int count = 0;
-	const union MHD_DaemonInfo *info;
-	struct pollfd pfd;
-
-	info = MHD_get_daemon_info(session->httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY);
+	info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY);
 	if (info == NULL) {
-		printf("Error: httpLoop no pollfd");
-		goto error;
+		MHD_stop_daemon(httpd);
+		fprintf(stderr, "Error: httpStart no pollfd");
+		return 0;
 	}
-	pfd.fd = info->listen_fd;
-	pfd.events = POLLIN;
 
-	if (verbosity)
-		fprintf(stderr, "AFB:notice entering httpd waiting loop\n");
-	while (TRUE) {
-		if (verbosity)
-			fprintf(stderr, "AFB:notice httpd alive [%d]\n", count++);
-		poll(&pfd, 1, 15000);	/* 15 seconds (as above timeout when starting) */
-		MHD_run(session->httpd);
+	upoll = upoll_open(info->listen_fd, httpd);
+	if (upoll == NULL) {
+		MHD_stop_daemon(httpd);
+		fprintf(stderr, "Error: connection to upoll of httpd failed");
+		return 0;
 	}
+	upoll_on_readable(upoll, (void*)hsrv_handle_event);
 
- error:
-	/* should never return from here */
-	return AFB_FATAL;
+	session->httpd = httpd;
+	return 1;
 }
 
-int httpdStatus(AFB_session * session)
+void afb_hsrv_stop(AFB_session * session)
 {
-	return MHD_run(session->httpd);
+	if (upoll)
+		upoll_close(upoll);
+	upoll = NULL;
+	if (session->httpd != NULL)
+		MHD_stop_daemon(session->httpd);
+	session->httpd = NULL;
 }
 
-void httpdStop(AFB_session * session)
-{
-	MHD_stop_daemon(session->httpd);
-}