X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=c6fa779cb1f3c2e9d4559c1f5d47a351d342113f;hb=af552129e778954878a3a3b4e0138fdb2c1f2602;hp=15544895842f0443f0d2c6077b9a7dbb9ed90163;hpb=bbddc1e584dd01b60042f622f8cecfc69361020b;p=src%2Fapp-framework-binder.git diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c index 15544895..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 #include +#include + #include -#include +#include -const struct AFB_interface *interface; +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,17 +272,25 @@ 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 // in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct AFB_verb_desc_v1 verbs[]= { +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"}, @@ -255,16 +298,18 @@ 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} }; -static const struct AFB_plugin plugin_desc = { - .type = AFB_PLUGIN_VERSION_1, +static const struct afb_binding plugin_desc = { + .type = AFB_BINDING_VERSION_1, .v1 = { .info = "Minimal Hello World Sample", .prefix = "hello", @@ -272,8 +317,9 @@ static const struct AFB_plugin plugin_desc = { } }; -const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf) +const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) { interface = itf; + NOTICE(interface, "hello plugin comes to live"); return &plugin_desc; }