Add logging by request

[src/app-framework-binder.git] / src / afb-xreq.c

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 527692c..61ba4fd 100644 (file)
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -19,6 +19,7 @@
 #define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 
@@ -39,6 +40,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,6 +97,16 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info)
        }
 }
 
+static void xreq_vsuccess_cb(void *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)
+{
+       vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
+}
+
 static void *xreq_context_get_cb(void *closure)
 {
        struct afb_xreq *xreq = closure;
@@ -235,6 +257,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)
@@ -265,6 +293,16 @@ static void xreq_hooked_fail_cb(void *closure, const char *status, const char *i
        xreq_fail_cb(closure, status, info);
 }
 
+static void xreq_hooked_vsuccess_cb(void *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)
+{
+       vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
+}
+
 static void *xreq_hooked_context_get_cb(void *closure)
 {
        void *r = xreq_context_get_cb(closure);
@@ -365,6 +403,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 = {
@@ -372,6 +420,8 @@ const struct afb_req_itf xreq_itf = {
        .get = xreq_get_cb,
        .success = xreq_success_cb,
        .fail = xreq_fail_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,
@@ -381,7 +431,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 = {
@@ -389,6 +440,8 @@ const struct afb_req_itf xreq_hooked_itf = {
        .get = xreq_hooked_get_cb,
        .success = xreq_hooked_success_cb,
        .fail = xreq_hooked_fail_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,
@@ -398,7 +451,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)