leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/perf: Turn strlcpy() into a __weak function

Browse Source 
The strlcpy() feature check slows every build unnecessarily - so make it
a __weak function so it does not have to be auto-detected.

If the libc (or any other library) has an strlcpy() implementation it will
be used - otherwise our fallback is active.

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-zjbrcupapu08ePsyYhhhxiwk@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2013-10-01 13:26:13 +02:00
parent 7a10822a30
commit fb1c9185e3
6 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/perf/config/Makefile
View File

@@ -121,7 +121,6 @@ FEATURE_TESTS = \
libperl \ libperl \
libpython \ libpython \
libpython-version \ libpython-version \
strlcpy \
libbfd \ libbfd \
on-exit \ on-exit \
backtrace \ backtrace \
@@ -436,12 +435,6 @@ else
endif endif
endif endif
ifndef NO_STRLCPY
ifeq ($(feature-strlcpy), 1)
CFLAGS += -DHAVE_STRLCPY_SUPPORT
endif
endif
ifndef NO_ON_EXIT ifndef NO_ON_EXIT
ifeq ($(feature-on-exit), 1) ifeq ($(feature-on-exit), 1)
CFLAGS += -DHAVE_ON_EXIT_SUPPORT CFLAGS += -DHAVE_ON_EXIT_SUPPORT

4
tools/perf/config/feature-checks/Makefile
View File

@@ -19,7 +19,6 @@ FILES= \
test-libperl \ test-libperl \
test-libpython \ test-libpython \
test-libpython-version \ test-libpython-version \
test-strlcpy \
test-libbfd \ test-libbfd \
test-on-exit \ test-on-exit \
test-backtrace \ test-backtrace \
@@ -116,9 +115,6 @@ test-libpython:
test-libpython-version: test-libpython-version:
$(BUILD) $(FLAGS_PYTHON_EMBED) $(BUILD) $(FLAGS_PYTHON_EMBED)
test-strlcpy:
$(BUILD)
test-libbfd: test-libbfd:
$(BUILD) -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl $(BUILD) -DPACKAGE='perf' -DPACKAGE=perf -lbfd -ldl

8
tools/perf/config/feature-checks/test-strlcpy.c
View File

@@ -1,8 +0,0 @@
#include <stdlib.h>
extern size_t strlcpy(char *dest, const char *src, size_t size);
int main(void)
{
strlcpy(NULL, NULL, 0);
return 0;
}

3
tools/perf/util/cache.h
View File

@@ -70,8 +70,7 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
extern char *perf_pathdup(const char *fmt, ...) extern char *perf_pathdup(const char *fmt, ...)
__attribute__((format (printf, 1, 2))); __attribute__((format (printf, 1, 2)));
#ifndef HAVE_STRLCPY_SUPPORT /* Matches the libc/libbsd function attribute so we declare this unconditionally: */
extern size_t strlcpy(char *dest, const char *src, size_t size); extern size_t strlcpy(char *dest, const char *src, size_t size);
#endif
#endif /* __PERF_CACHE_H */ #endif /* __PERF_CACHE_H */

4
tools/perf/util/include/linux/compiler.h
View File

@@ -23,4 +23,8 @@
# define __force # define __force
#endif #endif
#ifndef __weak
# define __weak __attribute__((weak))
#endif
#endif #endif

10
tools/perf/util/path.c
View File

@@ -22,19 +22,23 @@ static const char *get_perf_dir(void)
return "."; return ".";
} }
#ifndef HAVE_STRLCPY_SUPPORT /*
size_t strlcpy(char *dest, const char *src, size_t size) * If libc has strlcpy() then that version will override this
* implementation:
*/
size_t __weak strlcpy(char *dest, const char *src, size_t size)
{ {
size_t ret = strlen(src); size_t ret = strlen(src);
if (size) { if (size) {
size_t len = (ret >= size) ? size - 1 : ret; size_t len = (ret >= size) ? size - 1 : ret;
memcpy(dest, src, len); memcpy(dest, src, len);
dest[len] = '\0'; dest[len] = '\0';
} }
return ret; return ret;
} }
#endif
static char *get_pathname(void) static char *get_pathname(void)
{ {