improve log
[src/app-framework-binder.git] / src / afb-api-so-v2.c
index 7df83dd..11cd56f 100644 (file)
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <string.h>
 #include <dlfcn.h>
 #include <assert.h>
 
 #include <afb/afb-binding.h>
+#include <json-c/json.h>
 
-#include "afb-apis.h"
+#include "afb-api.h"
+#include "afb-api-so-v2.h"
+#include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-ditf.h"
 #include "afb-evt.h"
  * names of symbols
  */
 static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
+static const char afb_api_so_v2_verbosity[] = "afbBindingV2verbosity";
 
 /*
  * Description of a binding
  */
 struct api_so_v2 {
-       struct afb_binding_v2 *binding; /* descriptor */
+       const struct afb_binding_v2 *binding;   /* descriptor */
+       int *verbosity;                         /* verbosity */
        void *handle;                   /* context of dlopen */
        struct afb_svc *service;        /* handler for service started */
        struct afb_ditf ditf;           /* daemon interface */
 };
 
-static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb)
+static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name)
 {
-       const struct afb_verb_v2 *result;
+       const struct afb_verb_v2 *verb;
 
-       result = desc->binding->verbs;
-       while (result->verb && strcasecmp(result->verb, verb))
-               result++;
-       return result->verb ? result : NULL;
+       verb = desc->binding->verbs;
+       while (verb->verb && strcasecmp(verb->verb, name))
+               verb++;
+       return verb->verb ? verb : NULL;
+       return NULL;
 }
 
 static void call_cb(void *closure, struct afb_xreq *xreq)
@@ -65,16 +71,13 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
        const struct afb_verb_v2 *verb;
 
        verb = search(desc, xreq->verb);
-       if (!verb)
-               afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api);
-       else
-               afb_xreq_call(xreq, verb->session, verb->callback);
+       afb_xreq_call_verb_v2(xreq, verb);
 }
 
-static int service_start_cb(void *closure, int share_session, int onneed)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
 {
-       int (*start)(const struct afb_binding_interface *interface, struct afb_service service);
-       void (*onevent)(const char *event, struct json_object *object);
+       int (*start)(struct afb_service service);
+       void (*onevent)(struct afb_service service, const char *event, struct json_object *object);
 
        struct api_so_v2 *desc = closure;
 
@@ -103,7 +106,7 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 
        /* get the event handler if any */
        onevent = desc->binding->onevent;
-       desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->ditf.interface);
+       desc->service = afb_svc_create_v2(apiset, share_session, start, onevent, &desc->ditf);
        if (desc->service == NULL) {
                /* starting error */
                ERROR("Starting service %s failed", desc->binding->api);
@@ -113,70 +116,84 @@ static int service_start_cb(void *closure, int share_session, int onneed)
        return 0;
 }
 
-int afb_api_so_v2_add(const char *path, void *handle)
+static void update_hooks_cb(void *closure)
 {
-       int rc;
-       struct api_so_v2 *desc;
-       struct afb_binding_v2 *binding;
+       struct api_so_v2 *desc = closure;
+       afb_ditf_update_hook(&desc->ditf);
+}
 
-       /* retrieves the register function */
-       binding = dlsym(handle, afb_api_so_v2_descriptor);
-       if (!binding)
-               return 0;
+static int get_verbosity_cb(void *closure)
+{
+       struct api_so_v2 *desc = closure;
+       return *desc->verbosity;
+}
 
-       INFO("binding [%s] looks like an AFB binding V2", path);
+static void set_verbosity_cb(void *closure, int level)
+{
+       struct api_so_v2 *desc = closure;
+       *desc->verbosity = level;
+}
+
+static struct json_object *describe_cb(void *closure)
+{
+       struct api_so_v2 *desc = closure;
+       return desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
+}
+
+static struct afb_api_itf so_v2_api_itf = {
+       .call = call_cb,
+       .service_start = service_start_cb,
+       .update_hooks = update_hooks_cb,
+       .get_verbosity = get_verbosity_cb,
+       .set_verbosity = set_verbosity_cb,
+       .describe = describe_cb
+
+};
+
+int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, int *pver)
+{
+       int rc;
+       struct api_so_v2 *desc;
+       struct afb_api afb_api;
 
        /* basic checks */
-       if (binding->api == NULL || *binding->api == 0) {
-               ERROR("binding [%s] bad api name...", path);
-               goto error;
-       }
-       if (!afb_apis_is_valid_api_name(binding->api)) {
-               ERROR("binding [%s] invalid api name...", path);
-               goto error;
-       }
-       if (binding->specification == NULL || *binding->specification == 0) {
-               ERROR("binding [%s] bad specification...", path);
-               goto error;
-       }
-       if (binding->verbs == NULL) {
-               ERROR("binding [%s] no verbs...", path);
-               goto error;
-       }
+       assert(binding->api);
+       assert(binding->specification);
+       assert(binding->verbs);
 
        /* allocates the description */
-       desc = calloc(1, sizeof *desc);
+       desc = malloc(sizeof *desc);
        if (desc == NULL) {
                ERROR("out of memory");
                goto error;
        }
        desc->binding = binding;
+       desc->verbosity = pver;
        desc->handle = handle;
+       desc->service = NULL;
+       memset(&desc->ditf, 0, sizeof desc->ditf);
 
        /* init the interface */
-       afb_ditf_init(&desc->ditf, binding->api);
-
-       /* for log purpose, a fake binding is needed here */
+       afb_ditf_init_v2(&desc->ditf, binding->api);
 
        /* init the binding */
        if (binding->init) {
-               NOTICE("binding %s [%s] calling init function", binding->api, path);
-               rc = binding->init(&desc->ditf.interface);
+               INFO("binding %s calling init function", binding->api);
+               rc = binding->init(desc->ditf.daemon);
                if (rc < 0) {
-                       ERROR("binding %s [%s] initialisation function failed...", binding->api, path);
+                       ERROR("binding %s initialisation function failed...", binding->api);
                        goto error2;
                }
        }
 
        /* records the binding */
-       if (afb_apis_add(binding->api, (struct afb_api){
-                       .closure = desc,
-                       .call = call_cb,
-                       .service_start = service_start_cb }) < 0) {
-               ERROR("binding [%s] can't be registered...", path);
+       afb_api.closure = desc;
+       afb_api.itf = &so_v2_api_itf;
+       if (afb_apiset_add(apiset, binding->api, afb_api) < 0) {
+               ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset));
                goto error2;
        }
-       NOTICE("binding %s loaded with API prefix %s", path, binding->api);
+       INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
        return 1;
 
 error2:
@@ -185,3 +202,44 @@ error:
        return -1;
 }
 
+int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
+{
+       const struct afb_binding_v2 *binding;
+       int *pver;
+
+       /* retrieves the register function */
+       binding = dlsym(handle, afb_api_so_v2_descriptor);
+       pver = dlsym(handle, afb_api_so_v2_verbosity);
+       if (!binding && !pver)
+               return 0;
+
+       INFO("binding [%s] looks like an AFB binding V2", path);
+
+       /* basic checks */
+       if (!binding || !pver) {
+               ERROR("binding [%s] incomplete symbols...", path);
+               goto error;
+       }
+       if (binding->api == NULL || *binding->api == 0) {
+               ERROR("binding [%s] bad api name...", path);
+               goto error;
+       }
+       if (!afb_api_is_valid_name(binding->api)) {
+               ERROR("binding [%s] invalid api name...", path);
+               goto error;
+       }
+       if (binding->specification == NULL || *binding->specification == 0) {
+               ERROR("binding [%s] bad specification...", path);
+               goto error;
+       }
+       if (binding->verbs == NULL) {
+               ERROR("binding [%s] no verbs...", path);
+               goto error;
+       }
+
+       return afb_api_so_v2_add_binding(binding, handle, apiset, pver);
+
+ error:
+       return -1;
+}
+