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

Commit 215432ed authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Fix command line callchain attribute tests to handle the new
    -g/--call-chain semantics, from Arnaldo Carvalho de Melo.

  * Remove cast of non-variadic function to variadic, fixing perf output
    on armhf arch. Fix from Michael Hudson-Doyle.

  * Fix 32-bit building of 'perf bench', from Wei Yang.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5e01dc7b 46d525ea

tools/perf/bench/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static void *worker_thread(void *__tdata) 
		/* Check whether our max runtime timed out: */

		if (g->p.nr_secs) {

			timersub(&stop, &start0, &diff);

			if (diff.tv_sec >= g->p.nr_secs) {

			if (diff.tv_sec >= (time_t)g->p.nr_secs) {

				g->stop_work = true;

				break;

			}
@@ -1157,7 +1157,7 @@ static void *worker_thread(void *__tdata) 
			runtime_ns_max += diff.tv_usec * 1000;



			if (details >= 0) {

				printf(" #%2d / %2d: %14.2lf nsecs/op [val: %016lx]\n",

				printf(" #%2d / %2d: %14.2lf nsecs/op [val: %016"PRIu64"]\n",

					process_nr, thread_nr, runtime_ns_max / bytes_done, val);

			}

			fflush(stdout);

tools/perf/tests/attr/README

+3 −3
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ Following tests are defined (with perf commands): 
  perf record -c 123 kill                       (test-record-count)

  perf record -d kill                           (test-record-data)

  perf record -F 100 kill                       (test-record-freq)

  perf record -g -- kill                        (test-record-graph-default)

  perf record -g dwarf -- kill                  (test-record-graph-dwarf)

  perf record -g fp kill                        (test-record-graph-fp)

  perf record -g kill                           (test-record-graph-default)

  perf record --call-graph dwarf kill		(test-record-graph-dwarf)

  perf record --call-graph fp kill              (test-record-graph-fp)

  perf record --group -e cycles,instructions kill (test-record-group)

  perf record -e '{cycles,instructions}' kill   (test-record-group1)

  perf record -D kill                           (test-record-no-delay)

tools/perf/tests/attr/test-record-graph-default

+1 −1
Original line number Diff line number Diff line 
[config]

command = record

args    = -g -- kill >/dev/null 2>&1

args    = -g kill >/dev/null 2>&1



[event:base-record]

sample_type=295

tools/perf/tests/attr/test-record-graph-dwarf

+1 −1
Original line number Diff line number Diff line 
[config]

command = record

args    = -g dwarf -- kill >/dev/null 2>&1

args    = --call-graph dwarf -- kill >/dev/null 2>&1



[event:base-record]

sample_type=12583

tools/perf/tests/attr/test-record-graph-fp

+1 −1
Original line number Diff line number Diff line 
[config]

command = record

args    = -g fp kill >/dev/null 2>&1

args    = --call-graph fp kill >/dev/null 2>&1



[event:base-record]

sample_type=295