linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Fabian Hemmer <copy@copy.sh>
Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf tools: Preserve identifier id in OCaml demangler
Date: Tue, 30 Mar 2021 12:46:40 -0300	[thread overview]
Message-ID: <YGNH4F6tbZVJlUWN@kernel.org> (raw)
In-Reply-To: <20210226075223.p3s5oz4jbxwnqjtv@nyu>

Em Fri, Feb 26, 2021 at 02:52:23AM -0500, Fabian Hemmer escreveu:
> Some OCaml developers reported that this bit of information is sometimes
> useful for disambiguating functions for which the OCaml compiler assigns
> the same name, e.g. nested or inlined functions.

Sorry for the delay in processing, applied.

- Arnaldo
 
> Signed-off-by: Fabian Hemmer <copy@copy.sh>
> ---
>  tools/perf/tests/demangle-ocaml-test.c |  6 +++---
>  tools/perf/util/demangle-ocaml.c       | 12 ------------
>  2 files changed, 3 insertions(+), 15 deletions(-)
> 
> diff --git a/tools/perf/tests/demangle-ocaml-test.c b/tools/perf/tests/demangle-ocaml-test.c
> index a273ed5163d7..1d232c2e2190 100644
> --- a/tools/perf/tests/demangle-ocaml-test.c
> +++ b/tools/perf/tests/demangle-ocaml-test.c
> @@ -19,11 +19,11 @@ int test__demangle_ocaml(struct test *test __maybe_unused, int subtest __maybe_u
>  		{ "main",
>  		  NULL },
>  		{ "camlStdlib__array__map_154",
> -		  "Stdlib.array.map" },
> +		  "Stdlib.array.map_154" },
>  		{ "camlStdlib__anon_fn$5bstdlib$2eml$3a334$2c0$2d$2d54$5d_1453",
> -		  "Stdlib.anon_fn[stdlib.ml:334,0--54]" },
> +		  "Stdlib.anon_fn[stdlib.ml:334,0--54]_1453" },
>  		{ "camlStdlib__bytes__$2b$2b_2205",
> -		  "Stdlib.bytes.++" },
> +		  "Stdlib.bytes.++_2205" },
>  	};
>  
>  	for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) {
> diff --git a/tools/perf/util/demangle-ocaml.c b/tools/perf/util/demangle-ocaml.c
> index 3df14e67c622..9d707bb60b4b 100644
> --- a/tools/perf/util/demangle-ocaml.c
> +++ b/tools/perf/util/demangle-ocaml.c
> @@ -64,17 +64,5 @@ ocaml_demangle_sym(const char *sym)
>  	}
>  	result[j] = '\0';
>  
> -	/* scan backwards to remove an "_" followed by decimal digits */
> -	if (j != 0 && isdigit(result[j - 1])) {
> -		while (--j) {
> -			if (!isdigit(result[j])) {
> -				break;
> -			}
> -		}
> -		if (result[j] == '_') {
> -			result[j] = '\0';
> -		}
> -	}
> -
>  	return result;
>  }
> -- 
> 2.30.1
> 

-- 

- Arnaldo

      reply	other threads:[~2021-03-30 15:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-26  7:52 [PATCH] perf tools: Preserve identifier id in OCaml demangler Fabian Hemmer
2021-03-30 15:46 ` Arnaldo Carvalho de Melo [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YGNH4F6tbZVJlUWN@kernel.org \
    --to=acme@kernel.org \
    --cc=copy@copy.sh \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).