X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=e2f38ee491e7ede8cb1601ad5cb11bbf2439b9c4;hb=acf0c66981ef55bf212352442e2673fdfe4a5505;hp=15544895842f0443f0d2c6077b9a7dbb9ed90163;hpb=bbddc1e584dd01b60042f622f8cecfc69361020b;p=src%2Fapp-framework-binder.git

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 15544895..e2f38ee4 100644
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,14 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
+
 #include <json-c/json.h>
 
-#include <afb/afb-plugin.h>
+#define AFB_BINDING_VERSION 2
+#include <afb/afb-binding.h>
 
-const struct AFB_interface *interface;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 struct event
 {
@@ -76,7 +79,7 @@ static int event_add(const char *tag, const char *name)
 	strcpy(e->tag, tag);
 
 	/* make the event */
-	e->event = afb_daemon_make_event(interface->daemon, name);
+	e->event = afb_daemon_make_event(name);
 	if (!e->event.closure) { free(e); return -1; }
 
 	/* link */
@@ -85,14 +88,14 @@ static int event_add(const char *tag, const char *name)
 	return 0;
 }
 
-static int event_subscribe(struct afb_req request, const char *tag)
+static int event_subscribe(afb_req request, const char *tag)
 {
 	struct event *e;
 	e = event_get(tag);
 	return e ? afb_req_subscribe(request, e->event) : -1;
 }
 
-static int event_unsubscribe(struct afb_req request, const char *tag)
+static int event_unsubscribe(afb_req request, const char *tag)
 {
 	struct event *e;
 	e = event_get(tag);
@@ -107,43 +110,43 @@ static int event_push(struct json_object *args, const char *tag)
 }
 
 // Sample Generic Ping Debug API
-static void ping(struct afb_req request, json_object *jresp, const char *tag)
+static void ping(afb_req request, json_object *jresp, const char *tag)
 {
 	static int pingcount = 0;
 	json_object *query = afb_req_json(request);
 	afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query));
 }
 
-static void pingSample (struct afb_req request)
+static void pingSample (afb_req request)
 {
 	ping(request, json_object_new_string ("Some String"), "pingSample");
 }
 
-static void pingFail (struct afb_req request)
+static void pingFail (afb_req request)
 {
 	afb_req_fail(request, "failed", "Ping Binder Daemon fails");
 }
 
-static void pingNull (struct afb_req request)
+static void pingNull (afb_req request)
 {
 	ping(request, NULL, "pingNull");
 }
 
-static void pingBug (struct afb_req request)
+static void pingBug (afb_req request)
 {
-	ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug");
+	ping((afb_req){NULL,NULL}, NULL, "pingBug");
 }
 
-static void pingEvent(struct afb_req request)
+static void pingEvent(afb_req request)
 {
 	json_object *query = afb_req_json(request);
-	afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query));
+	afb_daemon_broadcast_event("event", json_object_get(query));
 	ping(request, json_object_get(query), "event");
 }
 
 
 // For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
-static void pingJson (struct afb_req request) {
+static void pingJson (afb_req request) {
     json_object *jresp, *embed;
 
     jresp = json_object_new_object();
@@ -161,15 +164,15 @@ static void pingJson (struct afb_req request) {
 
 static void subcallcb (void *prequest, int iserror, json_object *object)
 {
-	struct afb_req request = afb_req_unstore(prequest);
+	afb_req request = afb_req_unstore(prequest);
 	if (iserror)
 		afb_req_fail(request, "failed", json_object_to_json_string(object));
 	else
-		afb_req_success(request, object, NULL);
+		afb_req_success(request, json_object_get(object), NULL);
 	afb_req_unref(request);
 }
 
-static void subcall (struct afb_req request)
+static void subcall (afb_req request)
 {
 	const char *api = afb_req_value(request, "api");
 	const char *verb = afb_req_value(request, "verb");
@@ -182,98 +185,226 @@ static void subcall (struct afb_req request)
 		afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
 }
 
-static void eventadd (struct afb_req request)
+static void subcallsync (afb_req request)
+{
+	int rc;
+	const char *api = afb_req_value(request, "api");
+	const char *verb = afb_req_value(request, "verb");
+	const char *args = afb_req_value(request, "args");
+	json_object *result, *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+	if (object == NULL)
+		afb_req_fail(request, "failed", "bad arguments");
+	else {
+		rc = afb_req_subcall_sync(request, api, verb, object, &result);
+		if (rc)
+			afb_req_success(request, result, NULL);
+		else {
+			afb_req_fail(request, "failed", json_object_to_json_string(result));
+			json_object_put(result);
+		}
+	}
+}
+
+static void eventadd (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 	const char *name = afb_req_value(request, "name");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL || name == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_add(tag, name))
 		afb_req_fail(request, "failed", "creation error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventdel (struct afb_req request)
+static void eventdel (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_del(tag))
 		afb_req_fail(request, "failed", "deletion error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventsub (struct afb_req request)
+static void eventsub (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_subscribe(request, tag))
 		afb_req_fail(request, "failed", "subscription error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventunsub (struct afb_req request)
+static void eventunsub (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_unsubscribe(request, tag))
 		afb_req_fail(request, "failed", "unsubscription error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventpush (struct afb_req request)
+static void eventpush (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 	const char *data = afb_req_value(request, "data");
 	json_object *object = data ? json_tokener_parse(data) : NULL;
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 > event_push(object, tag))
 		afb_req_fail(request, "failed", "push error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
+	json_object_put(object);
+}
+
+static void callcb (void *prequest, int iserror, json_object *object)
+{
+	afb_req request = afb_req_unstore(prequest);
+	if (iserror)
+		afb_req_fail(request, "failed", json_object_to_json_string(object));
+	else
+		afb_req_success(request, json_object_get(object), NULL);
+	afb_req_unref(request);
+}
+
+static void call (afb_req request)
+{
+	const char *api = afb_req_value(request, "api");
+	const char *verb = afb_req_value(request, "verb");
+	const char *args = afb_req_value(request, "args");
+	json_object *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+	if (object == NULL)
+		afb_req_fail(request, "failed", "bad arguments");
+	else
+		afb_service_call(api, verb, object, callcb, afb_req_store(request));
+}
+
+static void callsync (afb_req request)
+{
+	int rc;
+	const char *api = afb_req_value(request, "api");
+	const char *verb = afb_req_value(request, "verb");
+	const char *args = afb_req_value(request, "args");
+	json_object *result, *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+	if (object == NULL)
+		afb_req_fail(request, "failed", "bad arguments");
+	else {
+		rc = afb_service_call_sync(api, verb, object, &result);
+		if (rc)
+			afb_req_success(request, result, NULL);
+		else {
+			afb_req_fail(request, "failed", json_object_to_json_string(result));
+			json_object_put(result);
+		}
+	}
+}
+
+static void verbose (afb_req request)
+{
+	int level = 5;
+	json_object *query = afb_req_json(request), *l;
+
+	if (json_object_is_type(query,json_type_int))
+		level = json_object_get_int(query);
+	else if (json_object_object_get_ex(query, "level", &l) && json_object_is_type(l, json_type_int))
+		level = json_object_get_int(l);
+
+	if (!json_object_object_get_ex(query,"message",&l))
+		l = query;
+
+	AFB_REQ_VERBOSE(request, level, "verbose called for %s", json_object_get_string(l));
+	afb_req_success(request, NULL, NULL);
+}
+
+static void exitnow (afb_req request)
+{
+	int code = 0;
+	json_object *query = afb_req_json(request), *l;
+
+	if (json_object_is_type(query,json_type_int))
+		code = json_object_get_int(query);
+	else if (json_object_object_get_ex(query, "code", &l) && json_object_is_type(l, json_type_int))
+		code = json_object_get_int(l);
+
+	if (!json_object_object_get_ex(query,"reason",&l))
+		l = NULL;
+
+	REQ_NOTICE(request, "in phase of exiting with code %d, reason: %s", code, l ? json_object_get_string(l) : "unknown");
+	afb_req_success(request, NULL, NULL);
+	exit(code);
+}
+
+static int preinit()
+{
+	NOTICE("hello binding comes to live");
+	return 0;
+}
+
+static int init()
+{
+	NOTICE("hello binding starting");
+	return 0;
+}
+
+static void onevent(const char *event, struct json_object *object)
+{
+	NOTICE("received event %s(%s)", event, json_object_to_json_string(object));
 }
 
 // NOTE: this sample does not use session to keep test a basic as possible
 //       in real application most APIs should be protected with AFB_SESSION_CHECK
-static const struct AFB_verb_desc_v1 verbs[]= {
-  {"ping"     , AFB_SESSION_NONE, pingSample  , "Ping Application Framework"},
-  {"pingfail" , AFB_SESSION_NONE, pingFail    , "Fails"},
-  {"pingnull" , AFB_SESSION_NONE, pingNull    , "Return NULL"},
-  {"pingbug"  , AFB_SESSION_NONE, pingBug     , "Do a Memory Violation"},
-  {"pingJson" , AFB_SESSION_NONE, pingJson    , "Return a JSON object"},
-  {"pingevent", AFB_SESSION_NONE, pingEvent   , "Send an event"},
-  {"subcall",   AFB_SESSION_NONE, subcall     , "Call api/verb(args)"},
-  {"eventadd",  AFB_SESSION_NONE, eventadd    , "adds the event of 'name' for the 'tag'"},
-  {"eventdel",  AFB_SESSION_NONE, eventdel    , "deletes the event of 'tag'"},
-  {"eventsub",  AFB_SESSION_NONE, eventsub    , "subscribes to the event of 'tag'"},
-  {"eventunsub",AFB_SESSION_NONE, eventunsub  , "unsubscribes to the event of 'tag'"},
-  {"eventpush", AFB_SESSION_NONE, eventpush   , "pushs the event of 'tag' with the 'data'"},
-  {NULL}
+static const afb_verb_v2 verbs[]= {
+  { "ping"     ,    pingSample , NULL, AFB_SESSION_NONE },
+  { "pingfail" ,    pingFail   , NULL, AFB_SESSION_NONE },
+  { "pingnull" ,    pingNull   , NULL, AFB_SESSION_NONE },
+  { "pingbug"  ,    pingBug    , NULL, AFB_SESSION_NONE },
+  { "pingJson" ,    pingJson   , NULL, AFB_SESSION_NONE },
+  { "pingevent",    pingEvent  , NULL, AFB_SESSION_NONE },
+  { "subcall",      subcall    , NULL, AFB_SESSION_NONE },
+  { "subcallsync",  subcallsync, NULL, AFB_SESSION_NONE },
+  { "eventadd",     eventadd   , NULL, AFB_SESSION_NONE },
+  { "eventdel",     eventdel   , NULL, AFB_SESSION_NONE },
+  { "eventsub",     eventsub   , NULL, AFB_SESSION_NONE },
+  { "eventunsub",   eventunsub , NULL, AFB_SESSION_NONE },
+  { "eventpush",    eventpush  , NULL, AFB_SESSION_NONE },
+  { "call",         call       , NULL, AFB_SESSION_NONE },
+  { "callsync",     callsync   , NULL, AFB_SESSION_NONE },
+  { "verbose",      verbose    , NULL, AFB_SESSION_NONE },
+  { "exit",         exitnow    , NULL, AFB_SESSION_NONE },
+  { NULL}
 };
 
-static const struct AFB_plugin plugin_desc = {
-	.type = AFB_PLUGIN_VERSION_1,
-	.v1 = {
-		.info = "Minimal Hello World Sample",
-		.prefix = "hello",
-		.verbs = verbs
-	}
+const afb_binding_v2 afbBindingV2 = {
+	.api = "hello",
+	.specification = NULL,
+	.verbs = verbs,
+	.preinit = preinit,
+	.init = init,
+	.onevent = onevent
 };
 
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
-{
-	interface = itf;
-	return &plugin_desc;
-}