Re: [PATCH i-g-t v2 2/2] runner/executor: Report command used for test exec

[Gustavo Sousa <gustavo.sousa@intel.com>]

Kamil Konieczny <kamil.konieczny@linux.intel.com> writes:

> Add printing of command line used for executing a test, when
> the log level is normal or above.
>
> v2: move constructing exec command string to separate function
>     (Gustavo)
>
> Signed-off-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  runner/executor.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 49 insertions(+), 1 deletion(-)
>
> diff --git a/runner/executor.c b/runner/executor.c
> index 5bd95b929..91ad05d58 100644
> --- a/runner/executor.c
> +++ b/runner/executor.c
> @@ -1626,6 +1626,49 @@ static void free_test_command(struct igt_vec *arg_vec)
>  	igt_vec_fini(arg_vec);
>  }
>  
> +static char *entry_exec_cmd(struct igt_vec *arg_vec)
> +{
> +	char *m, *n;
> +	int mlen, s_len, vec_len;
> +
> +	mlen = 4096;
> +	m = malloc(mlen);
> +	if (!m)
> +		return NULL;
> +
> +	vec_len = igt_vec_length(arg_vec);
> +	s_len = 0;
> +	for (size_t i = 0; i < vec_len; i++) {
> +		int nlen;
> +
> +		n = *((char **)igt_vec_elem(arg_vec, i));
> +		if (!n)
> +			break;
> +
> +		nlen = strlen(n);
> +		if (s_len + nlen + 2 > mlen) {
> +			char *p;
> +
> +			mlen *= 2;
> +			p = realloc(m, mlen);
> +			if (!p)
> +				break;
> +
> +			m = p;
> +		}
> +
> +		if (i)
> +			m[s_len++] = ' ';
> +
> +		memcpy(m + s_len, n, nlen);
> +		s_len += nlen;
> +	}
> +
> +	m[s_len++] = 0;
> +
> +	return m;
> +}
> +
>  static void build_test_command(struct settings *settings,
>  			       struct job_list_entry *entry,
>  			       struct igt_vec *arg_vec)
> @@ -1849,7 +1892,7 @@ static int execute_next_entry(struct execute_state *state,
>  
>  	if (settings->log_level >= LOG_LEVEL_NORMAL) {
>  		char buf[100];
> -		char *displayname;
> +		char *displayname, *cmd;
>  		int width = digits(total);
>  		int len;
>  
> @@ -1864,6 +1907,11 @@ static int execute_next_entry(struct execute_state *state,
>  		free(displayname);
>  
>  		outf("%s\n", buf);
> +		cmd = entry_exec_cmd(&arg_vec);
> +		if (cmd) {
> +			outf("cmd: %s\n", cmd);
> +			free(cmd);
> +		}

The function entry_exec_cmd() and its usage look correct to me, but I
wonder if we could avoid the memory allocation with something like
below:

    outf("cmd:");

    for (size_t i = 0;
         i < igt_vec_length(&arg_vec) && *(char **)igt_vec_elem(&arg_vec, i);
         i++)
    	outf(" %s", *(char **)igt_vec_elem(&arg_vec, i));

    outf("\n");

--
Gustavo Sousa

>  	}
>  
>  	/*
> -- 
> 2.55.0