X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=c6fa779cb1f3c2e9d4559c1f5d47a351d342113f;hb=af552129e778954878a3a3b4e0138fdb2c1f2602;hp=48059cf53bf9e69c058544e9563161a89477af1a;hpb=574c9987543b2b615a8ebdeda2b35062b0730742;p=src%2Fapp-framework-binder.git

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 48059cf5..c6fa779c 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-binding.h>
 
 const struct afb_binding_interface *interface;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 struct event
 {
@@ -131,7 +134,7 @@ static void pingNull (struct afb_req request)
 
 static void pingBug (struct afb_req request)
 {
-	ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug");
+	ping((struct afb_req){NULL,NULL}, NULL, "pingBug");
 }
 
 static void pingEvent(struct afb_req request)
@@ -165,7 +168,7 @@ static void subcallcb (void *prequest, int iserror, json_object *object)
 	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);
 }
 
@@ -178,8 +181,32 @@ static void subcall (struct afb_req request)
 
 	if (object == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
-	else
+	else {
 		afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
+		json_object_put(object);
+	}
+}
+
+static void subcallsync (struct 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);
+		}
+		json_object_put(object);
+	}
 }
 
 static void eventadd (struct afb_req request)
@@ -187,48 +214,56 @@ static void eventadd (struct 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)
 {
 	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)
 {
 	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)
 {
 	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)
@@ -237,12 +272,20 @@ static void eventpush (struct afb_req request)
 	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 exitnow (struct afb_req request)
+{
+	exit(0);
 }
 
 // NOTE: this sample does not use session to keep test a basic as possible
@@ -255,11 +298,13 @@ static const struct afb_verb_desc_v1 verbs[]= {
   {"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)"},
+  {"subcallsync",   AFB_SESSION_NONE, subcallsync     , "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'"},
+  {"exit",      AFB_SESSION_NONE, exitnow     , "exits from afb-daemon"},
   {NULL}
 };
 
@@ -275,5 +320,6 @@ static const struct afb_binding plugin_desc = {
 const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
 {
 	interface = itf;
+	NOTICE(interface, "hello plugin comes to live");
 	return &plugin_desc;
 }