Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1398199

[PATCH 15/15] perf tools: Remove xrealloc and ALLOC_GROW

Show all headers | View raw

From: Masami Hiramatsu <mhiramat@kernel.org>

Remove unused xrealloc() and ALLOC_GROW() from libperf.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160510054801.6158.6204.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/Build     |  1 -
 tools/perf/util/cache.h   | 19 -------------------
 tools/perf/util/util.h    |  6 ------
 tools/perf/util/wrapper.c | 29 -----------------------------
 4 files changed, 55 deletions(-)
 delete mode 100644 tools/perf/util/wrapper.c

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 027bb2b89d7f..8c6c8a0ca642 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -27,7 +27,6 @@ libperf-y += strlist.o
 libperf-y += strfilter.o
 libperf-y += top.o
 libperf-y += usage.o
-libperf-y += wrapper.o
 libperf-y += dso.o
 libperf-y += symbol.o
 libperf-y += symbol_fprintf.o
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 1f5a93c2c9a2..0d814bb74661 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -40,25 +40,6 @@ int split_cmdline(char *cmdline, const char ***argv);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
-/*
- * Realloc the buffer pointed at by variable 'x' so that it can hold
- * at least 'nr' entries; the number of entries currently allocated
- * is 'alloc', using the standard growing factor alloc_nr() macro.
- *
- * DO NOT USE any expression with side-effect for 'x' or 'alloc'.
- */
-#define ALLOC_GROW(x, nr, alloc) \
-	do { \
-		if ((nr) > alloc) { \
-			if (alloc_nr(alloc) < (nr)) \
-				alloc = (nr); \
-			else \
-				alloc = alloc_nr(alloc); \
-			x = xrealloc((x), alloc * sizeof(*(x))); \
-		} \
-	} while(0)
-
-
 static inline int is_absolute_path(const char *path)
 {
 	return path[0] == '/';
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 88f607af1f47..7651633a8dc7 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -160,12 +160,6 @@ static inline char *gitstrchrnul(const char *s, int c)
 }
 #endif
 
-/*
- * Wrappers:
- */
-void *xrealloc(void *ptr, size_t size) __attribute__((weak));
-
-
 static inline void *zalloc(size_t size)
 {
 	return calloc(1, size);
diff --git a/tools/perf/util/wrapper.c b/tools/perf/util/wrapper.c
deleted file mode 100644
index 5f1a07c4b87b..000000000000
--- a/tools/perf/util/wrapper.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Various trivial helper wrappers around standard functions
- */
-#include "cache.h"
-
-/*
- * There's no pack memory to release - but stay close to the Git
- * version so wrap this away:
- */
-static inline void release_pack_memory(size_t size __maybe_unused,
-				       int flag __maybe_unused)
-{
-}
-
-void *xrealloc(void *ptr, size_t size)
-{
-	void *ret = realloc(ptr, size);
-	if (!ret && !size)
-		ret = realloc(ptr, 1);
-	if (!ret) {
-		release_pack_memory(size, -1);
-		ret = realloc(ptr, size);
-		if (!ret && !size)
-			ret = realloc(ptr, 1);
-		if (!ret)
-			die("Out of memory, realloc failed");
-	}
-	return ret;
-}
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 09/15] perf probe: Check the return value of strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 04/15] perf tools: Support reading from backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 15/15] perf tools: Remove xrealloc and ALLOC_GROW Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 03/15] perf script: Fix incorrect python db-export error message Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 11/15] perf tools: Make alias handler to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 14/15] perf help: Do not use ALLOC_GROW in add_cmd_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 07/15] perf symbols: Fix handling of zero-length symbols. Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 12/15] perf header: Make topology checkers to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 05/15] perf tests: Add test to check backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 01/15] perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 06/15] perf evsel: Print state of perf_event_attr.write_backward Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 10/15] perf help: Make check_emacsclient_version to check strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 08/15] perf tools: Rewrite strbuf not to die() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 02/15] perf stat: Scale values by unit before metrics Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 13/15] perf pmu: Make pmu_formats_string to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  Re: [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-05-10 22:30 +0200

csiph-web