#include <json-c/json.h>
#include <afb/afb-binding-v1.h>
#include <afb/afb-binding-v2.h>
+#include <afb/afb-request.h>
#include "afb-context.h"
#include "afb-xreq.h"
/******************************************************************************/
-static inline void xreq_addref(struct afb_xreq *xreq)
+static void xreq_finalize(struct afb_xreq *xreq)
+{
+ if (!xreq->replied)
+ afb_xreq_fail(xreq, "error", "no reply");
+ if (xreq->hookflags)
+ afb_hook_xreq_end(xreq);
+ if (xreq->caller)
+ afb_xreq_unhooked_unref(xreq->caller);
+ xreq->queryitf->unref(xreq);
+}
+
+inline void afb_xreq_unhooked_addref(struct afb_xreq *xreq)
{
__atomic_add_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED);
}
-static inline void xreq_unref(struct afb_xreq *xreq)
+inline void afb_xreq_unhooked_unref(struct afb_xreq *xreq)
{
- if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
- if (!xreq->replied)
- afb_xreq_fail(xreq, "error", "no reply");
- if (xreq->hookflags)
- afb_hook_xreq_end(xreq);
- if (xreq->caller)
- xreq_unref(xreq->caller);
- xreq->queryitf->unref(xreq);
- }
+ if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED))
+ xreq_finalize(xreq);
}
/******************************************************************************/
+static inline struct afb_request *to_request(struct afb_xreq *xreq)
+{
+ return &xreq->request;
+}
+
static inline struct afb_req to_req(struct afb_xreq *xreq)
{
- return (struct afb_req){ .itf = xreq->itf, .closure = xreq };
+ return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request };
+}
+
+static inline struct afb_xreq *from_request(struct afb_request *request)
+{
+ return CONTAINER_OF(struct afb_xreq, request, request);
}
/******************************************************************************/
struct {
union {
void (*callback)(void*, int, struct json_object*);
- void (*callback2)(void*, int, struct json_object*, struct afb_req);
+ void (*callback_req)(void*, int, struct json_object*, struct afb_req);
+ void (*callback_request)(void*, int, struct json_object*, struct afb_request*);
};
void *closure;
};
};
};
-static int subcall_subscribe_cb(struct afb_xreq *xreq, struct afb_event event)
+static int subcall_subscribe_cb(struct afb_xreq *xreq, struct afb_eventid *eventid)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- return afb_xreq_subscribe(subcall->xreq.caller, event);
+ return afb_xreq_subscribe(subcall->xreq.caller, eventid);
}
-static int subcall_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event event)
+static int subcall_unsubscribe_cb(struct afb_xreq *xreq, struct afb_eventid *eventid)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- return afb_xreq_unsubscribe(subcall->xreq.caller, event);
+ return afb_xreq_unsubscribe(subcall->xreq.caller, eventid);
}
static void subcall_reply_cb(struct afb_xreq *xreq, int status, struct json_object *result)
subcall->completion(subcall, status, result);
json_object_put(result);
- afb_xreq_unref(&subcall->xreq);
+ afb_xreq_unhooked_unref(&subcall->xreq);
}
static void subcall_destroy_cb(struct afb_xreq *xreq)
subcall->xreq.api = api;
subcall->xreq.verb = verb;
subcall->xreq.caller = caller;
- xreq_addref(caller);
+ afb_xreq_unhooked_addref(caller);
}
return subcall;
}
static void subcall_req_on_reply(struct subcall *subcall, int status, struct json_object *result)
{
- subcall->callback2(subcall->closure, status, result, to_req(subcall->xreq.caller));
+ subcall->callback_req(subcall->closure, status, result, to_req(subcall->xreq.caller));
+}
+
+static void subcall_request_on_reply(struct subcall *subcall, int status, struct json_object *result)
+{
+ subcall->callback_request(subcall->closure, status, result, to_request(subcall->xreq.caller));
}
static void subcall_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result)
subcall_req_on_reply(subcall, status, result);
}
+static void subcall_request_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result)
+{
+ afb_hook_xreq_subcall_result(subcall->xreq.caller, status, result);
+ subcall_request_on_reply(subcall, status, result);
+}
+
static void subcall_reply_direct_cb(void *closure, int status, struct json_object *result)
{
struct afb_xreq *xreq = closure;
subcall->xreq.caller, subcall->xreq.api, subcall->xreq.verb,
subcall->xreq.json, subcall_reply_direct_cb, &subcall->xreq);
} else {
- afb_xreq_addref(&subcall->xreq);
+ afb_xreq_unhooked_addref(&subcall->xreq);
afb_xreq_process(&subcall->xreq, subcall->xreq.caller->apiset);
}
}
static void subcall_req(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
{
- subcall->callback2 = callback;
+ subcall->callback_req = callback;
subcall->closure = cb_closure;
subcall_process(subcall, subcall_req_on_reply);
}
+static void subcall_request(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+ subcall->callback_request = callback;
+ subcall->closure = cb_closure;
+ subcall_process(subcall, subcall_request_on_reply);
+}
+
static void subcall_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*), void *cb_closure)
{
subcall->callback = callback;
static void subcall_req_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
{
- subcall->callback2 = callback;
+ subcall->callback_req = callback;
subcall->closure = cb_closure;
subcall_process(subcall, subcall_req_hooked_on_reply);
}
+static void subcall_request_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+ subcall->callback_request = callback;
+ subcall->closure = cb_closure;
+ subcall_process(subcall, subcall_request_hooked_on_reply);
+}
+
static void subcall_sync_leave(struct subcall *subcall)
{
struct jobloop *jobloop = __atomic_exchange_n(&subcall->jobloop, NULL, __ATOMIC_RELAXED);
{
int rc;
- afb_xreq_addref(&subcall->xreq);
+ afb_xreq_unhooked_addref(&subcall->xreq);
rc = jobs_enter(NULL, 0, subcall_sync_enter, subcall);
*result = subcall->result;
if (rc < 0 || subcall->status < 0) {
*result = *result ?: afb_msg_json_internal_error();
rc = -1;
}
- afb_xreq_unref(&subcall->xreq);
+ afb_xreq_unhooked_unref(&subcall->xreq);
return rc;
}
/******************************************************************************/
-static struct json_object *xreq_json_cb(void *closure)
+static struct json_object *xreq_json_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (!xreq->json && xreq->queryitf->json)
xreq->json = xreq->queryitf->json(xreq);
return xreq->json;
}
-static struct afb_arg xreq_get_cb(void *closure, const char *name)
+static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct afb_arg arg;
struct json_object *object, *value;
return arg;
}
-static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
+static void xreq_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (xreq->replied) {
ERROR("reply called more than one time!!");
}
}
-static void xreq_fail_cb(void *closure, const char *status, const char *info)
+static void xreq_fail_cb(struct afb_request *closure, const char *status, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (xreq->replied) {
ERROR("reply called more than one time!!");
}
}
-static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
+static void xreq_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args)
{
vinfo(closure, obj, fmt, args, (void*)xreq_success_cb);
}
-static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
+static void xreq_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args)
{
vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
}
-static void *xreq_context_get_cb(void *closure)
+static void *xreq_context_get_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_context_get(&xreq->context);
}
-static void xreq_context_set_cb(void *closure, void *value, void (*free_value)(void*))
+static void xreq_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_context_set(&xreq->context, value, free_value);
}
-static void xreq_addref_cb(void *closure)
+static struct afb_request *xreq_addref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
- xreq_addref(xreq);
+ struct afb_xreq *xreq = from_request(closure);
+ afb_xreq_unhooked_addref(xreq);
+ return closure;
}
-static void xreq_unref_cb(void *closure)
+static void xreq_unref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
- xreq_unref(xreq);
+ struct afb_xreq *xreq = from_request(closure);
+ afb_xreq_unhooked_unref(xreq);
}
-static void xreq_session_close_cb(void *closure)
+static void xreq_session_close_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_context_close(&xreq->context);
}
-static int xreq_session_set_LOA_cb(void *closure, unsigned level)
+static int xreq_session_set_LOA_cb(struct afb_request *closure, unsigned level)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_context_change_loa(&xreq->context, level);
}
-static int xreq_subscribe_cb(void *closure, struct afb_event event)
+static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid);
+static int xreq_subscribe_cb(struct afb_request *closure, struct afb_event event)
{
- struct afb_xreq *xreq = closure;
- return afb_xreq_subscribe(xreq, event);
+ return xreq_subscribe_eventid_cb(closure, afb_event_to_eventid(event));
+}
+
+static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_xreq_subscribe(xreq, eventid);
}
-int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event event)
+int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
{
if (xreq->listener)
- return afb_evt_add_watch(xreq->listener, event);
+ return afb_evt_add_watch(xreq->listener, eventid);
if (xreq->queryitf->subscribe)
- return xreq->queryitf->subscribe(xreq, event);
+ return xreq->queryitf->subscribe(xreq, eventid);
ERROR("no event listener, subscription impossible");
errno = EINVAL;
return -1;
}
-static int xreq_unsubscribe_cb(void *closure, struct afb_event event)
+static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid);
+static int xreq_unsubscribe_cb(struct afb_request *closure, struct afb_event event)
{
- struct afb_xreq *xreq = closure;
- return afb_xreq_unsubscribe(xreq, event);
+ return xreq_unsubscribe_eventid_cb(closure, afb_event_to_eventid(event));
+}
+
+static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_xreq_unsubscribe(xreq, eventid);
}
-int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
+int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
{
if (xreq->listener)
- return afb_evt_remove_watch(xreq->listener, event);
+ return afb_evt_remove_watch(xreq->listener, eventid);
if (xreq->queryitf->unsubscribe)
- return xreq->queryitf->unsubscribe(xreq, event);
+ return xreq->queryitf->unsubscribe(xreq, eventid);
ERROR("no event listener, unsubscription impossible");
errno = EINVAL;
return -1;
}
-static void xreq_subcall_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+static void xreq_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct subcall *sc;
sc = subcall_alloc(xreq, api, verb, args);
}
}
-static void xreq_subcall_req_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
+static void xreq_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct subcall *sc;
sc = subcall_alloc(xreq, api, verb, args);
}
}
+static void xreq_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
+
+ sc = subcall_alloc(xreq, api, verb, args);
+ if (sc == NULL) {
+ if (callback)
+ callback(cb_closure, 1, afb_msg_json_internal_error(), to_request(xreq));
+ json_object_put(args);
+ } else {
+ subcall_request(sc, callback, cb_closure);
+ }
+}
+
-static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+static int xreq_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
int rc;
struct subcall *sc;
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct json_object *resu;
sc = subcall_alloc(xreq, api, verb, args);
return rc;
}
-static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+static void xreq_vverbose_cb(struct afb_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
{
char *p;
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (!fmt || vasprintf(&p, fmt, args) < 0)
vverbose(level, file, line, func, fmt, args);
}
}
-static struct afb_stored_req *xreq_store_cb(void *closure)
+static struct afb_stored_req *xreq_store_cb(struct afb_request *closure)
{
xreq_addref_cb(closure);
- return closure;
+ return (struct afb_stored_req*)closure;
}
-static int xreq_has_permission_cb(void*closure, const char *permission)
+static int xreq_has_permission_cb(struct afb_request *closure, const char *permission)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_auth_has_permission(xreq, permission);
}
-static char *xreq_get_application_id_cb(void*closure)
+static char *xreq_get_application_id_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return xreq->cred && xreq->cred->id ? strdup(xreq->cred->id) : NULL;
}
+static void *xreq_context_make_cb(struct afb_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
+}
+
/******************************************************************************/
-static struct json_object *xreq_hooked_json_cb(void *closure)
+static struct json_object *xreq_hooked_json_cb(struct afb_request *closure)
{
struct json_object *r = xreq_json_cb(closure);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_json(xreq, r);
}
-static struct afb_arg xreq_hooked_get_cb(void *closure, const char *name)
+static struct afb_arg xreq_hooked_get_cb(struct afb_request *closure, const char *name)
{
struct afb_arg r = xreq_get_cb(closure, name);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_get(xreq, name, r);
}
-static void xreq_hooked_success_cb(void *closure, struct json_object *obj, const char *info)
+static void xreq_hooked_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_success(xreq, obj, info);
xreq_success_cb(closure, obj, info);
}
-static void xreq_hooked_fail_cb(void *closure, const char *status, const char *info)
+static void xreq_hooked_fail_cb(struct afb_request *closure, const char *status, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_fail(xreq, status, info);
xreq_fail_cb(closure, status, info);
}
-static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
+static void xreq_hooked_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args)
{
vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb);
}
-static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
+static void xreq_hooked_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args)
{
vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
}
-static void *xreq_hooked_context_get_cb(void *closure)
+static void *xreq_hooked_context_get_cb(struct afb_request *closure)
{
void *r = xreq_context_get_cb(closure);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_context_get(xreq, r);
}
-static void xreq_hooked_context_set_cb(void *closure, void *value, void (*free_value)(void*))
+static void xreq_hooked_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_context_set(xreq, value, free_value);
xreq_context_set_cb(closure, value, free_value);
}
-static void xreq_hooked_addref_cb(void *closure)
+static struct afb_request *xreq_hooked_addref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_addref(xreq);
- xreq_addref_cb(closure);
+ return xreq_addref_cb(closure);
}
-static void xreq_hooked_unref_cb(void *closure)
+static void xreq_hooked_unref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_unref(xreq);
xreq_unref_cb(closure);
}
-static void xreq_hooked_session_close_cb(void *closure)
+static void xreq_hooked_session_close_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_session_close(xreq);
xreq_session_close_cb(closure);
}
-static int xreq_hooked_session_set_LOA_cb(void *closure, unsigned level)
+static int xreq_hooked_session_set_LOA_cb(struct afb_request *closure, unsigned level)
{
int r = xreq_session_set_LOA_cb(closure, level);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_session_set_LOA(xreq, level, r);
}
-static int xreq_hooked_subscribe_cb(void *closure, struct afb_event event)
+static int xreq_hooked_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid);
+static int xreq_hooked_subscribe_cb(struct afb_request *closure, struct afb_event event)
{
- int r = xreq_subscribe_cb(closure, event);
- struct afb_xreq *xreq = closure;
- return afb_hook_xreq_subscribe(xreq, event, r);
+ return xreq_hooked_subscribe_eventid_cb(closure, afb_event_to_eventid(event));
}
-static int xreq_hooked_unsubscribe_cb(void *closure, struct afb_event event)
+static int xreq_hooked_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
{
- int r = xreq_unsubscribe_cb(closure, event);
- struct afb_xreq *xreq = closure;
- return afb_hook_xreq_unsubscribe(xreq, event, r);
+ int r = xreq_subscribe_eventid_cb(closure, eventid);
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_hook_xreq_subscribe(xreq, eventid, r);
}
-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)
+static int xreq_hooked_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid);
+static int xreq_hooked_unsubscribe_cb(struct afb_request *closure, struct afb_event event)
{
- struct afb_xreq *xreq = closure;
+ return xreq_hooked_unsubscribe_eventid_cb(closure, afb_event_to_eventid(event));
+}
+
+static int xreq_hooked_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
+{
+ int r = xreq_unsubscribe_eventid_cb(closure, eventid);
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_hook_xreq_unsubscribe(xreq, eventid, r);
+}
+
+static void xreq_hooked_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+{
+ struct afb_xreq *xreq = from_request(closure);
struct subcall *sc;
afb_hook_xreq_subcall(xreq, api, verb, args);
}
}
-static void xreq_hooked_subcall_req_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
+static void xreq_hooked_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct subcall *sc;
afb_hook_xreq_subcall_req(xreq, api, verb, args);
}
}
-static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+static void xreq_hooked_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request *), void *cb_closure)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
+
+ afb_hook_xreq_subcall(xreq, api, verb, args);
+ sc = subcall_alloc(xreq, api, verb, args);
+ if (sc == NULL) {
+ if (callback)
+ callback(cb_closure, 1, afb_msg_json_internal_error(), to_request(xreq));
+ json_object_put(args);
+ } else {
+ subcall_request_hooked(sc, callback, cb_closure);
+ }
+}
+
+static int xreq_hooked_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
int r;
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
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);
}
-static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+static void xreq_hooked_vverbose_cb(struct afb_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
va_list ap;
va_copy(ap, args);
xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
va_end(ap);
}
-static struct afb_stored_req *xreq_hooked_store_cb(void *closure)
+static struct afb_stored_req *xreq_hooked_store_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct afb_stored_req *r = xreq_store_cb(closure);
afb_hook_xreq_store(xreq, r);
return r;
}
-static int xreq_hooked_has_permission_cb(void*closure, const char *permission)
+static int xreq_hooked_has_permission_cb(struct afb_request *closure, const char *permission)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
int r = xreq_has_permission_cb(closure, permission);
return afb_hook_xreq_has_permission(xreq, permission, r);
}
-static char *xreq_hooked_get_application_id_cb(void*closure)
+static char *xreq_hooked_get_application_id_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
char *r = xreq_get_application_id_cb(closure);
return afb_hook_xreq_get_application_id(xreq, r);
}
+static void *xreq_hooked_context_make_cb(struct afb_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ void *result = xreq_context_make_cb(closure, replace, create_value, free_value, create_closure);
+ return afb_hook_xreq_context_make(xreq, replace, create_value, free_value, create_closure, result);
+}
+
/******************************************************************************/
-const struct afb_req_itf xreq_itf = {
+const struct afb_request_itf xreq_itf = {
.json = xreq_json_cb,
.get = xreq_get_cb,
.success = xreq_success_cb,
.store = xreq_store_cb,
.subcall_req = xreq_subcall_req_cb,
.has_permission = xreq_has_permission_cb,
- .get_application_id = xreq_get_application_id_cb
+ .get_application_id = xreq_get_application_id_cb,
+ .context_make = xreq_context_make_cb,
+ .subscribe_eventid = xreq_subscribe_eventid_cb,
+ .unsubscribe_eventid = xreq_unsubscribe_eventid_cb,
+ .subcall_request = xreq_subcall_request_cb,
};
-const struct afb_req_itf xreq_hooked_itf = {
+const struct afb_request_itf xreq_hooked_itf = {
.json = xreq_hooked_json_cb,
.get = xreq_hooked_get_cb,
.success = xreq_hooked_success_cb,
.store = xreq_hooked_store_cb,
.subcall_req = xreq_hooked_subcall_req_cb,
.has_permission = xreq_hooked_has_permission_cb,
- .get_application_id = xreq_hooked_get_application_id_cb
+ .get_application_id = xreq_hooked_get_application_id_cb,
+ .context_make = xreq_hooked_context_make_cb,
+ .subscribe_eventid = xreq_hooked_subscribe_eventid_cb,
+ .unsubscribe_eventid = xreq_hooked_unsubscribe_eventid_cb,
+ .subcall_request = xreq_hooked_subcall_request_cb,
};
/******************************************************************************/
struct json_object *afb_xreq_json(struct afb_xreq *xreq)
{
- return afb_req_json(to_req(xreq));
+ return afb_request_json(to_request(xreq));
}
void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
{
- afb_req_success(to_req(xreq), obj, info);
+ afb_request_success(to_request(xreq), obj, info);
}
void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
va_list args;
va_start(args, info);
- afb_req_success_v(to_req(xreq), obj, info, args);
+ afb_request_success_v(to_request(xreq), obj, info, args);
va_end(args);
}
void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
{
- afb_req_fail(to_req(xreq), status, info);
+ afb_request_fail(to_request(xreq), status, info);
}
void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
va_list args;
va_start(args, info);
- afb_req_fail_v(to_req(xreq), status, info, args);
+ afb_request_fail_v(to_request(xreq), status, info, args);
va_end(args);
}
const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
{
- struct json_object *obj = xreq_json_cb(xreq);
+ struct json_object *obj = xreq_json_cb(to_request(xreq));
const char *result = json_object_to_json_string(obj);
if (size != NULL)
*size = strlen(result);
void afb_xreq_addref(struct afb_xreq *xreq)
{
- afb_req_addref(to_req(xreq));
+ afb_request_addref(to_request(xreq));
}
void afb_xreq_unref(struct afb_xreq *xreq)
{
- afb_req_unref(to_req(xreq));
+ afb_request_unref(to_request(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)
+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*, struct afb_request *), void *cb_closure)
{
- xreq_subcall_cb(xreq, api, verb, args, callback, cb_closure);
+ xreq_subcall_request_cb(to_request(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)
+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*, struct afb_request *), void *cb_closure)
{
- afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
+ afb_request_subcall(to_request(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);
+ return xreq_subcallsync_cb(to_request(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);
+ return afb_request_subcall_sync(to_request(xreq), api, verb, args, result);
}
static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
{
memset(xreq, 0, sizeof *xreq);
- xreq->itf = &xreq_hooked_itf; /* hook by default */
+ xreq->request.itf = &xreq_hooked_itf; /* hook by default */
xreq->refcount = 1;
xreq->queryitf = queryitf;
}
if (xreq->hookflags)
afb_hook_xreq_begin(xreq);
else
- xreq->itf = &xreq_itf; /* unhook the interface */
+ xreq->request.itf = &xreq_itf; /* unhook the interface */
}
/**
api->itf->call(api->closure, xreq);
}
/* release the request */
- xreq_unref(xreq);
+ afb_xreq_unhooked_unref(xreq);
}
/**
/* send error */
va_start(args, info);
- afb_req_fail_v(to_req(xreq), status, info, args);
+ afb_request_fail_v(to_request(xreq), status, info, args);
va_end(args);
}
xreq->context.api_key = api;
/* check self locking */
- if (!api->noconcurrency)
- api = NULL;
- else {
+ if (api->group) {
caller = xreq->caller;
while (caller) {
- if (caller->context.api_key == api) {
+ if (((const struct afb_api *)caller->context.api_key)->group == api->group) {
/* noconcurrency lock detected */
ERROR("self-lock detected in call stack for API %s", xreq->api);
early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->api);
}
/* queue the request job */
- xreq_addref(xreq);
- if (jobs_queue(api, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+ afb_xreq_unhooked_addref(xreq);
+ if (jobs_queue(api->group, afb_apiset_timeout_get(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");
early_failure(xreq, "cancelled", "not able to create a job for the task");
- xreq_unref(xreq);
+ afb_xreq_unhooked_unref(xreq);
}
end:
- xreq_unref(xreq);
+ afb_xreq_unhooked_unref(xreq);
}
Code Review / src / app-framework-binder.git / blobdiff