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

Commit 076a30c4 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf callchain: Move option parsing code to util.c 



Move callchain option parse related code to util.c, to avoid dragging
more object files into the python binding.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1438890294-33409-1-git-send-email-kan.liang@intel.com


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

tools/perf/util/callchain.c

+1 −88
Original line number Diff line number Diff line
@@ -25,96 +25,9 @@ 


__thread struct callchain_cursor callchain_cursor;



#ifdef HAVE_DWARF_UNWIND_SUPPORT

static int get_stack_size(const char *str, unsigned long *_size)

{

	char *endptr;

	unsigned long size;

	unsigned long max_size = round_down(USHRT_MAX, sizeof(u64));



	size = strtoul(str, &endptr, 0);



	do {

		if (*endptr)

			break;



		size = round_up(size, sizeof(u64));

		if (!size || size > max_size)

			break;



		*_size = size;

		return 0;



	} while (0);



	pr_err("callchain: Incorrect stack dump size (max %ld): %s\n",

	       max_size, str);

	return -1;

}

#endif /* HAVE_DWARF_UNWIND_SUPPORT */



int parse_callchain_record_opt(const char *arg, struct callchain_param *param)

{

	char *tok, *name, *saveptr = NULL;

	char *buf;

	int ret = -1;



	/* We need buffer that we know we can write to. */

	buf = malloc(strlen(arg) + 1);

	if (!buf)

		return -ENOMEM;



	strcpy(buf, arg);



	tok = strtok_r((char *)buf, ",", &saveptr);

	name = tok ? : (char *)buf;



	do {

		/* Framepointer style */

		if (!strncmp(name, "fp", sizeof("fp"))) {

			if (!strtok_r(NULL, ",", &saveptr)) {

				param->record_mode = CALLCHAIN_FP;

				ret = 0;

			} else

				pr_err("callchain: No more arguments "

				       "needed for --call-graph fp\n");

			break;



#ifdef HAVE_DWARF_UNWIND_SUPPORT

		/* Dwarf style */

		} else if (!strncmp(name, "dwarf", sizeof("dwarf"))) {

			const unsigned long default_stack_dump_size = 8192;



			ret = 0;

			param->record_mode = CALLCHAIN_DWARF;

			param->dump_size = default_stack_dump_size;



			tok = strtok_r(NULL, ",", &saveptr);

			if (tok) {

				unsigned long size = 0;



				ret = get_stack_size(tok, &size);

				param->dump_size = size;

			}

#endif /* HAVE_DWARF_UNWIND_SUPPORT */

		} else if (!strncmp(name, "lbr", sizeof("lbr"))) {

			if (!strtok_r(NULL, ",", &saveptr)) {

				param->record_mode = CALLCHAIN_LBR;

				ret = 0;

			} else

				pr_err("callchain: No more arguments "

					"needed for --call-graph lbr\n");

			break;

		} else {

			pr_err("callchain: Unknown --call-graph option "

			       "value: %s\n", arg);

			break;

		}



	} while (0);



	free(buf);

	return ret;

	return parse_callchain_record(arg, param);

}



static int parse_callchain_mode(const char *value)

tools/perf/util/callchain.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node * 
			bool hide_unresolved);



extern const char record_callchain_help[];

extern int parse_callchain_record(const char *arg, struct callchain_param *param);

int parse_callchain_record_opt(const char *arg, struct callchain_param *param);

int parse_callchain_report_opt(const char *arg);

int perf_callchain_config(const char *var, const char *value);

tools/perf/util/util.c

+90 −0
Original line number Diff line number Diff line
@@ -566,6 +566,96 @@ unsigned long parse_tag_value(const char *str, struct parse_tag *tags) 
	return (unsigned long) -1;

}



int get_stack_size(const char *str, unsigned long *_size)

{

	char *endptr;

	unsigned long size;

	unsigned long max_size = round_down(USHRT_MAX, sizeof(u64));



	size = strtoul(str, &endptr, 0);



	do {

		if (*endptr)

			break;



		size = round_up(size, sizeof(u64));

		if (!size || size > max_size)

			break;



		*_size = size;

		return 0;



	} while (0);



	pr_err("callchain: Incorrect stack dump size (max %ld): %s\n",

	       max_size, str);

	return -1;

}



int parse_callchain_record(const char *arg, struct callchain_param *param)

{

	char *tok, *name, *saveptr = NULL;

	char *buf;

	int ret = -1;



	/* We need buffer that we know we can write to. */

	buf = malloc(strlen(arg) + 1);

	if (!buf)

		return -ENOMEM;



	strcpy(buf, arg);



	tok = strtok_r((char *)buf, ",", &saveptr);

	name = tok ? : (char *)buf;



	do {

		/* Framepointer style */

		if (!strncmp(name, "fp", sizeof("fp"))) {

			if (!strtok_r(NULL, ",", &saveptr)) {

				param->record_mode = CALLCHAIN_FP;

				ret = 0;

			} else

				pr_err("callchain: No more arguments "

				       "needed for --call-graph fp\n");

			break;



#ifdef HAVE_DWARF_UNWIND_SUPPORT

		/* Dwarf style */

		} else if (!strncmp(name, "dwarf", sizeof("dwarf"))) {

			const unsigned long default_stack_dump_size = 8192;



			ret = 0;

			param->record_mode = CALLCHAIN_DWARF;

			param->dump_size = default_stack_dump_size;



			tok = strtok_r(NULL, ",", &saveptr);

			if (tok) {

				unsigned long size = 0;



				ret = get_stack_size(tok, &size);

				param->dump_size = size;

			}

#endif /* HAVE_DWARF_UNWIND_SUPPORT */

		} else if (!strncmp(name, "lbr", sizeof("lbr"))) {

			if (!strtok_r(NULL, ",", &saveptr)) {

				param->record_mode = CALLCHAIN_LBR;

				ret = 0;

			} else

				pr_err("callchain: No more arguments "

					"needed for --call-graph lbr\n");

			break;

		} else {

			pr_err("callchain: Unknown --call-graph option "

			       "value: %s\n", arg);

			break;

		}



	} while (0);



	free(buf);

	return ret;

}



int filename__read_str(const char *filename, char **buf, size_t *sizep)

{

	size_t size = 0, alloc_size = 0;

tools/perf/util/util.h

+2 −0
Original line number Diff line number Diff line
@@ -351,4 +351,6 @@ static inline char *asprintf_expr_not_in_ints(const char *var, size_t nints, int 
	return asprintf_expr_inout_ints(var, false, nints, ints);

}



int get_stack_size(const char *str, unsigned long *_size);



#endif /* GIT_COMPAT_UTIL_H */