Add 'afb_service_call_sync' function
[src/app-framework-binder.git] / bindings / samples / HelloWorld.c
index 585154e..6c904bd 100644 (file)
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
+
 #include <json-c/json.h>
 
+#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
 {
@@ -76,7 +80,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 */
@@ -137,7 +141,7 @@ static void pingBug (struct afb_req request)
 static void pingEvent(struct 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");
 }
 
@@ -178,10 +182,8 @@ 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)
@@ -196,13 +198,12 @@ static void subcallsync (struct afb_req request)
                afb_req_fail(request, "failed", "bad arguments");
        else {
                rc = afb_req_subcall_sync(request, api, verb, object, &result);
-               if (rc) {
+               if (rc)
                        afb_req_success(request, result, NULL);
-               else {
+               else {
                        afb_req_fail(request, "failed", json_object_to_json_string(result));
                        json_object_put(result);
                }
-               json_object_put(object);
        }
 }
 
@@ -211,48 +212,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)
@@ -261,12 +270,59 @@ 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 callcb (void *prequest, int iserror, json_object *object)
+{
+       struct 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 (struct 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 (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_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 exitnow (struct afb_req request)
@@ -274,37 +330,45 @@ static void exitnow (struct afb_req request)
        exit(0);
 }
 
+static int preinit()
+{
+       NOTICE("hello binding comes to live");
+       return 0;
+}
+
+static int init()
+{
+       NOTICE("hello binding starting");
+       return 0;
+}
+
 // 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)"},
-  {"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}
+static const struct 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 },
+  { "exit",         exitnow    , NULL, AFB_SESSION_NONE },
+  { NULL}
 };
 
-static const struct afb_binding plugin_desc = {
-       .type = AFB_BINDING_VERSION_1,
-       .v1 = {
-               .info = "Minimal Hello World Sample",
-               .prefix = "hello",
-               .verbs = verbs
-       }
+const struct afb_binding_v2 afbBindingV2 = {
+       .api = "hello",
+       .specification = NULL,
+       .verbs = verbs,
+       .preinit = preinit,
+       .init = init
 };
 
-const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
-{
-       interface = itf;
-       return &plugin_desc;
-}