#include "afb-msg-json.h"
#include "afb-subcall.h"
#include "afb-hook.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
+#include "jobs.h"
#include "verbose.h"
static struct json_object *xreq_json_cb(void *closure)
{
struct afb_xreq *xreq = closure;
- return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq->query));
+ return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
}
static struct afb_arg xreq_get_cb(void *closure, const char *name)
{
struct afb_xreq *xreq = closure;
if (xreq->queryitf->get)
- return xreq->queryitf->get(xreq->query, name);
+ return xreq->queryitf->get(xreq, name);
else
return afb_msg_json_get_arg(xreq_json_cb(closure), name);
}
static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
{
struct afb_xreq *xreq = closure;
- afb_xreq_success(xreq, obj, info);
-}
-void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
-{
if (xreq->replied) {
ERROR("reply called more than one time!!");
json_object_put(obj);
} else {
xreq->replied = 1;
if (xreq->queryitf->success)
- xreq->queryitf->success(xreq->query, obj, info);
+ xreq->queryitf->success(xreq, obj, info);
else
- xreq->queryitf->reply(xreq->query, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
+ xreq->queryitf->reply(xreq, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
}
}
static void xreq_fail_cb(void *closure, const char *status, const char *info)
{
struct afb_xreq *xreq = closure;
- afb_xreq_fail(xreq, status, info);
-}
-void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
-{
if (xreq->replied) {
ERROR("reply called more than one time!!");
} else {
xreq->replied = 1;
if (xreq->queryitf->fail)
- xreq->queryitf->fail(xreq->query, status, info);
+ xreq->queryitf->fail(xreq, status, info);
else
- xreq->queryitf->reply(xreq->query, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
+ xreq->queryitf->reply(xreq, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
}
}
static const char *xreq_raw_cb(void *closure, size_t *size)
{
struct afb_xreq *xreq = closure;
- return afb_xreq_raw(xreq, size);
-}
-
-const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
-{
const char *result = json_object_to_json_string(xreq_json_cb(xreq));
if (size != NULL)
*size = strlen(result);
static void xreq_addref_cb(void *closure)
{
struct afb_xreq *xreq = closure;
- afb_xreq_addref(xreq);
-}
-
-void afb_xreq_addref(struct afb_xreq *xreq)
-{
- xreq->refcount++;
+ __atomic_add_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED);
}
static void xreq_unref_cb(void *closure)
{
struct afb_xreq *xreq = closure;
- afb_xreq_unref(xreq);
-}
-
-void afb_xreq_unref(struct afb_xreq *xreq)
-{
- if (!--xreq->refcount) {
- xreq->queryitf->unref(xreq->query);
+ if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
+ xreq->queryitf->unref(xreq);
}
}
if (xreq->listener)
return afb_evt_add_watch(xreq->listener, event);
if (xreq->queryitf->subscribe)
- return xreq->queryitf->subscribe(xreq->query, event);
+ return xreq->queryitf->subscribe(xreq, event);
ERROR("no event listener, subscription impossible");
errno = EINVAL;
return -1;
if (xreq->listener)
return afb_evt_remove_watch(xreq->listener, event);
if (xreq->queryitf->unsubscribe)
- return xreq->queryitf->unsubscribe(xreq->query, event);
+ return xreq->queryitf->unsubscribe(xreq, event);
ERROR("no event listener, unsubscription impossible");
errno = EINVAL;
return -1;
{
struct afb_xreq *xreq = closure;
- afb_xreq_subcall(xreq, api, verb, args, callback, cb_closure);
-}
-
-void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
-{
if (xreq->queryitf->subcall)
- xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
+ xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure);
else
afb_subcall(xreq, api, verb, args, callback, cb_closure);
}
afb_hook_xreq_addref(xreq);
xreq_addref_cb(closure);
}
-/*
+
static void xreq_hooked_unref_cb(void *closure)
{
- TODO
+ struct afb_xreq *xreq = closure;
+ afb_hook_xreq_unref(xreq);
+ if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
+ afb_hook_xreq_end(xreq);
+ xreq->queryitf->unref(xreq);
+ }
}
-*/
+
static void xreq_hooked_session_close_cb(void *closure)
{
struct afb_xreq *xreq = closure;
return afb_hook_xreq_unsubscribe(xreq, event, r);
}
-/*
+struct reply
+{
+ struct afb_xreq *xreq;
+ void (*callback)(void*, int, struct json_object*);
+ void *closure;
+};
+
+static void xreq_hooked_subcall_reply_cb(void *closure, int iserror, struct json_object *result)
+{
+ struct reply *reply = closure;
+
+ afb_hook_xreq_subcall_result(reply->xreq, iserror, result);
+ reply->callback(reply->closure, iserror, result);
+ free(reply);
+}
+
static void xreq_hooked_subcall_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
{
+ struct reply *reply = malloc(sizeof *reply);
struct afb_xreq *xreq = closure;
-
- afb_xreq_subcall(xreq, api, verb, args, callback, cb_closure);
+ afb_hook_xreq_subcall(xreq, api, verb, args);
+ if (reply) {
+ reply->xreq = xreq;
+ reply->callback = callback;
+ reply->closure = cb_closure;
+ xreq_subcall_cb(closure, api, verb, args, xreq_hooked_subcall_reply_cb, reply);
+ } else {
+ ERROR("out of memory");
+ xreq_subcall_cb(closure, api, verb, args, callback, cb_closure);
+ }
}
static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
+ int r;
struct afb_xreq *xreq = closure;
- return afb_subcall_sync(xreq, api, verb, args, result);
+ afb_hook_xreq_subcallsync(xreq, api, verb, args);
+ r = xreq_subcallsync_cb(closure, api, verb, args, result);
+ return afb_hook_xreq_subcallsync_result(xreq, r, *result);
}
-*/
+
const struct afb_req_itf xreq_itf = {
.json = xreq_json_cb,
.get = xreq_get_cb,
.context_get = xreq_hooked_context_get_cb,
.context_set = xreq_hooked_context_set_cb,
.addref = xreq_hooked_addref_cb,
-.unref = xreq_unref_cb,
+ .unref = xreq_hooked_unref_cb,
.session_close = xreq_hooked_session_close_cb,
.session_set_LOA = xreq_hooked_session_set_LOA_cb,
.subscribe = xreq_hooked_subscribe_cb,
.unsubscribe = xreq_hooked_unsubscribe_cb,
-.subcall = xreq_subcall_cb,
-.subcallsync = xreq_subcallsync_cb
+ .subcall = xreq_hooked_subcall_cb,
+ .subcallsync = xreq_hooked_subcallsync_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 };
}
+void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+{
+ afb_req_success(to_req(xreq), obj, info);
+}
+
void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
{
char *message;
free(message);
}
+void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
+{
+ afb_req_fail(to_req(xreq), status, info);
+}
+
void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
{
char *message;
free(message);
}
+const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
+{
+ return afb_req_raw(to_req(xreq), size);
+}
+
+void afb_xreq_addref(struct afb_xreq *xreq)
+{
+ afb_req_addref(to_req(xreq));
+}
+
+void afb_xreq_unref(struct afb_xreq *xreq)
+{
+ afb_req_unref(to_req(xreq));
+}
+
+void afb_xreq_unhooked_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+{
+ xreq_subcall_cb(xreq, api, verb, args, callback, cb_closure);
+}
+
+void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+{
+ afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
+}
+
static int xcheck(struct afb_xreq *xreq, int sessionflags)
{
if ((sessionflags & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
return 1;
}
-void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req))
+void afb_xreq_so_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req))
{
if (xcheck(xreq, sessionflags))
method(to_req(xreq));
afb_hook_xreq_begin(xreq);
}
+void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
+{
+ memset(xreq, 0, sizeof *xreq);
+ xreq->refcount = 1;
+ xreq->queryitf = queryitf;
+}
+
+
+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);
+ }
+ }
+ afb_xreq_unref(xreq);
+}
+
+void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
+{
+ xreq->apiset = apiset;
+
+ afb_xreq_addref(xreq);
+ if (jobs_queue(NULL, afb_apiset_get_timeout(apiset), process_async, xreq) < 0) {
+ /* TODO: allows or not to proccess it directly as when no threading? (see above) */
+ ERROR("can't process job with threads: %m");
+ afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");
+ afb_xreq_unref(xreq);
+ }
+ afb_xreq_unref(xreq);
+}
Code Review / src / app-framework-binder.git / blobdiff