{"thread":{"id":"50992","subject":"[PATCH] trace2: fix incorrect function pointer check","startedAt":"2019-04-25T17:08:58Z","lastAt":"2019-04-29T13:01:10Z","messageCount":4,"participants":["Josh Steadmon","Derrick Stolee","Junio C Hamano","Jeff Hostetler"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"374517","messageId":"548a9b833f4569c526cf94c048ae115a76d54be9.1556211995.git.steadmon@google.com","threadId":"50992","inReplyTo":null,"subject":"[PATCH] trace2: fix incorrect function pointer check","fromName":"Josh Steadmon","fromEmail":"steadmon@google.com","sentAt":"2019-04-25T17:08:53Z","receivedAt":"2019-04-25T17:08:58Z","isPatch":true,"sender":{"key":"steadmon@google.com","avatar":"https://avatars.githubusercontent.com/u/2654920?v=4"},"body":"Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl\nin its targets, rather than pfn_data_fl, which is not actually called.\n\nSigned-off-by: Josh Steadmon <steadmon@google.com>\n---\n trace2.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/trace2.c b/trace2.c\nindex 8bbad56887..a73cfdf6fe 100644\n--- a/trace2.c\n+++ b/trace2.c\n@@ -717,7 +717,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category,\n \tus_elapsed_region = tr2tls_region_elasped_self(us_now);\n \n \tfor_each_wanted_builtin (j, tgt_j)\n-\t\tif (tgt_j->pfn_data_fl)\n+\t\tif (tgt_j->pfn_data_json_fl)\n \t\t\ttgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,\n \t\t\t\t\t\tus_elapsed_region, category,\n \t\t\t\t\t\trepo, key, value);\n-- \n2.21.0.593.g511ec345e18-goog\n\n"},{"id":"374522","messageId":"20ceb5c3-f64f-be77-2d11-cb41a7045642@gmail.com","threadId":"50992","inReplyTo":"548a9b833f4569c526cf94c048ae115a76d54be9.1556211995.git.steadmon@google.com","subject":"Re: [PATCH] trace2: fix incorrect function pointer check","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2019-04-25T18:46:40Z","receivedAt":"2019-04-25T18:46:44Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 4/25/2019 1:08 PM, Josh Steadmon wrote:\n> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl\n> in its targets, rather than pfn_data_fl, which is not actually called.\n\n[snip]\n\n>  \tfor_each_wanted_builtin (j, tgt_j)\n> -\t\tif (tgt_j->pfn_data_fl)\n> +\t\tif (tgt_j->pfn_data_json_fl)\n>  \t\t\ttgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,\n\nSeems obviously correct. Thanks!\n\n-Stolee\n\n"},{"id":"374539","messageId":"xmqq36m5wkqj.fsf@gitster-ct.c.googlers.com","threadId":"50992","inReplyTo":"20ceb5c3-f64f-be77-2d11-cb41a7045642@gmail.com","subject":"Re: [PATCH] trace2: fix incorrect function pointer check","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-04-26T02:42:12Z","receivedAt":"2019-04-26T02:42:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee <stolee@gmail.com> writes:\n\n> On 4/25/2019 1:08 PM, Josh Steadmon wrote:\n>> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl\n>> in its targets, rather than pfn_data_fl, which is not actually called.\n>\n> [snip]\n>\n>>  \tfor_each_wanted_builtin (j, tgt_j)\n>> -\t\tif (tgt_j->pfn_data_fl)\n>> +\t\tif (tgt_j->pfn_data_json_fl)\n>>  \t\t\ttgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,\n>\n> Seems obviously correct. Thanks!\n>\n> -Stolee\n\nThanks, both.  It is embarrassing and sad that nobody caught it\nbefore it hit my tree X-<.\n"},{"id":"374639","messageId":"09415b8f-d07f-5928-06d3-d905a7a30c09@jeffhostetler.com","threadId":"50992","inReplyTo":"548a9b833f4569c526cf94c048ae115a76d54be9.1556211995.git.steadmon@google.com","subject":"Re: [PATCH] trace2: fix incorrect function pointer check","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2019-04-29T13:01:07Z","receivedAt":"2019-04-29T13:01:10Z","isPatch":true,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 4/25/2019 1:08 PM, Josh Steadmon wrote:\n> Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl\n> in its targets, rather than pfn_data_fl, which is not actually called.\n> \n> Signed-off-by: Josh Steadmon <steadmon@google.com>\n> ---\n>   trace2.c | 2 +-\n>   1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/trace2.c b/trace2.c\n> index 8bbad56887..a73cfdf6fe 100644\n> --- a/trace2.c\n> +++ b/trace2.c\n> @@ -717,7 +717,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category,\n>   \tus_elapsed_region = tr2tls_region_elasped_self(us_now);\n>   \n>   \tfor_each_wanted_builtin (j, tgt_j)\n> -\t\tif (tgt_j->pfn_data_fl)\n> +\t\tif (tgt_j->pfn_data_json_fl)\n>   \t\t\ttgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,\n>   \t\t\t\t\t\tus_elapsed_region, category,\n>   \t\t\t\t\t\trepo, key, value);\n> \n\ngood catch.  thanks.\n\nJeff\n"}]}