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

Groups > linux.kernel > #1621724

[PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options

Show all headers | View raw

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Trying to keep everything reentrant.

Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-rdce0p2k9e1b4qnrb8ki9mtf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/callchain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 3cea1fb5404b..2e5eff5abef0 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -116,7 +116,7 @@ static int
 __parse_callchain_report_opt(const char *arg, bool allow_record_opt)
 {
 	char *tok;
-	char *endptr;
+	char *endptr, *saveptr = NULL;
 	bool minpcnt_set = false;
 	bool record_opt_set = false;
 	bool try_stack_size = false;
@@ -127,7 +127,7 @@ __parse_callchain_report_opt(const char *arg, bool allow_record_opt)
 	if (!arg)
 		return 0;
 
-	while ((tok = strtok((char *)arg, ",")) != NULL) {
+	while ((tok = strtok_r((char *)arg, ",", &saveptr)) != NULL) {
 		if (!strncmp(tok, "none", strlen(tok))) {
 			callchain_param.mode = CHAIN_NONE;
 			callchain_param.enabled = false;
-- 
2.9.3

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

Thread

[GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 09/18] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 03/18] perf evsel: Return exact sub event which failed with EPERM for wildcards Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 14/18] perf annotate: Process attr and build_id records Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 16/18] perf tools: Do not print missing features in pipe-mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 07/18] perf tools: Refactor the code to strip command name with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 12/18] perf inject: Copy events when reordering events in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 08/18] perf string: Simplify ltrim() implementation Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 17/18] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 10/18] perf annotate s390: Implement jump types for perf annotate Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 06/18] perf pmu: Refactor wordwrap() with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 13/18] perf tools: Describe pipe mode in perf.data-file-fomat.txt Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 15/18] perf session: Don't rely on evlist in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 05/18] perf ui browser: Refactor the code to parse color configs with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 02/18] perf script: Use strtok_r() when parsing output field list Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 07:40 +0200
    Re: [GIT PULL 00/18] perf/core improvements and fixes Christian Borntraeger <borntraeger@de.ibm.com> - 2017-04-12 09:20 +0200
      Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 09:30 +0200

csiph-web