#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <errno.h>
#include "jobs.h"
#include "verbose.h"
+/******************************************************************************/
+
+static void vinfo(void *first, void *second, const char *fmt, va_list args, void (*fun)(void*,void*,const char*))
+{
+ char *info;
+ if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+ info = NULL;
+ fun(first, second, info);
+ free(info);
+}
+
+/******************************************************************************/
static struct json_object *xreq_json_cb(void *closure)
{
}
}
-static const char *xreq_raw_cb(void *closure, size_t *size)
+static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
- const char *result = json_object_to_json_string(xreq_json_cb(xreq));
- if (size != NULL)
- *size = strlen(result);
- return result;
+ vinfo(closure, obj, fmt, args, (void*)xreq_success_cb);
}
-static void xreq_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
{
- struct json_object *obj = json_tokener_parse(buffer);
- if (!obj == !buffer)
- xreq_success_cb(closure, obj, "fake send");
- else
- xreq_fail_cb(closure, "fake-send-failed", "fake send");
+ vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
}
static void *xreq_context_get_cb(void *closure)
{
struct afb_xreq *xreq = closure;
- if (xreq->queryitf->subcall)
+ if (xreq->queryitf->subcall) {
xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure);
- else
+ json_object_put(args);
+ } else {
afb_subcall(xreq, api, verb, args, callback, cb_closure);
+ }
+}
+
+struct xreq_sync
+{
+ struct afb_xreq *caller;
+ const char *api;
+ const char *verb;
+ struct json_object *args;
+ struct jobloop *jobloop;
+ struct json_object *result;
+ int iserror;
+};
+
+static void xreq_sync_leave(struct xreq_sync *sync)
+{
+ struct jobloop *jobloop = sync->jobloop;
+ if (jobloop) {
+ sync->jobloop = NULL;
+ jobs_leave(jobloop);
+ }
+}
+
+static void xreq_sync_reply(void *closure, int iserror, struct json_object *obj)
+{
+ struct xreq_sync *sync = closure;
+
+ sync->iserror = iserror;
+ sync->result = json_object_get(obj);
+ xreq_sync_leave(sync);
+}
+
+static void xreq_sync_enter(int signum, void *closure, struct jobloop *jobloop)
+{
+ struct xreq_sync *sync = closure;
+
+ if (!signum) {
+ sync->jobloop = jobloop;
+ xreq_subcall_cb(sync->caller, sync->api, sync->verb, json_object_get(sync->args), xreq_sync_reply, sync);
+ } else {
+ sync->iserror = 1;
+ xreq_sync_leave(sync);
+ }
}
static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
+ int rc;
+ struct xreq_sync sync;
struct afb_xreq *xreq = closure;
- return afb_subcall_sync(xreq, api, verb, args, result);
+
+ sync.caller = xreq;
+ sync.api = api;
+ sync.verb = verb;
+ sync.args = args;
+ sync.jobloop = NULL;
+ sync.result = NULL;
+ sync.iserror = 1;
+
+ rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync);
+ json_object_put(args);
+ if (rc < 0 || sync.iserror) {
+ *result = sync.result ? : afb_msg_json_internal_error();
+ return 0;
+ }
+ *result = sync.result;
+ return 1;
}
+static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+ /* TODO: improves the implementation. example: on condition make a list of log messages that will be returned */
+ vverbose(level, file, line, func, fmt, args);
+}
+
+/******************************************************************************/
+
static struct json_object *xreq_hooked_json_cb(void *closure)
{
struct json_object *r = xreq_json_cb(closure);
xreq_fail_cb(closure, status, info);
}
-static const char *xreq_hooked_raw_cb(void *closure, size_t *size)
+static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
{
- size_t s;
- const char *r = xreq_raw_cb(closure, size ? : &s);
- struct afb_xreq *xreq = closure;
- return afb_hook_xreq_raw(xreq, r, *(size ? : &s));
+ vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb);
}
-static void xreq_hooked_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
- afb_hook_xreq_send(xreq, buffer, size);
- xreq_send_cb(closure, buffer, size);
+ vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
}
static void *xreq_hooked_context_get_cb(void *closure)
return afb_hook_xreq_subcallsync_result(xreq, r, *result);
}
+static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+ struct afb_xreq *xreq = closure;
+ va_list ap;
+ va_copy(ap, args);
+ xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+ afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+ va_end(ap);
+}
+
+/******************************************************************************/
+
const struct afb_req_itf xreq_itf = {
.json = xreq_json_cb,
.get = xreq_get_cb,
.success = xreq_success_cb,
.fail = xreq_fail_cb,
- .raw = xreq_raw_cb,
- .send = xreq_send_cb,
+ .vsuccess = xreq_vsuccess_cb,
+ .vfail = xreq_vfail_cb,
.context_get = xreq_context_get_cb,
.context_set = xreq_context_set_cb,
.addref = xreq_addref_cb,
.subscribe = xreq_subscribe_cb,
.unsubscribe = xreq_unsubscribe_cb,
.subcall = xreq_subcall_cb,
- .subcallsync = xreq_subcallsync_cb
+ .subcallsync = xreq_subcallsync_cb,
+ .vverbose = xreq_vverbose_cb
};
const struct afb_req_itf xreq_hooked_itf = {
.get = xreq_hooked_get_cb,
.success = xreq_hooked_success_cb,
.fail = xreq_hooked_fail_cb,
- .raw = xreq_hooked_raw_cb,
- .send = xreq_hooked_send_cb,
+ .vsuccess = xreq_hooked_vsuccess_cb,
+ .vfail = xreq_hooked_vfail_cb,
.context_get = xreq_hooked_context_get_cb,
.context_set = xreq_hooked_context_set_cb,
.addref = xreq_hooked_addref_cb,
.subscribe = xreq_hooked_subscribe_cb,
.unsubscribe = xreq_hooked_unsubscribe_cb,
.subcall = xreq_hooked_subcall_cb,
- .subcallsync = xreq_hooked_subcallsync_cb
+ .subcallsync = xreq_hooked_subcallsync_cb,
+ .vverbose = xreq_hooked_vverbose_cb
};
static inline struct afb_req to_req(struct afb_xreq *xreq)
return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
}
+/******************************************************************************/
+
struct json_object *afb_xreq_json(struct afb_xreq *xreq)
{
return afb_req_json(to_req(xreq));
const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
{
- return afb_req_raw(to_req(xreq), size);
+ struct json_object *obj = xreq_json_cb(xreq);
+ const char *result = json_object_to_json_string(obj);
+ if (size != NULL)
+ *size = strlen(result);
+ return result;
}
void afb_xreq_addref(struct afb_xreq *xreq)
afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
}
+int afb_xreq_unhooked_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+ return xreq_subcallsync_cb(xreq, api, verb, args, result);
+}
+
+int afb_xreq_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+ return afb_req_subcall_sync(to_req(xreq), api, verb, args, result);
+}
+
static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
{
int loa;
afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, xreq->api);
}
+static void process_sync(struct afb_xreq *xreq)
+{
+ struct afb_api api;
+
+ /* init hooking */
+ afb_hook_init_xreq(xreq);
+ if (xreq->hookflags)
+ afb_hook_xreq_begin(xreq);
+
+ /* search the api */
+ if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) {
+ afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+ } else {
+ xreq->context.api_key = api.closure;
+ api.itf->call(api.closure, xreq);
+ }
+}
+
static void process_async(int signum, void *arg)
{
struct afb_xreq *xreq = arg;
- struct afb_api api;
if (signum != 0) {
afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
} else {
- /* init hooking */
- afb_hook_init_xreq(xreq);
- if (xreq->hookflags)
- afb_hook_xreq_begin(xreq);
-
- /* search the api */
- if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) {
- afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
- } else {
- xreq->context.api_key = api.closure;
- api.itf->call(api.closure, xreq);
- }
+ process_sync(xreq);
}
afb_xreq_unref(xreq);
}
Code Review / src / app-framework-binder.git / blobdiff