Commit 46c1e79f 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 fixes from Ingo Molnar:
 "A handful of tooling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf stat: Wait for the correct child
  perf tools: Support running perf binaries with a dash in their name
  perf config: Check not only section->from_system_config but also item's
  perf ui progress: Fix progress update
  perf ui progress: Make sure we always define step value
  perf tools: Open perf.data with O_CLOEXEC flag
  tools lib api: Fix make DEBUG=1 build
  perf tests: Fix compile when libunwind's unwind.h is available
  tools include linux: Guard against redefinition of some macros
parents ec846ecd b130a699

tools/include/linux/compiler-gcc.h

+6 −3
Original line number Diff line number Diff line
@@ -21,11 +21,14 @@ 
#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))



#define  noinline	__attribute__((noinline))



#ifndef __packed

#define __packed	__attribute__((packed))



#endif

#ifndef __noreturn

#define __noreturn	__attribute__((noreturn))



#endif

#ifndef __aligned

#define __aligned(x)	__attribute__((aligned(x)))

#endif

#define __printf(a, b)	__attribute__((format(printf, a, b)))

#define __scanf(a, b)	__attribute__((format(scanf, a, b)))

tools/lib/api/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -17,13 +17,19 @@ MAKEFLAGS += --no-print-directory 
LIBFILE = $(OUTPUT)libapi.a



CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -fPIC



ifeq ($(DEBUG),0)

ifeq ($(CC_NO_CLANG), 0)

  CFLAGS += -O3

else

  CFLAGS += -O6

endif

endif



ifeq ($(DEBUG),0)

  CFLAGS += -D_FORTIFY_SOURCE

endif



# Treat warnings as errors unless directed not to

ifneq ($(WERROR),0)

tools/perf/builtin-config.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int set_config(struct perf_config_set *set, const char *file_name, 
		fprintf(fp, "[%s]\n", section->name);



		perf_config_items__for_each_entry(&section->items, item) {

			if (!use_system_config && section->from_system_config)

			if (!use_system_config && item->from_system_config)

				continue;

			if (item->value)

				fprintf(fp, "\t%s = %s\n",

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ try_again: 
				process_interval();

			}

		}

		wait(&status);

		waitpid(child_pid, &status, 0);



		if (workload_exec_errno) {

			const char *emsg = str_error_r(workload_exec_errno, msg, sizeof(msg));

tools/perf/perf.c

+10 −4
Original line number Diff line number Diff line
@@ -467,15 +467,21 @@ int main(int argc, const char **argv) 
	 *  - cannot execute it externally (since it would just do

	 *    the same thing over again)

	 *

	 * So we just directly call the internal command handler, and

	 * die if that one cannot handle it.

	 * So we just directly call the internal command handler. If that one

	 * fails to handle this, then maybe we just run a renamed perf binary

	 * that contains a dash in its name. To handle this scenario, we just

	 * fall through and ignore the "xxxx" part of the command string.

	 */

	if (strstarts(cmd, "perf-")) {

		cmd += 5;

		argv[0] = cmd;

		handle_internal_command(argc, argv);

		fprintf(stderr, "cannot handle %s internally", cmd);

		goto out;

		/*

		 * If the command is handled, the above function does not

		 * return undo changes and fall through in such a case.

		 */

		cmd -= 5;

		argv[0] = cmd;

	}

	if (strstarts(cmd, "trace")) {

#ifdef HAVE_LIBAUDIT_SUPPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE