* [PATCH] trace2: fix incorrect function pointer check
@ 2019-04-25 17:08 Josh Steadmon
2019-04-25 18:46 ` Derrick Stolee
2019-04-29 13:01 ` Jeff Hostetler
0 siblings, 2 replies; 4+ messages in thread
From: Josh Steadmon @ 2019-04-25 17:08 UTC (permalink / raw)
To: git; +Cc: git
Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl
in its targets, rather than pfn_data_fl, which is not actually called.
Signed-off-by: Josh Steadmon <steadmon@google.com>
---
trace2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/trace2.c b/trace2.c
index 8bbad56887..a73cfdf6fe 100644
--- a/trace2.c
+++ b/trace2.c
@@ -717,7 +717,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category,
us_elapsed_region = tr2tls_region_elasped_self(us_now);
for_each_wanted_builtin (j, tgt_j)
- if (tgt_j->pfn_data_fl)
+ if (tgt_j->pfn_data_json_fl)
tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
us_elapsed_region, category,
repo, key, value);
--
2.21.0.593.g511ec345e18-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] trace2: fix incorrect function pointer check
2019-04-25 17:08 [PATCH] trace2: fix incorrect function pointer check Josh Steadmon
@ 2019-04-25 18:46 ` Derrick Stolee
2019-04-26 2:42 ` Junio C Hamano
2019-04-29 13:01 ` Jeff Hostetler
1 sibling, 1 reply; 4+ messages in thread
From: Derrick Stolee @ 2019-04-25 18:46 UTC (permalink / raw)
To: Josh Steadmon, git; +Cc: git
On 4/25/2019 1:08 PM, Josh Steadmon wrote:
> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl
> in its targets, rather than pfn_data_fl, which is not actually called.
[snip]
> for_each_wanted_builtin (j, tgt_j)
> - if (tgt_j->pfn_data_fl)
> + if (tgt_j->pfn_data_json_fl)
> tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
Seems obviously correct. Thanks!
-Stolee
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] trace2: fix incorrect function pointer check
2019-04-25 18:46 ` Derrick Stolee
@ 2019-04-26 2:42 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2019-04-26 2:42 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Josh Steadmon, git, git
Derrick Stolee <stolee@gmail.com> writes:
> On 4/25/2019 1:08 PM, Josh Steadmon wrote:
>> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl
>> in its targets, rather than pfn_data_fl, which is not actually called.
>
> [snip]
>
>> for_each_wanted_builtin (j, tgt_j)
>> - if (tgt_j->pfn_data_fl)
>> + if (tgt_j->pfn_data_json_fl)
>> tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
>
> Seems obviously correct. Thanks!
>
> -Stolee
Thanks, both. It is embarrassing and sad that nobody caught it
before it hit my tree X-<.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] trace2: fix incorrect function pointer check
2019-04-25 17:08 [PATCH] trace2: fix incorrect function pointer check Josh Steadmon
2019-04-25 18:46 ` Derrick Stolee
@ 2019-04-29 13:01 ` Jeff Hostetler
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Hostetler @ 2019-04-29 13:01 UTC (permalink / raw)
To: Josh Steadmon, git
On 4/25/2019 1:08 PM, Josh Steadmon wrote:
> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl
> in its targets, rather than pfn_data_fl, which is not actually called.
>
> Signed-off-by: Josh Steadmon <steadmon@google.com>
> ---
> trace2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/trace2.c b/trace2.c
> index 8bbad56887..a73cfdf6fe 100644
> --- a/trace2.c
> +++ b/trace2.c
> @@ -717,7 +717,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category,
> us_elapsed_region = tr2tls_region_elasped_self(us_now);
>
> for_each_wanted_builtin (j, tgt_j)
> - if (tgt_j->pfn_data_fl)
> + if (tgt_j->pfn_data_json_fl)
> tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
> us_elapsed_region, category,
> repo, key, value);
>
good catch. thanks.
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-29 13:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-25 17:08 [PATCH] trace2: fix incorrect function pointer check Josh Steadmon
2019-04-25 18:46 ` Derrick Stolee
2019-04-26 2:42 ` Junio C Hamano
2019-04-29 13:01 ` Jeff Hostetler
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).