diff mbox series

[4/4] trace2: remove unneeded calls to generate 'def_param' set

Message ID e8528715ebf97c12622c2e73f914ab4228a0927c.1709566808.git.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series trace2: move 'def_param' events into 'cmd_name' and 'cmd_alias' | expand

Commit Message

Jeff Hostetler March 4, 2024, 3:40 p.m. UTC 
From: Jeff Hostetler <jeffhostetler@github.com>

Now that "trace2_cmd_name()" implicitly calls "trace2_cmd_list_config()"
and "trace2_cmd_list_env_vars()", we don't need to explicitly call them.

Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>
---
 git.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Josh Steadmon March 6, 2024, 9:47 p.m. UTC | #1 
On 2024.03.04 15:40, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler <jeffhostetler@github.com>
> 
> Now that "trace2_cmd_name()" implicitly calls "trace2_cmd_list_config()"
> and "trace2_cmd_list_env_vars()", we don't need to explicitly call them.
> 
> Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>
> ---
>  git.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/git.c b/git.c
> index 7068a184b0a..a769d72ab8f 100644
> --- a/git.c
> +++ b/git.c
> @@ -373,8 +373,6 @@ static int handle_alias(int *argcp, const char ***argv)
>  			strvec_pushv(&child.args, (*argv) + 1);
>  
>  			trace2_cmd_alias(alias_command, child.args.v);
> -			trace2_cmd_list_config();
> -			trace2_cmd_list_env_vars();
>  			trace2_cmd_name("_run_shell_alias_");
>  
>  			ret = run_command(&child);
> @@ -411,8 +409,6 @@ static int handle_alias(int *argcp, const char ***argv)
>  		COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
>  
>  		trace2_cmd_alias(alias_command, new_argv);
> -		trace2_cmd_list_config();
> -		trace2_cmd_list_env_vars();
>  
>  		*argv = new_argv;
>  		*argcp += count - 1;
> @@ -462,8 +458,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
>  
>  	trace_argv_printf(argv, "trace: built-in: git");
>  	trace2_cmd_name(p->cmd);
> -	trace2_cmd_list_config();
> -	trace2_cmd_list_env_vars();
>  
>  	validate_cache_entries(the_repository->index);
>  	status = p->fn(argc, argv, prefix);
> -- 
> gitgitgadget
> 

I'd personally prefer to see this squashed into Patch 3, but I don't
feel too strongly about it. Either way, the series LGTM.

Reviewed-by: Josh Steadmon <steadmon@google.com>
Junio C Hamano March 6, 2024, 9:57 p.m. UTC | #2 
Josh Steadmon <steadmon@google.com> writes:

> On 2024.03.04 15:40, Jeff Hostetler via GitGitGadget wrote:
>> From: Jeff Hostetler <jeffhostetler@github.com>
>> 
>> Now that "trace2_cmd_name()" implicitly calls "trace2_cmd_list_config()"
>> and "trace2_cmd_list_env_vars()", we don't need to explicitly call them.
>> 
>> Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>
>> ---
>>  git.c | 6 ------
>>  1 file changed, 6 deletions(-)
>> 
>> diff --git a/git.c b/git.c
>> index 7068a184b0a..a769d72ab8f 100644
>> --- a/git.c
>> +++ b/git.c
>> @@ -373,8 +373,6 @@ static int handle_alias(int *argcp, const char ***argv)
>>  			strvec_pushv(&child.args, (*argv) + 1);
>>  
>>  			trace2_cmd_alias(alias_command, child.args.v);
>> -			trace2_cmd_list_config();
>> -			trace2_cmd_list_env_vars();
>>  			trace2_cmd_name("_run_shell_alias_");
>>  
>>  			ret = run_command(&child);
>> @@ -411,8 +409,6 @@ static int handle_alias(int *argcp, const char ***argv)
>>  		COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
>>  
>>  		trace2_cmd_alias(alias_command, new_argv);
>> -		trace2_cmd_list_config();
>> -		trace2_cmd_list_env_vars();
>>  
>>  		*argv = new_argv;
>>  		*argcp += count - 1;
>> @@ -462,8 +458,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
>>  
>>  	trace_argv_printf(argv, "trace: built-in: git");
>>  	trace2_cmd_name(p->cmd);
>> -	trace2_cmd_list_config();
>> -	trace2_cmd_list_env_vars();
>>  
>>  	validate_cache_entries(the_repository->index);
>>  	status = p->fn(argc, argv, prefix);
>> -- 
>> gitgitgadget
>> 
>
> I'd personally prefer to see this squashed into Patch 3, but I don't
> feel too strongly about it. Either way, the series LGTM.
>
> Reviewed-by: Josh Steadmon <steadmon@google.com>

Let's see what JeffH says about this.  I agree with you that making
some stuff redundant in [Patch 3/4] and fixing the redundancy in
this step does feel somewhat roundabout way of doing this.

Thanks.
Jeff Hostetler March 6, 2024, 10:54 p.m. UTC | #3 
On 3/6/24 4:57 PM, Junio C Hamano wrote:
> Josh Steadmon <steadmon@google.com> writes:
> 
>> On 2024.03.04 15:40, Jeff Hostetler via GitGitGadget wrote:
>>> From: Jeff Hostetler <jeffhostetler@github.com>
>>>
>>> Now that "trace2_cmd_name()" implicitly calls "trace2_cmd_list_config()"
>>> and "trace2_cmd_list_env_vars()", we don't need to explicitly call them.
>>>
>>> Signed-off-by: Jeff Hostetler <jeffhostetler@github.com>
>>> ---
>>>   git.c | 6 ------
>>>   1 file changed, 6 deletions(-)
>>>
>>> diff --git a/git.c b/git.c
>>> index 7068a184b0a..a769d72ab8f 100644
>>> --- a/git.c
>>> +++ b/git.c
>>> @@ -373,8 +373,6 @@ static int handle_alias(int *argcp, const char ***argv)
>>>   			strvec_pushv(&child.args, (*argv) + 1);
>>>   
>>>   			trace2_cmd_alias(alias_command, child.args.v);
>>> -			trace2_cmd_list_config();
>>> -			trace2_cmd_list_env_vars();
>>>   			trace2_cmd_name("_run_shell_alias_");
>>>   
>>>   			ret = run_command(&child);
>>> @@ -411,8 +409,6 @@ static int handle_alias(int *argcp, const char ***argv)
>>>   		COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
>>>   
>>>   		trace2_cmd_alias(alias_command, new_argv);
>>> -		trace2_cmd_list_config();
>>> -		trace2_cmd_list_env_vars();
>>>   
>>>   		*argv = new_argv;
>>>   		*argcp += count - 1;
>>> @@ -462,8 +458,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
>>>   
>>>   	trace_argv_printf(argv, "trace: built-in: git");
>>>   	trace2_cmd_name(p->cmd);
>>> -	trace2_cmd_list_config();
>>> -	trace2_cmd_list_env_vars();
>>>   
>>>   	validate_cache_entries(the_repository->index);
>>>   	status = p->fn(argc, argv, prefix);
>>> -- 
>>> gitgitgadget
>>>
>>
>> I'd personally prefer to see this squashed into Patch 3, but I don't
>> feel too strongly about it. Either way, the series LGTM.
>>
>> Reviewed-by: Josh Steadmon <steadmon@google.com>
> 
> Let's see what JeffH says about this.  I agree with you that making
> some stuff redundant in [Patch 3/4] and fixing the redundancy in
> this step does feel somewhat roundabout way of doing this.
> 
> Thanks.
> 

Sure we can merge them.  That's fine.  I can send a V4 or if you want
to just squash them together that's fine.

Jeff
Junio C Hamano March 6, 2024, 11 p.m. UTC | #4 
Jeff Hostetler <git@jeffhostetler.com> writes:

>>> Reviewed-by: Josh Steadmon <steadmon@google.com>
>> Let's see what JeffH says about this.  I agree with you that making
>> some stuff redundant in [Patch 3/4] and fixing the redundancy in
>> this step does feel somewhat roundabout way of doing this.
>> Thanks.
>> 
>
> Sure we can merge them.  That's fine.  I can send a V4 or if you want
> to just squash them together that's fine.

Let's have a v4 describing the change for combined 3&4 in your
words, with Josh's Reviewed-by: already added to the trailers.

Thanks, both of you.
diff mbox series

Patch

diff --git a/git.c b/git.c
index 7068a184b0a..a769d72ab8f 100644
--- a/git.c
+++ b/git.c
@@ -373,8 +373,6 @@  static int handle_alias(int *argcp, const char ***argv)
 			strvec_pushv(&child.args, (*argv) + 1);
 
 			trace2_cmd_alias(alias_command, child.args.v);
-			trace2_cmd_list_config();
-			trace2_cmd_list_env_vars();
 			trace2_cmd_name("_run_shell_alias_");
 
 			ret = run_command(&child);
@@ -411,8 +409,6 @@  static int handle_alias(int *argcp, const char ***argv)
 		COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
 
 		trace2_cmd_alias(alias_command, new_argv);
-		trace2_cmd_list_config();
-		trace2_cmd_list_env_vars();
 
 		*argv = new_argv;
 		*argcp += count - 1;
@@ -462,8 +458,6 @@  static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 
 	trace_argv_printf(argv, "trace: built-in: git");
 	trace2_cmd_name(p->cmd);
-	trace2_cmd_list_config();
-	trace2_cmd_list_env_vars();
 
 	validate_cache_entries(the_repository->index);
 	status = p->fn(argc, argv, prefix);