X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=60af72ef66e0ea2c8fb7fcd4ed95e82df3a7ee8c;hb=469e619ac45402471ea7d8c792ffc06e79346ef2;hp=2616e0bc57d49dd0a868ff68be791f86ed8abd08;hpb=d3a68744e728b77d2c37f51e865f2f49e533b6f7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 2616e0bc..60af72ef 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -2,22 +2,17 @@
  * Copyright (C) 2016 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contain all generic part to handle REST/API
- * 
- *  https://www.gnu.org/software/libmicrohttpd/tutorial.html [search 'largepost.c']
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #define _GNU_SOURCE
@@ -38,7 +33,8 @@
 
 #include "afb-plugin.h"
 #include "afb-req-itf.h"
-#include "afb-poll-itf.h"
+#include "afb-pollmgr-itf.h"
+#include "afb-evmgr-itf.h"
 
 #include "session.h"
 #include "afb-apis.h"
@@ -46,31 +42,50 @@
 #include "verbose.h"
 #include "utils-upoll.h"
 
+extern __thread sigjmp_buf *error_handler;
+
 struct api_so_desc {
-	struct AFB_plugin *plugin;	 /* descriptor */
-	void *handle;		         /* context of dlopen */
-	struct AFB_interface interface;
+	struct AFB_plugin *plugin;	/* descriptor */
+	void *handle;			/* context of dlopen */
+	struct AFB_interface interface;	/* interface */
 };
 
 static int api_timeout = 15;
 
 static const char plugin_register_function[] = "pluginRegister";
 
-static const struct afb_poll_itf upoll_itf = {
+static const struct afb_pollmgr_itf pollmgr_itf = {
+	.wait = (void*)upoll_wait,
+	.open = (void*)upoll_open,
 	.on_readable = (void*)upoll_on_readable,
 	.on_writable = (void*)upoll_on_writable,
 	.on_hangup = (void*)upoll_on_hangup,
 	.close = (void*)upoll_close
 };
 
-static struct afb_poll itf_poll_open(int fd, void *closure)
+static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object)
+{
+}
+
+static const struct afb_evmgr_itf evmgr_itf = {
+	.push = (void*)afb_api_so_evmgr_push
+};
+
+static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc)
+{
+	return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc };
+}
+
+static struct afb_pollmgr afb_api_so_get_pollmgr(struct api_so_desc *desc)
 {
-	struct afb_poll result;
-	result.data = upoll_open(fd, closure);
-	result.itf = result.data ? &upoll_itf : NULL;
-	return result;
+	return (struct afb_pollmgr){ .itf = &pollmgr_itf, .closure = NULL };
 }
 
+static const struct afb_daemon_itf daemon_itf = {
+	.get_evmgr = (void*)afb_api_so_get_evmgr,
+	.get_pollmgr = (void*)afb_api_so_get_pollmgr
+};
+
 static void free_context(struct api_so_desc *desc, void *context)
 {
 	void (*cb)(void*);
@@ -82,9 +97,6 @@ static void free_context(struct api_so_desc *desc, void *context)
 		free(context);
 }
 
-
-// Check of apiurl is declare in this plugin and call it
-extern __thread sigjmp_buf *error_handler;
 static void trapping_call(struct afb_req req, void(*cb)(struct afb_req))
 {
 	volatile int signum, timerset;
@@ -93,7 +105,6 @@ static void trapping_call(struct afb_req req, void(*cb)(struct afb_req))
 	struct sigevent sevp;
 	struct itimerspec its;
 
-	// save context before calling the API
 	timerset = 0;
 	older = error_handler;
 	signum = setjmp(jmpbuf);
@@ -166,8 +177,6 @@ static void call(struct api_so_desc *desc, struct afb_req req, const char *verb,
 		afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->prefix);
 }
 
-
-
 int afb_api_so_add_plugin(const char *path)
 {
 	struct api_so_desc *desc;
@@ -198,7 +207,8 @@ int afb_api_so_add_plugin(const char *path)
 	/* init the interface */
 	desc->interface.verbosity = 0;
 	desc->interface.mode = AFB_MODE_LOCAL;
-	desc->interface.poll_open = itf_poll_open;
+	desc->interface.daemon.itf = &daemon_itf;
+	desc->interface.daemon.closure = desc;
 
 	/* init the plugin */
 	desc->plugin = pluginRegisterFct(&desc->interface);
@@ -337,23 +347,3 @@ int afb_api_so_add_pathset(const char *pathset)
 	};
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-