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

Commit aa0a3247 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf tool fixes from Ingo Molnar:
 "Misc tooling fixes: python3 related fixes, gcc8 fix, bashism fixes and
  some other smaller fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Use python-config --includes rather than --cflags
  perf script python: Fix dict reference counting
  perf stat: Fix --interval_clear option
  perf tools: Fix compilation errors on gcc8
  perf test shell: Prevent temporary editor files from being considered test scripts
  perf llvm-utils: Remove bashism from kernel include fetch script
  perf test shell: Make perf's inet_pton test more portable
  perf test shell: Replace '|&' with '2>&1 |' to work with more shells
  perf scripts python: Add Python 3 support to EventClass.py
  perf scripts python: Add Python 3 support to sched-migration.py
  perf scripts python: Add Python 3 support to Util.py
  perf scripts python: Add Python 3 support to SchedGui.py
  perf scripts python: Add Python 3 support to Core.py
  perf tools: Generate a Python script compatible with Python 2 and 3
parents 75adbd13 6e1d33b2

tools/perf/Makefile.config

+1 −2
Original line number Diff line number Diff line
@@ -207,8 +207,7 @@ ifdef PYTHON_CONFIG 
  PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)

  PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))

  PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil

  PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)

  PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))

  PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --includes 2>/dev/null)

  FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)

endif

tools/perf/arch/x86/util/perf_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int arch_sdt_arg_parse_op(char *old_op, char **new_op) 
		else if (rm[2].rm_so != rm[2].rm_eo)

			prefix[0] = '+';

		else

			strncpy(prefix, "+0", 2);

			scnprintf(prefix, sizeof(prefix), "+0");

	}



	/* Rename register */

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ static void print_interval(char *prefix, struct timespec *ts) 
		}

	}



	if ((num_print_interval == 0 && metric_only) || interval_clear)

	if ((num_print_interval == 0 || interval_clear) && metric_only)

		print_metric_headers(" ", true);

	if (++num_print_interval == 25)

		num_print_interval = 0;

tools/perf/jvmti/jvmti_agent.c

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <sys/mman.h>

#include <syscall.h> /* for gettid() */

#include <err.h>

#include <linux/kernel.h>



#include "jvmti_agent.h"

#include "../util/jitdump.h"
@@ -249,7 +250,7 @@ void *jvmti_open(void) 
	/*

	 * jitdump file name

	 */

	snprintf(dump_path, PATH_MAX, "%s/jit-%i.dump", jit_path, getpid());

	scnprintf(dump_path, PATH_MAX, "%s/jit-%i.dump", jit_path, getpid());



	fd = open(dump_path, O_CREAT|O_TRUNC|O_RDWR, 0666);

	if (fd == -1)

tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py

+17 −23
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ def flag_str(event_name, field_name, value): 


    if flag_fields[event_name][field_name]:

        print_delim = 0

        keys = flag_fields[event_name][field_name]['values'].keys()

        keys.sort()

        for idx in keys:

        for idx in sorted(flag_fields[event_name][field_name]['values']):

            if not value and not idx:

                string += flag_fields[event_name][field_name]['values'][idx]

                break
@@ -51,9 +49,7 @@ def symbol_str(event_name, field_name, value): 
    string = ""



    if symbolic_fields[event_name][field_name]:

        keys = symbolic_fields[event_name][field_name]['values'].keys()

        keys.sort()

        for idx in keys:

        for idx in sorted(symbolic_fields[event_name][field_name]['values']):

            if not value and not idx:

                string = symbolic_fields[event_name][field_name]['values'][idx]

                break
@@ -74,9 +70,7 @@ def trace_flag_str(value): 
    string = ""

    print_delim = 0



    keys = trace_flags.keys()



    for idx in keys:

    for idx in trace_flags:

        if not value and not idx:

            string += "NONE"

            break