Atomic context initialisation for bindings

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

diff --git a/src/afb-trace.c b/src/afb-trace.c
index c581611..5e82274 100644 (file)
--- a/src/afb-trace.c
+++ b/src/afb-trace.c
@@ -188,17 +188,17 @@ static const char *verbosity_level_name(int level)
 static void emit(void *closure, const struct afb_hookid *hookid, const char *type, const char *fmt1, const char *fmt2, va_list ap2, ...)
 {
        struct hook *hook = closure;
-       struct json_object *event, *data1, *data2;
+       struct json_object *data, *data1, *data2;
        va_list ap1;
 
-       data1 = data2 = event = NULL;
+       data1 = data2 = data = NULL;
        va_start(ap1, ap2);
        wrap_json_vpack(&data1, fmt1, ap1);
        va_end(ap1);
        if (fmt2)
                wrap_json_vpack(&data2, fmt2, ap2);
 
-       wrap_json_pack(&event, "{so ss ss si so so*}",
+       wrap_json_pack(&data, "{so ss ss si so so*}",
                                        "time", timestamp(hookid),
                                        "tag", hook->tag->tag,
                                        "type", type,
@@ -206,7 +206,7 @@ static void emit(void *closure, const struct afb_hookid *hookid, const char *typ
                                        type, data1,
                                        "data", data2);
 
-       afb_evt_unhooked_push(hook->event->event, event);
+       afb_evt_unhooked_push(hook->event->event, data);
 }
 
 /*******************************************************************************/
@@ -221,16 +221,20 @@ static struct flag xreq_flags[] = { /* must be sorted by names */
                { "common",             afb_hook_flags_req_common },
                { "context",            afb_hook_flags_req_context },
                { "context_get",        afb_hook_flag_req_context_get },
+               { "context_make",       afb_hook_flag_req_context_make },
                { "context_set",        afb_hook_flag_req_context_set },
                { "end",                afb_hook_flag_req_end },
                { "event",              afb_hook_flags_req_event },
                { "extra",              afb_hook_flags_req_extra },
                { "fail",               afb_hook_flag_req_fail },
                { "get",                afb_hook_flag_req_get },
+               { "get_application_id", afb_hook_flag_req_get_application_id },
+               { "has_permission",     afb_hook_flag_req_has_permission },
                { "json",               afb_hook_flag_req_json },
                { "life",               afb_hook_flags_req_life },
                { "ref",                afb_hook_flags_req_ref },
                { "result",             afb_hook_flags_req_result },
+               { "security",           afb_hook_flags_req_security },
                { "session",            afb_hook_flags_req_session },
                { "session_close",      afb_hook_flag_req_session_close },
                { "session_set_LOA",    afb_hook_flag_req_session_set_LOA },
@@ -456,6 +460,34 @@ static void hook_xreq_subcall_req_result(void *closure, const struct afb_hookid
                                        "result", result);
 }
 
+static void hook_xreq_has_permission(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, const char *permission, int result)
+{
+       hook_xreq(closure, hookid, xreq, "has_permission", "{ss sb}",
+                                       "permission", permission,
+                                       "result", result);
+}
+
+static void hook_xreq_get_application_id(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, char *result)
+{
+       hook_xreq(closure, hookid, xreq, "get_application_id", "{ss?}",
+                                       "result", result);
+}
+
+static void hook_xreq_context_make(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure, void *result)
+{
+       char pc[50], pf[50], pv[50], pr[50];
+       snprintf(pc, sizeof pc, "%p", create_value);
+       snprintf(pf, sizeof pf, "%p", free_value);
+       snprintf(pv, sizeof pv, "%p", create_closure);
+       snprintf(pr, sizeof pr, "%p", result);
+       hook_xreq(closure, hookid, xreq, "context_make", "{sb ss ss ss ss}",
+                                       "replace", replace,
+                                       "create", pc,
+                                       "free", pf,
+                                       "closure", pv,
+                                       "result", pr);
+}
+
 static struct afb_hook_xreq_itf hook_xreq_itf = {
        .hook_xreq_begin = hook_xreq_begin,
        .hook_xreq_end = hook_xreq_end,
@@ -479,7 +511,10 @@ static struct afb_hook_xreq_itf hook_xreq_itf = {
        .hook_xreq_store = hook_xreq_store,
        .hook_xreq_unstore = hook_xreq_unstore,
        .hook_xreq_subcall_req = hook_xreq_subcall_req,
-       .hook_xreq_subcall_req_result = hook_xreq_subcall_req_result
+       .hook_xreq_subcall_req_result = hook_xreq_subcall_req_result,
+       .hook_xreq_has_permission = hook_xreq_has_permission,
+       .hook_xreq_get_application_id = hook_xreq_get_application_id,
+       .hook_xreq_context_make = hook_xreq_context_make
 };
 
 /*******************************************************************************/