/*
- * 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");
#define _GNU_SOURCE
#include <stdio.h>
#include <string.h>
+#include <pthread.h>
+
#include <json-c/json.h>
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
-const struct AFB_interface *interface;
+const struct afb_binding_interface *interface;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
struct event
{
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)
// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
static void pingJson (struct afb_req request) {
- json_object *jresp, *embed;
-
+ json_object *jresp, *embed;
+
jresp = json_object_new_object();
json_object_object_add(jresp, "myString", json_object_new_string ("Some String"));
json_object_object_add(jresp, "myInt", json_object_new_int (1234));
-
+
embed = json_object_new_object();
json_object_object_add(embed, "subObjString", json_object_new_string ("Some String"));
json_object_object_add(embed, "subObjInt", json_object_new_int (5678));
-
+
json_object_object_add(jresp,"eobj", embed);
ping(request, jresp, "pingJson");
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);
}
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)
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)
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);
+}
+
+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"},
{"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",
}
};
-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;
}
Code Review / src / app-framework-binder.git / blobdiff