svn commit: r247962 - head/cddl/contrib/opensolaris/tools/ctf/cvt

[Jim Harris]

On Mon, Apr 1, 2013 at 11:04 AM, Dimitry Andric <dim at freebsd.org> wrote:

> On Apr 1, 2013, at 08:07, Andriy Gapon <avg at freebsd.org> wrote:
> > on 08/03/2013 00:43 Dimitry Andric said the following:
> >> Author: dim
> >> Date: Thu Mar  7 22:43:50 2013
> >> New Revision: 247962
> >> URL: http://svnweb.freebsd.org/changeset/base/247962
> >>
> >> Log:
> >>  Fix error in r247960: actually assign the basename to match.iim_file.
> >
> > I've got some bad news.
> >
> > First of all, sorry for not being thorough enough when this change was
> > originally proposed.  I rebuilt only ctfconvert with the patch, but
> ctfmerge was
> > left alone.
> >
> > It seems that r247960 + r247962 (this commit) broke ctfmerge in my
> environment
> > (head + clang).  While .o files have expected ctf information, combined
> files
> > miss ctf data for functions.
> Do you have a good test case?  I tried building a few kernel modules,
> but I do see ctf data for functions, at least in ctfdump output.
>
> Also, a simple test case with a pair of .o files, each containing a
> function, seems to work properly when processed with ctfmerge.
>
> > I haven't dug yet into this problem, but I suspect that there is some
> mismatch
> > at another place (or even multiple places) where STT_FILE is used.
>
> The only other place is cddl/contrib/opensolaris/tools/ctf/cvt/input.c,
> so I more or less blindly made the attached diff, which might solve the
> problem.  Can you please try it in your environment?
>
>
I'm not sure if this is the same problem seen by avg@, but without your
patch, I was getting lots of the following when doing "dtrace -lv":

fbt_getargdesc(1309): Unknown function!

Your patch fixes this issue for me.

Thanks,

-Jim