Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3275f68e authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf data ctf: Pass convert options through opts structure 



Following commits will add new option to 'perf data convert'. All options
should be grouped into a structure and passed to low level converter
(currently there's only one converter).

Introduce data-convert.h and define 'struct perf_data_convert_opts' in
it. Pass 'force' through opts.

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1466767332-114472-3-git-send-email-wangnan0@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 069ee5c4

tools/perf/builtin-data.c

+6 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "perf.h"

#include "debug.h"

#include <subcmd/parse-options.h>

#include "data-convert.h"

#include "data-convert-bt.h"



typedef int (*data_cmd_fn_t)(int argc, const char **argv, const char *prefix);
@@ -53,14 +54,16 @@ static int cmd_data_convert(int argc, const char **argv, 
			    const char *prefix __maybe_unused)

{

	const char *to_ctf     = NULL;

	bool force = false;

	struct perf_data_convert_opts opts = {

		.force = false,

	};

	const struct option options[] = {

		OPT_INCR('v', "verbose", &verbose, "be more verbose"),

		OPT_STRING('i', "input", &input_name, "file", "input file name"),

#ifdef HAVE_LIBBABELTRACE_SUPPORT

		OPT_STRING(0, "to-ctf", &to_ctf, NULL, "Convert to CTF format"),

#endif

		OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),

		OPT_BOOLEAN('f', "force", &opts.force, "don't complain, do it"),

		OPT_END()

	};
@@ -78,7 +81,7 @@ static int cmd_data_convert(int argc, const char **argv, 


	if (to_ctf) {

#ifdef HAVE_LIBBABELTRACE_SUPPORT

		return bt_convert__perf2ctf(input_name, to_ctf, force);

		return bt_convert__perf2ctf(input_name, to_ctf, &opts);

#else

		pr_err("The libbabeltrace support is not compiled in.\n");

		return -1;

tools/perf/util/data-convert-bt.c

+3 −2
Original line number Diff line number Diff line
@@ -1304,13 +1304,14 @@ static int convert__config(const char *var, const char *value, void *cb) 
	return 0;

}



int bt_convert__perf2ctf(const char *input, const char *path, bool force)

int bt_convert__perf2ctf(const char *input, const char *path,

			 struct perf_data_convert_opts *opts)

{

	struct perf_session *session;

	struct perf_data_file file = {

		.path = input,

		.mode = PERF_DATA_MODE_READ,

		.force = force,

		.force = opts->force,

	};

	struct convert c = {

		.tool = {

tools/perf/util/data-convert-bt.h

+3 −1
Original line number Diff line number Diff line 
#ifndef __DATA_CONVERT_BT_H

#define __DATA_CONVERT_BT_H

#include "data-convert.h"

#ifdef HAVE_LIBBABELTRACE_SUPPORT



int bt_convert__perf2ctf(const char *input_name, const char *to_ctf, bool force);

int bt_convert__perf2ctf(const char *input_name, const char *to_ctf,

			 struct perf_data_convert_opts *opts);



#endif /* HAVE_LIBBABELTRACE_SUPPORT */

#endif /* __DATA_CONVERT_BT_H */

tools/perf/util/data-convert.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef __DATA_CONVERT_H

#define __DATA_CONVERT_H



struct perf_data_convert_opts {

	bool force;

};



#endif /* __DATA_CONVERT_H */