perf-tool: Move last fs* bits
cover perf-tool: Move last fs* bits
From: Borislav Petkov <[email protected]>
One dangling patch fs* patch and two headers, one going to /dev/null even.
Please apply.
Borislav Petkov (3):
perf: Move fs.* to lib/api/fs/
perf: Move hash.h header
perf: Drop prefetch.h
tools/include/linux/hash.h | 5 +++++
tools/lib/api/Makefile | 2 ++
tools/{perf/util => lib/api/fs}/fs.c | 11 ++++++++---
tools/{perf/util/include/linux/magic.h => lib/api/fs/fs.h} | 12 +++++-------
tools/perf/MANIFEST | 2 +-
tools/perf/Makefile.perf | 6 +-----
tools/perf/tests/parse-events.c | 2 +-
tools/perf/util/cpumap.c | 2 +-
tools/perf/util/fs.h | 7 -------
tools/perf/util/include/linux/hash.h | 5 -----
tools/perf/util/include/linux/list.h | 1 -
tools/perf/util/include/linux/prefetch.h | 6 ------
tools/perf/util/pmu.c | 2 +-
tools/perf/util/python-ext-sources | 2 +-
tools/perf/util/record.c | 2 +-
tools/perf/util/util.c | 2 +-
16 files changed, 28 insertions(+), 41 deletions(-)
create mode 100644 tools/include/linux/hash.h
rename tools/{perf/util => lib/api/fs}/fs.c (91%)
rename tools/{perf/util/include/linux/magic.h => lib/api/fs/fs.h} (50%)
delete mode 100644 tools/perf/util/fs.h
delete mode 100644 tools/perf/util/include/linux/hash.h
delete mode 100644 tools/perf/util/include/linux/prefetch.hSignature · 1 line
1.8.5.2.192.g7794a68
PATCH 1/3 perf: Move fs.* to lib/api/fs/
From: Borislav Petkov <[email protected]>
Move to generic library and kill magic.h as it is needed only in fs.h.
---
tools/lib/api/Makefile | 2 ++
tools/{perf/util => lib/api/fs}/fs.c | 11 ++++++++---
tools/{perf/util/include/linux/magic.h => lib/api/fs/fs.h} | 12 +++++-------
tools/perf/Makefile.perf | 3 ---
tools/perf/tests/parse-events.c | 2 +-
tools/perf/util/cpumap.c | 2 +-
tools/perf/util/fs.h | 7 -------
tools/perf/util/pmu.c | 2 +-
tools/perf/util/python-ext-sources | 2 +-
tools/perf/util/record.c | 2 +-
tools/perf/util/util.c | 2 +-
11 files changed, 21 insertions(+), 26 deletions(-)
rename tools/{perf/util => lib/api/fs}/fs.c (91%)
rename tools/{perf/util/include/linux/magic.h => lib/api/fs/fs.h} (50%)
delete mode 100644 tools/perf/util/fs.htools/lib/api/Makefile +2 -0
@@ -9,8 +9,10 @@ LIB_H= LIB_OBJS= LIB_H += fs/debugfs.h +LIB_H += fs/fs.h LIB_OBJS += $(OUTPUT)fs/debugfs.o +LIB_OBJS += $(OUTPUT)fs/fs.o LIBFILE = libapikfs.a
tools/lib/api/fs/fs.c renamed from tools/perf/util/fs.c +8 -3
@@ -1,8 +1,13 @@ +/* TODO merge/factor in debugfs.c here */ -/* TODO merge/factor into tools/lib/lk/debugfs.c */ +#include <errno.h> +#include <stdbool.h> +#include <stdio.h> +#include <string.h> +#include <sys/vfs.h> -#include "util.h" -#include "util/fs.h" +#include "debugfs.h" +#include "fs.h" static const char *const sysfs__fs_known_mountpoints[] = {"/sys" ,
tools/lib/api/fs/fs.h renamed from tools/perf/util/include/linux/magic.h +5 -7
@@ -1,9 +1,5 @@ -#ifndef _PERF_LINUX_MAGIC_H_ -#define _PERF_LINUX_MAGIC_H_ - -#ifndef DEBUGFS_MAGIC -#define DEBUGFS_MAGIC 0x64626720 -#endif +#ifndef __API_FS__ +#define __API_FS__#ifndef SYSFS_MAGIC #define SYSFS_MAGIC 0x62656572
@@ -13,4 +9,6 @@#define PROC_SUPER_MAGIC 0x9fa0#endif -#endif +const char *sysfs__mountpoint (void ); +const char *procfs__mountpoint (void ); +#endif /* __API_FS__ */
tools/perf/Makefile.perf +0 -3
@@ -218,7 +218,6 @@ LIB_H += util/include/linux/ctype.h LIB_H += util/include/linux/kernel.h LIB_H += util/include/linux/list.h LIB_H += util/include/linux/export.h -LIB_H += util/include/linux/magic.h LIB_H += util/include/linux/poison.h LIB_H += util/include/linux/prefetch.h LIB_H += util/include/linux/rbtree.h
@@ -244,7 +243,6 @@ LIB_H += util/cache.h LIB_H += util/callchain.h LIB_H += util/build-id.h LIB_H += util/debug.h -LIB_H += util/fs.h LIB_H += util/pmu.h LIB_H += util/event.h LIB_H += util/evsel.h
@@ -306,7 +304,6 @@ LIB_OBJS += $(OUTPUT)util/annotate.o LIB_OBJS += $(OUTPUT)util/build-id.o LIB_OBJS += $(OUTPUT)util/config.o LIB_OBJS += $(OUTPUT)util/ctype.o -LIB_OBJS += $(OUTPUT)util/fs.o LIB_OBJS += $(OUTPUT)util/pmu.o LIB_OBJS += $(OUTPUT)util/environment.o LIB_OBJS += $(OUTPUT)util/event.o
tools/perf/tests/parse-events.c +1 -1
@@ -2,7 +2,7 @@#include "parse-events.h" #include "evsel.h" #include "evlist.h" -#include "fs.h" +#include <api/fs/fs.h> #include <api/fs/debugfs.h> #include "tests.h" #include <linux/hw_breakpoint.h>
tools/perf/util/cpumap.c +1 -1
@@ -1,5 +1,5 @@#include "util.h" -#include "fs.h" +#include <api/fs/fs.h> #include "../perf.h" #include "cpumap.h" #include <assert.h>
tools/perf/util/fs.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef __PERF_FS -#define __PERF_FS - -const char *sysfs__mountpoint (void ); -const char *procfs__mountpoint (void ); - -#endif /* __PERF_FS */
tools/perf/util/pmu.c +1 -1
@@ -3,7 +3,7 @@#include <unistd.h> #include <stdio.h> #include <dirent.h> -#include "fs.h" +#include <api/fs/fs.h> #include <locale.h> #include "util.h" #include "pmu.h"
tools/perf/util/python-ext-sources +1 -1
@@ -17,6 +17,6 @@ util/xyarray.c util/cgroup.c util/rblist.c util/strlist.c -util/fs.c +../lib/api/fs/fs.c util/trace-event.c ../../lib/rbtree.c
tools/perf/util/record.c +1 -1
@@ -2,7 +2,7 @@#include "evsel.h" #include "cpumap.h" #include "parse-events.h" -#include "fs.h" +#include <api/fs/fs.h> #include "util.h" typedef void (*setup_probe_fn_t )(struct perf_evsel *evsel);
tools/perf/util/util.c +1 -1
@@ -1,6 +1,6 @@#include "../perf.h" #include "util.h" -#include "fs.h" +#include <api/fs/fs.h> #include <sys/mman.h> #ifdef HAVE_BACKTRACE_SUPPORT #include <execinfo.h>
Signature · 1 line
1.8.5.2.192.g7794a68
PATCH 2/3 perf: Move hash.h header
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Put it into tools/include/ for general usage.
--- tools/include/linux/hash.h | 5 +++++ tools/perf/MANIFEST | 2 +- tools/perf/Makefile.perf | 2 +- tools/perf/util/include/linux/hash.h | 5 ----- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 tools/include/linux/hash.h delete mode 100644 tools/perf/util/include/linux/hash.h
tools/include/linux/hash.h new file +5 -0
@@ -0,0 +1,5 @@ +#include "../../../include/linux/hash.h" + +#ifndef _TOOLS_LINUX_HASH_H +#define _TOOLS_LINUX_HASH_H +#endif
tools/perf/MANIFEST +1 -1
@@ -6,11 +6,11 @@ tools/lib/symbol/kallsyms.c tools/lib/symbol/kallsyms.h tools/include/asm/bug.h tools/include/linux/compiler.h +tools/include/linux/hash.h include/linux/const.h include/linux/perf_event.h include/linux/rbtree.h include/linux/list.h -include/linux/hash.h include/linux/stringify.h lib/rbtree.c include/linux/swab.h
tools/perf/Makefile.perf +1 -1
@@ -208,7 +208,7 @@ LIB_H += ../../include/uapi/linux/perf_event.h LIB_H += ../../include/linux/rbtree.h LIB_H += ../../include/linux/list.h LIB_H += ../../include/uapi/linux/const.h -LIB_H += ../../include/linux/hash.h +LIB_H += ../include/linux/hash.h LIB_H += ../../include/linux/stringify.h LIB_H += util/include/linux/bitmap.h LIB_H += util/include/linux/bitops.h
tools/perf/util/include/linux/hash.h deleted +0 -5
@@ -1,5 +0,0 @@ -#include "../../../../include/linux/hash.h" - -#ifndef PERF_HASH_H -#define PERF_HASH_H -#endif
Signature · 1 line
1.8.5.2.192.g7794a68
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf tools: Move hash.h header
perf tools: Move hash.h header
Commit-ID: 0e55fa1131dcacfc8f18fabecc93643a105bdc14 Gitweb: http://git.kernel.org/tip/0e55fa1131dcacfc8f18fabecc93643a105bdc14 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 5 Feb 2014 15:51:53 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 18 Feb 2014 09:34:49 -0300
perf tools: Move hash.h header
Put it into tools/include/ for general usage.
--- tools/include/linux/hash.h | 5 +++++ tools/perf/MANIFEST | 1 + tools/perf/Makefile.perf | 2 +- tools/perf/util/include/linux/hash.h | 5 ----- 4 files changed, 7 insertions(+), 6 deletions(-)
tools/include/linux/hash.h new file +5 -0
@@ -0,0 +1,5 @@ +#include "../../../include/linux/hash.h" + +#ifndef _TOOLS_LINUX_HASH_H +#define _TOOLS_LINUX_HASH_H +#endif
tools/perf/MANIFEST +1 -0
@@ -6,6 +6,7 @@ tools/lib/symbol/kallsyms.c tools/lib/symbol/kallsyms.h tools/include/asm/bug.h tools/include/linux/compiler.h +tools/include/linux/hash.h include/linux/const.h include/linux/perf_event.h include/linux/rbtree.h
tools/perf/Makefile.perf +1 -1
@@ -208,7 +208,7 @@ LIB_H += ../../include/uapi/linux/perf_event.h LIB_H += ../../include/linux/rbtree.h LIB_H += ../../include/linux/list.h LIB_H += ../../include/uapi/linux/const.h -LIB_H += ../../include/linux/hash.h +LIB_H += ../include/linux/hash.h LIB_H += ../../include/linux/stringify.h LIB_H += util/include/linux/bitmap.h LIB_H += util/include/linux/bitops.h
tools/perf/util/include/linux/hash.h deleted +0 -5
@@ -1,5 +0,0 @@ -#include "../../../../include/linux/hash.h" - -#ifndef PERF_HASH_H -#define PERF_HASH_H -#endif
PATCH 3/3 perf: Drop prefetch.h
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
This was needed at the time before e66eed651fd1 ("list: remove prefetching from regular list iterators") where the list iterators did prefetch elements. This turned out to be counter-productive and hurt performance and they were removed. Which makes the prefetch.h header unused so drop it.
--- tools/perf/Makefile.perf | 1 - tools/perf/util/include/linux/list.h | 1 - tools/perf/util/include/linux/prefetch.h | 6 ------ 3 files changed, 8 deletions(-) delete mode 100644 tools/perf/util/include/linux/prefetch.h
tools/perf/Makefile.perf +0 -1
@@ -219,7 +219,6 @@ LIB_H += util/include/linux/kernel.h LIB_H += util/include/linux/list.h LIB_H += util/include/linux/export.h LIB_H += util/include/linux/poison.h -LIB_H += util/include/linux/prefetch.h LIB_H += util/include/linux/rbtree.h LIB_H += util/include/linux/rbtree_augmented.h LIB_H += util/include/linux/string.h
tools/perf/util/include/linux/list.h +0 -1
@@ -1,5 +1,4 @@#include <linux/kernel.h> -#include <linux/prefetch.h> #include "../../../../include/linux/list.h"
tools/perf/util/include/linux/prefetch.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef PERF_LINUX_PREFETCH_H -#define PERF_LINUX_PREFETCH_H - -static inline void prefetch (void *a __attribute__((unused))) { } - -#endif
Signature · 1 line
1.8.5.2.192.g7794a68
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf tools: Drop prefetch.h
perf tools: Drop prefetch.h
Commit-ID: 5072f2733afe26c354aa9d277cb1544e4b0b3846 Gitweb: http://git.kernel.org/tip/5072f2733afe26c354aa9d277cb1544e4b0b3846 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 5 Feb 2014 15:51:54 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 18 Feb 2014 09:34:49 -0300
perf tools: Drop prefetch.h
This was needed at the time before e66eed651fd1 ("list: remove prefetching from regular list iterators") where the list iterators did prefetch elements. This turned out to be counter-productive and hurt performance and they were removed. Which makes the prefetch.h header unused so drop it.
--- tools/perf/Makefile.perf | 1 - tools/perf/util/include/linux/list.h | 1 - tools/perf/util/include/linux/prefetch.h | 6 ------ 3 files changed, 8 deletions(-)
tools/perf/Makefile.perf +0 -1
@@ -219,7 +219,6 @@ LIB_H += util/include/linux/kernel.h LIB_H += util/include/linux/list.h LIB_H += util/include/linux/export.h LIB_H += util/include/linux/poison.h -LIB_H += util/include/linux/prefetch.h LIB_H += util/include/linux/rbtree.h LIB_H += util/include/linux/rbtree_augmented.h LIB_H += util/include/linux/string.h
tools/perf/util/include/linux/list.h +0 -1
@@ -1,5 +1,4 @@#include <linux/kernel.h> -#include <linux/prefetch.h> #include "../../../../include/linux/list.h"
tools/perf/util/include/linux/prefetch.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef PERF_LINUX_PREFETCH_H -#define PERF_LINUX_PREFETCH_H - -static inline void prefetch (void *a __attribute__((unused))) { } - -#endif