X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=0f58a43b26d3a2d14504b6916f75c1f132ee3363;hb=305d98f7b6db1a3207cc877bd2cda819e3b90656;hp=09c7d3e71d2fa16e71bfa5a406471004e62d6edd;hpb=5254a884edde7a8e786d3fde925db4adf3579d21;p=src%2Fapp-framework-binder.git

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 09c7d3e7..0f58a43b 100644
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -24,7 +24,6 @@
 #define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 
-const struct afb_binding_interface *interface;
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 struct event
@@ -89,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);
@@ -110,35 +109,42 @@ static int event_push(struct json_object *args, const char *tag)
 	return e ? afb_event_push(e->event, json_object_get(args)) : -1;
 }
 
+static int event_broadcast(struct json_object *args, const char *tag)
+{
+	struct event *e;
+	e = event_get(tag);
+	return e ? afb_event_broadcast(e->event, json_object_get(args)) : -1;
+}
+
 // 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, "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("event", json_object_get(query));
@@ -147,7 +153,7 @@ static void pingEvent(struct afb_req request)
 
 
 // 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();
@@ -165,7 +171,7 @@ 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
@@ -173,7 +179,7 @@ static void subcallcb (void *prequest, int iserror, json_object *object)
 	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");
@@ -186,7 +192,7 @@ static void subcall (struct afb_req request)
 		afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
 }
 
-static void subcallsync (struct afb_req request)
+static void subcallsync (afb_req request)
 {
 	int rc;
 	const char *api = afb_req_value(request, "api");
@@ -207,7 +213,7 @@ static void subcallsync (struct afb_req request)
 	}
 }
 
-static void eventadd (struct afb_req request)
+static void eventadd (afb_req request)
 {
 	const char *tag = afb_req_value(request, "tag");
 	const char *name = afb_req_value(request, "name");
@@ -222,7 +228,7 @@ static void eventadd (struct afb_req request)
 	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");
 
@@ -236,7 +242,7 @@ static void eventdel (struct afb_req request)
 	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");
 
@@ -250,7 +256,7 @@ static void eventsub (struct afb_req request)
 	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");
 
@@ -264,7 +270,7 @@ static void eventunsub (struct afb_req request)
 	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");
@@ -283,7 +289,7 @@ static void eventpush (struct afb_req request)
 
 static void callcb (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
@@ -291,7 +297,7 @@ static void callcb (void *prequest, int iserror, json_object *object)
 	afb_req_unref(request);
 }
 
-static void call (struct afb_req request)
+static void call (afb_req request)
 {
 	const char *api = afb_req_value(request, "api");
 	const char *verb = afb_req_value(request, "verb");
@@ -304,7 +310,7 @@ static void call (struct afb_req request)
 		afb_service_call(api, verb, object, callcb, afb_req_store(request));
 }
 
-static void callsync (struct afb_req request)
+static void callsync (afb_req request)
 {
 	int rc;
 	const char *api = afb_req_value(request, "api");
@@ -325,9 +331,64 @@ static void callsync (struct afb_req request)
 	}
 }
 
-static void exitnow (struct afb_req request)
+static void verbose (afb_req request)
 {
-	exit(0);
+	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 void broadcast(afb_req request)
+{
+	const char *tag = afb_req_value(request, "tag");
+	const char *name = afb_req_value(request, "name");
+	const char *data = afb_req_value(request, "data");
+	json_object *object = data ? json_tokener_parse(data) : NULL;
+
+	if (tag != NULL) {
+		pthread_mutex_lock(&mutex);
+		if (0 > event_broadcast(object, tag))
+			afb_req_fail(request, "failed", "broadcast error");
+		else
+			afb_req_success(request, NULL, NULL);
+		pthread_mutex_unlock(&mutex);
+	} else if (name != NULL) {
+		if (0 > afb_daemon_broadcast_event(name, object))
+			afb_req_fail(request, "failed", "broadcast error");
+		else
+			afb_req_success(request, NULL, NULL);
+	} else {
+		afb_req_fail(request, "failed", "bad arguments");
+	}
+	json_object_put(object);
 }
 
 static int preinit()
@@ -349,7 +410,7 @@ static void onevent(const char *event, struct json_object *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_v2 verbs[]= {
+static const afb_verb_v2 verbs[]= {
   { "ping"     ,    pingSample , NULL, AFB_SESSION_NONE },
   { "pingfail" ,    pingFail   , NULL, AFB_SESSION_NONE },
   { "pingnull" ,    pingNull   , NULL, AFB_SESSION_NONE },
@@ -365,11 +426,13 @@ static const struct afb_verb_v2 verbs[]= {
   { "eventpush",    eventpush  , NULL, AFB_SESSION_NONE },
   { "call",         call       , NULL, AFB_SESSION_NONE },
   { "callsync",     callsync   , NULL, AFB_SESSION_NONE },
+  { "verbose",      verbose    , NULL, AFB_SESSION_NONE },
+  { "broadcast",    broadcast  , NULL, AFB_SESSION_NONE },
   { "exit",         exitnow    , NULL, AFB_SESSION_NONE },
   { NULL}
 };
 
-const struct afb_binding_v2 afbBindingV2 = {
+const afb_binding_v2 afbBindingV2 = {
 	.api = "hello",
 	.specification = NULL,
 	.verbs = verbs,