Re: [PATCH 03/24] perf daemon: Add base option

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Sun, Jan 31, 2021 at 12:48:35AM +0100, Jiri Olsa escreveu:
> Adding base option allowing user to specify base directory.
> It will have precedence over config file base definition
> coming in following patches.
> 
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  tools/perf/builtin-daemon.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)

Missing doc update
 
> diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
> index 1f2393faad75..8d0ac44ec808 100644
> --- a/tools/perf/builtin-daemon.c
> +++ b/tools/perf/builtin-daemon.c
> @@ -6,6 +6,7 @@
>  #include <stdlib.h>
>  #include <stdio.h>
>  #include <unistd.h>
> +#include <errno.h>
>  #include "builtin.h"
>  #include "perf.h"
>  #include "debug.h"
> @@ -15,6 +16,7 @@
>  struct daemon {
>  	const char		*config;
>  	char			*config_real;
> +	const char		*base_user;
>  	char			*base;
>  	FILE			*out;
>  	char			 perf[PATH_MAX];
> @@ -38,6 +40,7 @@ static void sig_handler(int sig __maybe_unused)
>  static void daemon__free(struct daemon *daemon)
>  {
>  	free(daemon->config_real);
> +	free(daemon->base);
>  }
>  
>  static void daemon__exit(struct daemon *daemon)
> @@ -47,6 +50,12 @@ static void daemon__exit(struct daemon *daemon)
>  
>  static int setup_config(struct daemon *daemon)
>  {
> +	if (daemon->base_user) {
> +		daemon->base = strdup(daemon->base_user);
> +		if (!daemon->base)
> +			return -ENOMEM;
> +	}
> +
>  	if (daemon->config) {
>  		char *real = realpath(daemon->config, NULL);
>  
> @@ -109,6 +118,8 @@ int cmd_daemon(int argc, const char **argv)
>  		OPT_INCR('v', "verbose", &verbose, "be more verbose"),
>  		OPT_STRING(0, "config", &__daemon.config,
>  			"config file", "config file path"),
> +		OPT_STRING(0, "base", &__daemon.base_user,
> +			"directory", "base directory"),
>  		OPT_END()
>  	};
>  
> -- 
> 2.29.2
> 

-- 

- Arnaldo