Commit 22e9af4e authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT 



To be consistent with other HAVE_XXX_SUPPORT uses in Makefile.config,
this patch renames HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT and
updates the C code accordingly.

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1523269609-28824-3-git-send-email-yao.jin@linux.intel.com


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

tools/perf/Makefile.config

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ ifeq ($(NO_PERF_REGS),0) 
endif

endif





ifneq ($(NO_SYSCALL_TABLE),1)

ifneq ($(NO_SYSCALL_TABLE),1)

  CFLAGS += -DHAVE_SYSCALL_TABLE

  CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT

endif

endif





# So far there's only x86 and arm libdw unwind support merged in perf.

# So far there's only x86 and arm libdw unwind support merged in perf.

tools/perf/builtin-help.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -439,7 +439,7 @@ int cmd_help(int argc, const char **argv) 
#ifdef HAVE_LIBELF_SUPPORT

#ifdef HAVE_LIBELF_SUPPORT

		"probe",

		"probe",

#endif

#endif

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)

		"trace",

		"trace",

#endif

#endif

	NULL };

	NULL };

tools/perf/perf.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ static struct cmd_struct commands[] = { 
	{ "lock",	cmd_lock,	0 },

	{ "lock",	cmd_lock,	0 },

	{ "kvm",	cmd_kvm,	0 },

	{ "kvm",	cmd_kvm,	0 },

	{ "test",	cmd_test,	0 },

	{ "test",	cmd_test,	0 },

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)

	{ "trace",	cmd_trace,	0 },

	{ "trace",	cmd_trace,	0 },

#endif

#endif

	{ "inject",	cmd_inject,	0 },

	{ "inject",	cmd_inject,	0 },
@@ -491,7 +491,7 @@ int main(int argc, const char **argv) 
		argv[0] = cmd;

		argv[0] = cmd;

	}

	}

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

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

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)

#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)

		setup_path();

		setup_path();

		argv[0] = "trace";

		argv[0] = "trace";

		return cmd_trace(argc, argv);

		return cmd_trace(argc, argv);

tools/perf/util/generate-cmdlist.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ do 
done

done

echo "#endif /* HAVE_LIBELF_SUPPORT */"

echo "#endif /* HAVE_LIBELF_SUPPORT */"





echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)"

echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)"

sed -n -e 's/^perf-\([^ 	]*\)[ 	].* audit*/\1/p' command-list.txt |

sed -n -e 's/^perf-\([^ 	]*\)[ 	].* audit*/\1/p' command-list.txt |

sort |

sort |

while read cmd

while read cmd

tools/perf/util/syscalltbl.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <linux/compiler.h>

#include <linux/compiler.h>





#ifdef HAVE_SYSCALL_TABLE

#ifdef HAVE_SYSCALL_TABLE_SUPPORT

#include <string.h>

#include <string.h>

#include "string2.h"

#include "string2.h"

#include "util.h"

#include "util.h"
@@ -139,7 +139,7 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g 
	return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);

	return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);

}

}





#else /* HAVE_SYSCALL_TABLE */

#else /* HAVE_SYSCALL_TABLE_SUPPORT */





#include <libaudit.h>

#include <libaudit.h>
@@ -176,4 +176,4 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g 
{

{

	return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);

	return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);

}

}

#endif /* HAVE_SYSCALL_TABLE */
 
#endif /* HAVE_SYSCALL_TABLE_SUPPORT */

CRA Git | Maintained and supported by SUSTech CRA and CCSE