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

Commit 4ddd3274 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Adopt memdup() from tools/perf, moving it to tools/lib/string.c 



That will contain more string functions with counterparts, sometimes
verbatim copies, in the kernel.

Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-rah6g97kn21vfgmlramorz6o@git.kernel.org


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

tools/include/linux/string.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_STRING_H_

#define _TOOLS_LINUX_STRING_H_





#include <linux/types.h>	/* for size_t */



void *memdup(const void *src, size_t len);



#endif /* _LINUX_STRING_H_ */

tools/lib/string.c

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#include <stdlib.h>

#include <string.h>

#include <linux/string.h>



/**

 * memdup - duplicate region of memory

 *

 * @src: memory region to duplicate

 * @len: memory region length

 */

void *memdup(const void *src, size_t len)

{

	void *p = malloc(len);



	if (p)

		memcpy(p, src, len);



	return p;

}

tools/perf/MANIFEST

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ tools/lib/api 
tools/lib/bpf

tools/lib/hweight.c

tools/lib/rbtree.c

tools/lib/string.c

tools/lib/symbol/kallsyms.c

tools/lib/symbol/kallsyms.h

tools/lib/util/find_next_bit.c
@@ -50,6 +51,7 @@ tools/include/linux/log2.h 
tools/include/linux/poison.h

tools/include/linux/rbtree.h

tools/include/linux/rbtree_augmented.h

tools/include/linux/string.h

tools/include/linux/types.h

tools/include/linux/err.h

include/asm-generic/bitops/arch_hweight.h

tools/perf/util/Build

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ libperf-y += parse-events.o 
libperf-y += perf_regs.o

libperf-y += path.o

libperf-y += rbtree.o

libperf-y += libstring.o

libperf-y += bitmap.o

libperf-y += hweight.o

libperf-y += run-command.o
@@ -138,6 +139,7 @@ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c 


CFLAGS_find_next_bit.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_rbtree.o        += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_libstring.o     += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_hweight.o       += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_parse-events.o  += -Wno-redundant-decls
@@ -153,6 +155,10 @@ $(OUTPUT)util/rbtree.o: ../lib/rbtree.c FORCE 
	$(call rule_mkdir)

	$(call if_changed_dep,cc_o_c)



$(OUTPUT)util/libstring.o: ../lib/string.c FORCE

	$(call rule_mkdir)

	$(call if_changed_dep,cc_o_c)



$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE

	$(call rule_mkdir)

	$(call if_changed_dep,cc_o_c)

tools/perf/util/include/linux/string.h

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
#include <string.h>



void *memdup(const void *src, size_t len);