X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-trace.c;h=5f8ec64cbcd36d5b9a5eccfa55cf504b0b1b1c95;hb=7c67e966b8292961ca748e47d18ff437214cec1c;hp=aaa16352ae9ae4a585a6157b7c812b811f14ae4c;hpb=5ef271effacb83552f9ea56572c751c2f5a556b6;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-trace.c b/src/afb-trace.c
index aaa16352..5f8ec64c 100644
--- a/src/afb-trace.c
+++ b/src/afb-trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2016-2019 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if WITH_AFB_HOOK && WITH_AFB_TRACE
+
 #define _GNU_SOURCE
 
 #include <assert.h>
@@ -65,7 +67,7 @@
 /* struct for tags */
 struct tag {
 	struct tag *next;	/* link to the next */
-	char tag[1];		/* name of the tag */
+	char tag[];		/* name of the tag */
 };
 
 /* struct for events */
@@ -148,18 +150,8 @@ static void ctxt_error(char **errors, const char *format, ...)
 /* timestamp */
 static struct json_object *timestamp(const struct afb_hookid *hookid)
 {
-#if JSON_C_MAJOR_VERSION > 0 || JSON_C_MINOR_VERSION >= 12
-	char ts[50];
-
-	snprintf(ts, sizeof ts, "%llu.%06lu",
-			(long long unsigned)hookid->time.tv_sec,
-			(long unsigned)((hookid->time.tv_nsec + 500) / 1000));
-
-	return json_object_new_double_s(0.0f, ts); /* the real value isn't used */
-#else
 	return json_object_new_double((double)hookid->time.tv_sec +
 			(double)hookid->time.tv_nsec * .000000001);
-#endif
 }
 
 /* verbosity level name or NULL */
@@ -861,7 +853,7 @@ static void hook_session(void *closure, const struct afb_hookid *hookid, struct
 
 static void hook_session_create(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
 {
-	hook_session(closure, hookid, session, "create", "{ss}", "token", afb_session_token(session));
+	hook_session(closure, hookid, session, "create", NULL);
 }
 
 static void hook_session_close(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
@@ -874,11 +866,6 @@ static void hook_session_destroy(void *closure, const struct afb_hookid *hookid,
 	hook_session(closure, hookid, session, "destroy", NULL);
 }
 
-static void hook_session_renew(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
-{
-	hook_session(closure, hookid, session, "renew", "{ss}", "token", afb_session_token(session));
-}
-
 static void hook_session_addref(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
 {
 	hook_session(closure, hookid, session, "addref", NULL);
@@ -893,7 +880,6 @@ static struct afb_hook_session_itf hook_session_itf = {
 	.hook_session_create = hook_session_create,
 	.hook_session_close = hook_session_close,
 	.hook_session_destroy = hook_session_destroy,
-	.hook_session_renew = hook_session_renew,
 	.hook_session_addref = hook_session_addref,
 	.hook_session_unref = hook_session_unref
 };
@@ -1081,7 +1067,7 @@ static struct tag *trace_get_tag(struct afb_trace *trace, const char *name, int
 
 	if (!tag && alloc) {
 		/* creation if needed */
-		tag = malloc(sizeof * tag + strlen(name));
+		tag = malloc(sizeof * tag + 1 + strlen(name));
 		if (tag) {
 			strcpy(tag->tag, name);
 			tag->next = trace->tags;
@@ -1615,3 +1601,5 @@ int afb_trace_drop(afb_req_t req, struct json_object *args, struct afb_trace *tr
 	free(context.errors);
 	return -1;
 }
+
+#endif