*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
+#include <stdlib.h>
#include <string.h>
#include <dlfcn.h>
#include <assert.h>
afb_xreq_call_verb_v2(xreq, verb);
}
-struct call_sync
-{
- struct api_so_v2 *desc;
- struct afb_xreq *xreq;
-};
-
-static void call_sync_cb_cb(int signum, void *closure)
-{
- struct call_sync *cs = closure;
- if (!signum)
- call_cb(cs->desc, cs->xreq);
- else {
- if (!cs->xreq->replied)
- afb_xreq_fail(cs->xreq, "aborted", "internal error");
- }
-}
-
-static void call_sync_cb(void *closure, struct afb_xreq *xreq)
-{
- struct call_sync cs = { .desc = closure, .xreq = xreq };
-
- if (jobs_call(closure, 0, call_sync_cb_cb, &cs))
- call_cb(closure, xreq);
-}
-
static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
{
+ int rc;
int (*start)();
void (*onevent)(const char *event, struct json_object *object);
if (desc->service != NULL) {
/* not an error when onneed */
if (onneed != 0)
- return 0;
+ goto done;
/* already started: it is an error */
- ERROR("Service %s already started", desc->binding->api);
+ ERROR("Service %s already started", desc->ditf.api);
return -1;
}
if (start == NULL && onevent == NULL) {
/* not an error when onneed */
if (onneed != 0)
- return 0;
+ goto done;
/* no initialisation method */
- ERROR("Binding %s is not a service", desc->binding->api);
+ ERROR("Binding %s is not a service", desc->ditf.api);
return -1;
}
/* get the event handler if any */
- desc->service = afb_svc_create_v2(apiset, share_session, start, onevent, desc->data);
+ desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, &desc->data->service);
if (desc->service == NULL) {
/* starting error */
- ERROR("Starting service %s failed", desc->binding->api);
+ ERROR("Starting service %s failed", desc->ditf.api);
return -1;
}
+ /* Starts the service */
+ desc->ditf.state = Daemon_Init;
+ rc = afb_svc_start_v2(desc->service, start);
+ if (rc < 0) {
+ /* initialisation error */
+ ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc);
+ afb_svc_destroy(desc->service, &desc->data->service);
+ desc->service = NULL;
+ return rc;
+ }
+
+done:
+ desc->ditf.state = Daemon_Run;
return 0;
}
{
struct api_so_v2 *desc = closure;
afb_ditf_update_hook(&desc->ditf);
+ if (desc->service)
+ afb_svc_update_hook(desc->service);
}
static int get_verbosity_cb(void *closure)
return addperm_key_val(o, key, json_object_new_int(val));
}
-static struct json_object *make_description(struct api_so_v2 *desc)
+static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
{
char buffer[256];
const struct afb_verb_v2 *verb;
i = json_object_new_object();
json_object_object_add(r, "info", i);
- json_object_object_add(i, "title", json_object_new_string(desc->binding->api));
+ json_object_object_add(i, "title", json_object_new_string(desc->ditf.api));
json_object_object_add(i, "version", json_object_new_string("0.0.0"));
+ json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: desc->ditf.api));
p = json_object_new_object();
json_object_object_add(r, "paths", p);
json_object_object_add(g, "responses", a);
f = json_object_new_object();
json_object_object_add(a, "200", f);
- json_object_object_add(f, "description", json_object_new_string(verb->verb));
+ json_object_object_add(f, "description", json_object_new_string(verb->info?:verb->verb));
verb++;
}
return r;
struct api_so_v2 *desc = closure;
struct json_object *r = desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
if (!r)
- r = make_description(desc);
+ r = make_description_openAPIv3(desc);
return r;
}
.describe = describe_cb
};
-static struct afb_api_itf so_v2_sync_api_itf = {
- .call = call_sync_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, struct afb_binding_data_v2 *data)
{
int rc;
INFO("binding %s calling preinit function", binding->api);
rc = binding->preinit();
if (rc < 0) {
- ERROR("binding %s preinit function failed...", binding->api);
+ ERROR("binding %s preinit function failed...", desc->ditf.api);
goto error2;
}
}
/* records the binding */
afb_api.closure = desc;
- afb_api.itf = binding->noconcurrency ? &so_v2_sync_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));
+ afb_api.itf = &so_v2_api_itf;
+ afb_api.noconcurrency = binding->noconcurrency;
+ if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) {
+ ERROR("binding %s can't be registered to set %s...", desc->ditf.api, afb_apiset_name(apiset));
goto error2;
}
- INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
+ INFO("binding %s added to set %s", desc->ditf.api, afb_apiset_name(apiset));
return 1;
error2: