X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=ba533c906ae7b4d400816991998061f512f77042;hb=b67e18b39830a01750721787bf3bdc5d71983144;hp=9478f154f25709cc74cb808ca19a7711fa4d1ed6;hpb=090379fdaf6ed1860dcff21424135ad71ead0cd2;p=src%2Fapp-framework-binder.git diff --git a/src/afb-xreq.c b/src/afb-xreq.c index 9478f154..ba533c90 100644 --- a/src/afb-xreq.c +++ b/src/afb-xreq.c @@ -19,11 +19,13 @@ #define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include +#include #include #include #include -#include +#include +#include #include "afb-context.h" #include "afb-xreq.h" @@ -39,6 +41,17 @@ /******************************************************************************/ +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) { struct afb_xreq *xreq = closure; @@ -85,22 +98,14 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info) } } -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) @@ -253,6 +258,12 @@ static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, 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) @@ -283,19 +294,14 @@ static void xreq_hooked_fail_cb(void *closure, const char *status, const char *i 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) @@ -398,6 +404,16 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char 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 = { @@ -405,8 +421,8 @@ const struct afb_req_itf xreq_itf = { .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, @@ -416,7 +432,8 @@ const struct afb_req_itf xreq_itf = { .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 = { @@ -424,8 +441,8 @@ 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, @@ -435,7 +452,8 @@ const struct afb_req_itf xreq_hooked_itf = { .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) @@ -486,7 +504,11 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info 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)