X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hook.c;h=a1ecea6d380ec19020b711f428d86f795ae9a9d9;hb=95fbde72511e2c14d35906d63b9afba2006f9632;hp=a8c836f846179befb407845519ead1312d34d2dd;hpb=85bca06fe0ee2923421f013da3e9f53abbfff673;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hook.c b/src/afb-hook.c
index a8c836f8..a1ecea6d 100644
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <unistd.h>
 #include <fnmatch.h>
+#include <sys/uio.h>
 
 #include <json-c/json.h>
 
@@ -135,7 +136,7 @@ static void init_hookid(struct afb_hookid *hookid)
  * section: default callbacks for tracing requests
  *****************************************************************************/
 
-static char *_pbuf_(const char *fmt, va_list args, char **palloc, char *sbuf, size_t szsbuf)
+static char *_pbuf_(const char *fmt, va_list args, char **palloc, char *sbuf, size_t szsbuf, size_t *outlen)
 {
 	int rc;
 	va_list cp;
@@ -151,18 +152,21 @@ static char *_pbuf_(const char *fmt, va_list args, char **palloc, char *sbuf, si
 			sbuf = *palloc;
 	}
 	va_end(cp);
+	if (rc >= 0 && outlen)
+		*outlen = (size_t)rc;
 	return sbuf;
 }
 
+#if 0 /* old behaviour: use NOTICE */
 static void _hook_(const char *fmt1, const char *fmt2, va_list arg2, ...)
 {
 	char *tag, *data, *mem1, *mem2, buf1[256], buf2[2000];
 	va_list arg1;
 
-	data = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2);
+	data = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2, NULL);
 
 	va_start(arg1, arg2);
-	tag = _pbuf_(fmt1, arg1, &mem1, buf1, sizeof buf1);
+	tag = _pbuf_(fmt1, arg1, &mem1, buf1, sizeof buf1, NULL);
 	va_end(arg1);
 
 	NOTICE("[HOOK %s] %s", tag, data);
@@ -170,6 +174,35 @@ static void _hook_(const char *fmt1, const char *fmt2, va_list arg2, ...)
 	free(mem1);
 	free(mem2);
 }
+#else /* new behaviour: emits directly to stderr */
+static void _hook_(const char *fmt1, const char *fmt2, va_list arg2, ...)
+{
+	static const char chars[] = "HOOK: [] \n";
+	char *mem1, *mem2, buf1[256], buf2[2000];
+	struct iovec iov[5];
+	va_list arg1;
+
+	iov[0].iov_base = (void*)&chars[0];
+	iov[0].iov_len = 7;
+
+	va_start(arg1, arg2);
+	iov[1].iov_base = _pbuf_(fmt1, arg1, &mem1, buf1, sizeof buf1, &iov[1].iov_len);
+	va_end(arg1);
+
+	iov[2].iov_base = (void*)&chars[7];
+	iov[2].iov_len = 2;
+
+	iov[3].iov_base = _pbuf_(fmt2, arg2, &mem2, buf2, sizeof buf2, &iov[3].iov_len);
+
+	iov[4].iov_base = (void*)&chars[9];
+	iov[4].iov_len = 1;
+
+	writev(2, iov, 5);
+
+	free(mem1);
+	free(mem2);
+}
+#endif
 
 static void _hook_xreq_(const struct afb_xreq *xreq, const char *format, ...)
 {
@@ -719,6 +752,11 @@ static void hook_ditf_require_api_result_cb(void *closure, const struct afb_hook
 	_hook_ditf_(ditf, "...require_api(%s, %d) -> %d", name, initialized, result);
 }
 
+static void hook_ditf_rename_api_cb(void *closure, const struct afb_hookid *hookid, const struct afb_ditf *ditf, const char *oldname, const char *newname, int result)
+{
+	_hook_ditf_(ditf, "rename_api(%s -> %s) -> %d", oldname, newname, result);
+}
+
 static struct afb_hook_ditf_itf hook_ditf_default_itf = {
 	.hook_ditf_event_broadcast_before = hook_ditf_event_broadcast_before_cb,
 	.hook_ditf_event_broadcast_after = hook_ditf_event_broadcast_after_cb,
@@ -732,7 +770,8 @@ static struct afb_hook_ditf_itf hook_ditf_default_itf = {
 	.hook_ditf_queue_job = hook_ditf_queue_job_cb,
 	.hook_ditf_unstore_req = hook_ditf_unstore_req_cb,
 	.hook_ditf_require_api = hook_ditf_require_api_cb,
-	.hook_ditf_require_api_result = hook_ditf_require_api_result_cb
+	.hook_ditf_require_api_result = hook_ditf_require_api_result_cb,
+	.hook_ditf_rename_api = hook_ditf_rename_api_cb
 };
 
 /******************************************************************************
@@ -829,6 +868,12 @@ int afb_hook_ditf_require_api_result(const struct afb_ditf *ditf, const char *na
 	return result;
 }
 
+int afb_hook_ditf_rename_api(const struct afb_ditf *ditf, const char *oldname, const char *newname, int result)
+{
+	_HOOK_DITF_(rename_api, ditf, oldname, newname, result);
+	return result;
+}
+
 /******************************************************************************
  * section: hooking ditf
  *****************************************************************************/
@@ -1382,7 +1427,7 @@ static struct afb_hook_global_itf hook_global_default_itf = {
 
 static void afb_hook_global_vverbose(int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
-	_HOOK_GLOBAL_(vverbose, level, file ?: "?", line, func ?: "?", fmt, args);
+	_HOOK_GLOBAL_(vverbose, level, file ?: "?", line, func ?: "?", fmt ?: "", args);
 }
 
 /******************************************************************************