Re: [PATCH v6 2/4] perf tools: add Java demangling support

[Pekka Enberg <penberg@kernel.org>]

Hi Stephane,

On Tue, Mar 31, 2015 at 1:19 AM, Stephane Eranian <eranian@google.com> wrote:
> +#define BASE_ENT(c, n) [c-'A']=n
> +static const char *base_types['Z'-'A' + 1]={
> +       BASE_ENT('B', "byte" ),
> +       BASE_ENT('C', "char" ),
> +       BASE_ENT('D', "double" ),
> +       BASE_ENT('F', "float" ),
> +       BASE_ENT('I', "int" ),
> +       BASE_ENT('J', "long" ),
> +       BASE_ENT('S', "short" ),
> +       BASE_ENT('Z', "bool" ),

It's "boolean", not "bool" in JVM speak.

> +static char *
> +__demangle_java_sym(const char *str, const char *end, char *buf, int maxlen, int mode)
> +{
> +       int rlen = 0;
> +       int array = 0;
> +       int narg = 0;
> +       const char *q;
> +
> +       if (!end)
> +               end = str + strlen(str);
> +
> +       for (q = str; q != end; q++) {
> +
> +               if (rlen == (maxlen - 1))
> +                       break;
> +
> +               switch (*q) {
> +               case 'L':
> +                       if (mode == MODE_PREFIX || mode == MODE_CTYPE) {
> +                               if (mode == MODE_CTYPE) {
> +                                       if (narg)
> +                                               rlen += scnprintf(buf + rlen, maxlen - rlen, ", ");
> +                                       narg++;
> +                               }
> +                               rlen += scnprintf(buf + rlen, maxlen - rlen, "class ");
> +                               if (mode == MODE_PREFIX)
> +                                       mode = MODE_CLASS;
> +                       } else
> +                               buf[rlen++] = *q;
> +                       break;

This looks odd to me. "L" marks the beginning of an class name and
it's terminated by ";". You could just strhchr() the terminator and
simply copy the name to "buf" and drop cases ';', '/', and the default
label fro the switch statement.

> +char *
> +java_demangle_sym(const char *str, int flags)
> +{

[snip]

> +       /*
> +        * expansion factor estimated to 3x
> +        */
> +       len = strlen(str) * 3 + 1;
> +       buf = malloc(len);
> +       if (!buf)
> +               return NULL;

Truncated symbols are lame. Can't you use realloc() to ensure that
never happens?

- Pekka