Commit e61078a0 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf record: Use long arg for counter period 



I wrote this to test the extended period emulation, we might as
well merge it.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 226f62fd

Documentation/perf_counter/builtin-record.c

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#define ALIGN(x, a)		__ALIGN_MASK(x, (typeof(x))(a)-1)

#define __ALIGN_MASK(x, mask)	(((x)+(mask))&~(mask))



static int			default_interval = 100000;

static int			event_count[MAX_COUNTERS];

static long			default_interval = 100000;

static long			event_count[MAX_COUNTERS];



static int			fd[MAX_NR_CPUS][MAX_COUNTERS];

static int			nr_cpus				= 0;
@@ -494,7 +494,7 @@ static const struct option options[] = { 
			    "append to the output file to do incremental profiling"),

	OPT_BOOLEAN('f', "force", &force,

			"overwrite existing data file"),

	OPT_INTEGER('c', "count", &default_interval,

	OPT_LONG('c', "count", &default_interval,

		    "event period to sample"),

	OPT_STRING('o', "output", &output_name, "file",

		    "output file name"),

Documentation/perf_counter/util/parse-options.c

+16 −0
Original line number Diff line number Diff line
@@ -113,6 +113,22 @@ static int get_value(struct parse_opt_ctx_t *p, 
			return opterror(opt, "expects a numerical value", flags);

		return 0;



	case OPTION_LONG:

		if (unset) {

			*(long *)opt->value = 0;

			return 0;

		}

		if (opt->flags & PARSE_OPT_OPTARG && !p->opt) {

			*(long *)opt->value = opt->defval;

			return 0;

		}

		if (get_arg(p, opt, flags, &arg))

			return -1;

		*(long *)opt->value = strtol(arg, (char **)&s, 10);

		if (*s)

			return opterror(opt, "expects a numerical value", flags);

		return 0;



	default:

		die("should not happen, someone must be hit on the forehead");

	}

Documentation/perf_counter/util/parse-options.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ enum parse_opt_type { 
	/* options with arguments (usually) */

	OPTION_STRING,

	OPTION_INTEGER,

	OPTION_LONG,

	OPTION_CALLBACK,

};
@@ -97,6 +98,7 @@ struct option { 
#define OPT_SET_INT(s, l, v, h, i)  { OPTION_SET_INT, (s), (l), (v), NULL, (h), 0, NULL, (i) }

#define OPT_SET_PTR(s, l, v, h, p)  { OPTION_SET_PTR, (s), (l), (v), NULL, (h), 0, NULL, (p) }

#define OPT_INTEGER(s, l, v, h)     { OPTION_INTEGER, (s), (l), (v), NULL, (h) }

#define OPT_LONG(s, l, v, h)        { OPTION_LONG, (s), (l), (v), NULL, (h) }

#define OPT_STRING(s, l, v, a, h)   { OPTION_STRING,  (s), (l), (v), (a), (h) }

#define OPT_DATE(s, l, v, h) \

	{ OPTION_CALLBACK, (s), (l), (v), "time",(h), 0, \

CRA Git | Maintained and supported by SUSTech CRA and CCSE