trace2: mark unused us_elapsed_absolute parameters

peff · gitster · commit e46a25b05dc5 · 2023-08-29T17:56:25.000-07:00
Many trace2 targets ignore the absolute elapsed time parameters.
However, the virtual interface needs to retain the parameter since it is
used by others (e.g., the perf target).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
@@ -335,7 +335,7 @@ static void fn_alias_fl(const char *file, int line, const char *alias,
 }
 
 static void fn_child_start_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute,
+			      uint64_t us_elapsed_absolute UNUSED,
 			      const struct child_process *cmd)
 {
 	const char *event_name = "child_start";
@@ -367,7 +367,8 @@ static void fn_child_start_fl(const char *file, int line,
 }
 
 static void fn_child_exit_fl(const char *file, int line,
-			     uint64_t us_elapsed_absolute, int cid, int pid,
+			     uint64_t us_elapsed_absolute UNUSED,
+			     int cid, int pid,
 			     int code, uint64_t us_elapsed_child)
 {
 	const char *event_name = "child_exit";
@@ -388,7 +389,8 @@ static void fn_child_exit_fl(const char *file, int line,
 }
 
 static void fn_child_ready_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute, int cid, int pid,
+			      uint64_t us_elapsed_absolute UNUSED,
+			      int cid, int pid,
 			      const char *ready, uint64_t us_elapsed_child)
 {
 	const char *event_name = "child_ready";
@@ -409,7 +411,7 @@ static void fn_child_ready_fl(const char *file, int line,
 }
 
 static void fn_thread_start_fl(const char *file, int line,
-			       uint64_t us_elapsed_absolute)
+			       uint64_t us_elapsed_absolute UNUSED)
 {
 	const char *event_name = "thread_start";
 	struct json_writer jw = JSON_WRITER_INIT;
@@ -423,7 +425,7 @@ static void fn_thread_start_fl(const char *file, int line,
 }
 
 static void fn_thread_exit_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute,
+			      uint64_t us_elapsed_absolute UNUSED,
 			      uint64_t us_elapsed_thread)
 {
 	const char *event_name = "thread_exit";
@@ -439,7 +441,8 @@ static void fn_thread_exit_fl(const char *file, int line,
 	jw_release(&jw);
 }
 
-static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+static void fn_exec_fl(const char *file, int line,
+		       uint64_t us_elapsed_absolute UNUSED,
 		       int exec_id, const char *exe, const char **argv)
 {
 	const char *event_name = "exec";
@@ -460,8 +463,8 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
 }
 
 static void fn_exec_result_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute, int exec_id,
-			      int code)
+			      uint64_t us_elapsed_absolute UNUSED,
+			      int exec_id, int code)
 {
 	const char *event_name = "exec_result";
 	struct json_writer jw = JSON_WRITER_INIT;
@@ -511,7 +514,7 @@ static void fn_repo_fl(const char *file, int line,
 }
 
 static void fn_region_enter_printf_va_fl(const char *file, int line,
-					 uint64_t us_elapsed_absolute,
+					 uint64_t us_elapsed_absolute UNUSED,
 					 const char *category,
 					 const char *label,
 					 const struct repository *repo,
@@ -538,7 +541,7 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,
 }
 
 static void fn_region_leave_printf_va_fl(
-	const char *file, int line, uint64_t us_elapsed_absolute,
+	const char *file, int line, uint64_t us_elapsed_absolute UNUSED,
 	uint64_t us_elapsed_region, const char *category, const char *label,
 	const struct repository *repo, const char *fmt, va_list ap)
 {
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
@@ -86,7 +86,7 @@ static void fn_version_fl(const char *file, int line)
 }
 
 static void fn_start_fl(const char *file, int line,
-			uint64_t us_elapsed_absolute, const char **argv)
+			uint64_t us_elapsed_absolute UNUSED, const char **argv)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
 
@@ -215,7 +215,7 @@ static void fn_alias_fl(const char *file, int line, const char *alias,
 }
 
 static void fn_child_start_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute,
+			      uint64_t us_elapsed_absolute UNUSED,
 			      const struct child_process *cmd)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
@@ -243,7 +243,8 @@ static void fn_child_start_fl(const char *file, int line,
 }
 
 static void fn_child_exit_fl(const char *file, int line,
-			     uint64_t us_elapsed_absolute, int cid, int pid,
+			     uint64_t us_elapsed_absolute UNUSED,
+			     int cid, int pid,
 			     int code, uint64_t us_elapsed_child)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
@@ -256,7 +257,8 @@ static void fn_child_exit_fl(const char *file, int line,
 }
 
 static void fn_child_ready_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute, int cid, int pid,
+			      uint64_t us_elapsed_absolute UNUSED,
+			      int cid, int pid,
 			      const char *ready, uint64_t us_elapsed_child)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
@@ -268,7 +270,8 @@ static void fn_child_ready_fl(const char *file, int line,
 	strbuf_release(&buf_payload);
 }
 
-static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+static void fn_exec_fl(const char *file, int line,
+		       uint64_t us_elapsed_absolute UNUSED,
 		       int exec_id, const char *exe, const char **argv)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
@@ -284,8 +287,8 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
 }
 
 static void fn_exec_result_fl(const char *file, int line,
-			      uint64_t us_elapsed_absolute, int exec_id,
-			      int code)
+			      uint64_t us_elapsed_absolute UNUSED,
+			      int exec_id, int code)
 {
 	struct strbuf buf_payload = STRBUF_INIT;
 
@@ -321,7 +324,8 @@ static void fn_repo_fl(const char *file, int line,
 }
 
 static void fn_printf_va_fl(const char *file, int line,
-			    uint64_t us_elapsed_absolute, const char *fmt,
+			    uint64_t us_elapsed_absolute UNUSED,
+			    const char *fmt,
 			    va_list ap)
 {
 	struct strbuf buf_payload = STRBUF_INIT;

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ static void fn_alias_fl(const char file, int line, const char alias,`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`static void fn_child_start_fl(const char *file, int line,`
`338`		`- uint64_t us_elapsed_absolute,`
	`338`	`+ uint64_t us_elapsed_absolute UNUSED,`
`339`	`339`	`const struct child_process *cmd)`
`340`	`340`	`{`
`341`	`341`	`const char *event_name = "child_start";`
`@@ -367,7 +367,8 @@ static void fn_child_start_fl(const char *file, int line,`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`static void fn_child_exit_fl(const char *file, int line,`
`370`		`- uint64_t us_elapsed_absolute, int cid, int pid,`
	`370`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`371`	`+ int cid, int pid,`
`371`	`372`	`int code, uint64_t us_elapsed_child)`
`372`	`373`	`{`
`373`	`374`	`const char *event_name = "child_exit";`
`@@ -388,7 +389,8 @@ static void fn_child_exit_fl(const char *file, int line,`
`388`	`389`	`}`
`389`	`390`
`390`	`391`	`static void fn_child_ready_fl(const char *file, int line,`
`391`		`- uint64_t us_elapsed_absolute, int cid, int pid,`
	`392`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`393`	`+ int cid, int pid,`
`392`	`394`	`const char *ready, uint64_t us_elapsed_child)`
`393`	`395`	`{`
`394`	`396`	`const char *event_name = "child_ready";`
`@@ -409,7 +411,7 @@ static void fn_child_ready_fl(const char *file, int line,`
`409`	`411`	`}`
`410`	`412`
`411`	`413`	`static void fn_thread_start_fl(const char *file, int line,`
`412`		`- uint64_t us_elapsed_absolute)`
	`414`	`+ uint64_t us_elapsed_absolute UNUSED)`
`413`	`415`	`{`
`414`	`416`	`const char *event_name = "thread_start";`
`415`	`417`	`struct json_writer jw = JSON_WRITER_INIT;`
`@@ -423,7 +425,7 @@ static void fn_thread_start_fl(const char *file, int line,`
`423`	`425`	`}`
`424`	`426`
`425`	`427`	`static void fn_thread_exit_fl(const char *file, int line,`
`426`		`- uint64_t us_elapsed_absolute,`
	`428`	`+ uint64_t us_elapsed_absolute UNUSED,`
`427`	`429`	`uint64_t us_elapsed_thread)`
`428`	`430`	`{`
`429`	`431`	`const char *event_name = "thread_exit";`
`@@ -439,7 +441,8 @@ static void fn_thread_exit_fl(const char *file, int line,`
`439`	`441`	`jw_release(&jw);`
`440`	`442`	`}`
`441`	`443`
`442`		`-static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,`
	`444`	`+static void fn_exec_fl(const char *file, int line,`
	`445`	`+ uint64_t us_elapsed_absolute UNUSED,`
`443`	`446`	`int exec_id, const char exe, const char *argv)`
`444`	`447`	`{`
`445`	`448`	`const char *event_name = "exec";`
`@@ -460,8 +463,8 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,`
`460`	`463`	`}`
`461`	`464`
`462`	`465`	`static void fn_exec_result_fl(const char *file, int line,`
`463`		`- uint64_t us_elapsed_absolute, int exec_id,`
`464`		`- int code)`
	`466`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`467`	`+ int exec_id, int code)`
`465`	`468`	`{`
`466`	`469`	`const char *event_name = "exec_result";`
`467`	`470`	`struct json_writer jw = JSON_WRITER_INIT;`
`@@ -511,7 +514,7 @@ static void fn_repo_fl(const char *file, int line,`
`511`	`514`	`}`
`512`	`515`
`513`	`516`	`static void fn_region_enter_printf_va_fl(const char *file, int line,`
`514`		`- uint64_t us_elapsed_absolute,`
	`517`	`+ uint64_t us_elapsed_absolute UNUSED,`
`515`	`518`	`const char *category,`
`516`	`519`	`const char *label,`
`517`	`520`	`const struct repository *repo,`
`@@ -538,7 +541,7 @@ static void fn_region_enter_printf_va_fl(const char *file, int line,`
`538`	`541`	`}`
`539`	`542`
`540`	`543`	`static void fn_region_leave_printf_va_fl(`
`541`		`- const char *file, int line, uint64_t us_elapsed_absolute,`
	`544`	`+ const char *file, int line, uint64_t us_elapsed_absolute UNUSED,`
`542`	`545`	`uint64_t us_elapsed_region, const char category, const char label,`
`543`	`546`	`const struct repository repo, const char fmt, va_list ap)`
`544`	`547`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static void fn_version_fl(const char *file, int line)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`static void fn_start_fl(const char *file, int line,`
`89`		`- uint64_t us_elapsed_absolute, const char **argv)`
	`89`	`+ uint64_t us_elapsed_absolute UNUSED, const char **argv)`
`90`	`90`	`{`
`91`	`91`	`struct strbuf buf_payload = STRBUF_INIT;`
`92`	`92`
`@@ -215,7 +215,7 @@ static void fn_alias_fl(const char file, int line, const char alias,`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`static void fn_child_start_fl(const char *file, int line,`
`218`		`- uint64_t us_elapsed_absolute,`
	`218`	`+ uint64_t us_elapsed_absolute UNUSED,`
`219`	`219`	`const struct child_process *cmd)`
`220`	`220`	`{`
`221`	`221`	`struct strbuf buf_payload = STRBUF_INIT;`
`@@ -243,7 +243,8 @@ static void fn_child_start_fl(const char *file, int line,`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`static void fn_child_exit_fl(const char *file, int line,`
`246`		`- uint64_t us_elapsed_absolute, int cid, int pid,`
	`246`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`247`	`+ int cid, int pid,`
`247`	`248`	`int code, uint64_t us_elapsed_child)`
`248`	`249`	`{`
`249`	`250`	`struct strbuf buf_payload = STRBUF_INIT;`
`@@ -256,7 +257,8 @@ static void fn_child_exit_fl(const char *file, int line,`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`static void fn_child_ready_fl(const char *file, int line,`
`259`		`- uint64_t us_elapsed_absolute, int cid, int pid,`
	`260`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`261`	`+ int cid, int pid,`
`260`	`262`	`const char *ready, uint64_t us_elapsed_child)`
`261`	`263`	`{`
`262`	`264`	`struct strbuf buf_payload = STRBUF_INIT;`
`@@ -268,7 +270,8 @@ static void fn_child_ready_fl(const char *file, int line,`
`268`	`270`	`strbuf_release(&buf_payload);`
`269`	`271`	`}`
`270`	`272`
`271`		`-static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,`
	`273`	`+static void fn_exec_fl(const char *file, int line,`
	`274`	`+ uint64_t us_elapsed_absolute UNUSED,`
`272`	`275`	`int exec_id, const char exe, const char *argv)`
`273`	`276`	`{`
`274`	`277`	`struct strbuf buf_payload = STRBUF_INIT;`
`@@ -284,8 +287,8 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,`
`284`	`287`	`}`
`285`	`288`
`286`	`289`	`static void fn_exec_result_fl(const char *file, int line,`
`287`		`- uint64_t us_elapsed_absolute, int exec_id,`
`288`		`- int code)`
	`290`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`291`	`+ int exec_id, int code)`
`289`	`292`	`{`
`290`	`293`	`struct strbuf buf_payload = STRBUF_INIT;`
`291`	`294`
`@@ -321,7 +324,8 @@ static void fn_repo_fl(const char *file, int line,`
`321`	`324`	`}`
`322`	`325`
`323`	`326`	`static void fn_printf_va_fl(const char *file, int line,`
`324`		`- uint64_t us_elapsed_absolute, const char *fmt,`
	`327`	`+ uint64_t us_elapsed_absolute UNUSED,`
	`328`	`+ const char *fmt,`
`325`	`329`	`va_list ap)`
`326`	`330`	`{`
`327`	`331`	`struct strbuf buf_payload = STRBUF_INIT;`