Re: [PATCH v1 2/3] perf version: Print the status of compiled-in libraries

[Jin, Yao]

On 3/26/2018 9:51 PM, Jin, Yao wrote:
> On 3/26/2018 5:39 PM, Jiri Olsa wrote:
> > On Tue, Mar 27, 2018 at 12:07:03AM +0800, Jin Yao wrote:
> > > This patch checks the values passed by CFLAGS (-DXXX) and then
> > > print the status of libraries.
> > >
> > > For example, if HAVE_DWARF_SUPPORT is defined, that means the
> > > library "dwarf" is compiled-in. The patch will print the status
> > > "on" for this library.
> > >
> > > Signed-off-by: Jin Yao <yao.jin@xxxxxxxxxxxxxxx>
> > > ---
> > > Â tools/perf/builtin-version.c | 125 
> > > +++++++++++++++++++++++++++++++++++++++++++
> > > Â tools/perf/builtin.hÂÂÂÂÂÂÂÂ |ÂÂ 1 +
> > > Â 2 files changed, 126 insertions(+)
> > >
> > > diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c
> > > index 37019c5..90a0a7f 100644
> > > --- a/tools/perf/builtin-version.c
> > > +++ b/tools/perf/builtin-version.c
> > > @@ -9,3 +9,128 @@ int cmd_version(int argc __maybe_unused, const char 
> > > **argv __maybe_unused)
> > > ÂÂÂÂÂ printf("perf version %s\n", perf_version_string);
> > > ÂÂÂÂÂ return 0;
> > > Â }
> > > +
> > > +static void status_print(const char *name, const char *status)
> > > +{
> > > +ÂÂÂ printf("%22s: [ %3s ]\n", name, status);
> > > +}
> > > +
> > > +static void library_status(void)
> > > +{
> > > +#ifdef HAVE_DWARF_SUPPORT
> > > +ÂÂÂ status_print("dwarf", "on");
> > > +#else
> > > +ÂÂÂ status_print("dwarf", "off");
> > > +#endif
> >
> > could this and all those below be in some generic macro?
> >
> > #define STATUS(__d, __m)ÂÂÂÂÂÂÂ \
> > #ifdef __dÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ \
> > ÂÂÂÂstatus_print(#__m, "on");ÂÂÂ \
> > #elseÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ \
> > ÂÂÂÂstatus_print(#__m, "OFF");ÂÂÂ \
> > #endif
> >
> > STATUS(HAVE_DWARF_SUPPORT, dwarf)
> >
> >
> > also please print the 'OFF' and use colors as in the build message
>
> Fine, thanks. I will update the code.
>
> > > +
> > > +#ifdef HAVE_DWARF_GETLOCATIONS
> > > +ÂÂÂ status_print("dwarf_getlocations", "on");
> > > +#else
> > > +ÂÂÂ status_print("dwarf_getlocations", "off");
> > > +#endif
> > > +
> > > +#ifdef NO_GLIBC
> > > +ÂÂÂ status_print("glibc", "off");
> > > +#else
> > > +ÂÂÂ status_print("glibc", "on");
> > > +#endif
> > > +
> > > +#ifdef HAVE_GTK2_SUPPORT
> > > +ÂÂÂ status_print("gtk2", "on");
> > > +#else
> > > +ÂÂÂ status_print("gtk2", "off");
> > > +#endif
> > > +
> >
> > SNIP
> >
> > > +}
> > > +
> > > +int cmd_version2(int argc, const char **argv)
> > > +{
> > > +ÂÂÂ cmd_version(argc, argv);
> > > +ÂÂÂ library_status();
> > > +ÂÂÂ return 0;
> > > +}
> > > diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h
> > > index 05745f3..c7508ee 100644
> > > --- a/tools/perf/builtin.h
> > > +++ b/tools/perf/builtin.h
> > > @@ -29,6 +29,7 @@ int cmd_timechart(int argc, const char **argv);
> > > Â int cmd_top(int argc, const char **argv);
> > > Â int cmd_script(int argc, const char **argv);
> > > Â int cmd_version(int argc, const char **argv);
> > > +int cmd_version2(int argc, const char **argv);
> >
> > please don't add new command for this, handle this in cmd_version
>
> Yeah, I know that, adding a new command is not a good idea.
>
> But how can I pass a new parameter to cmd_version to indicate it's the 
> -vv case? Use argv[1]? But looks not good since argc is 1.
>
> Any idea about that?
>
> Thanks
> Jin Yao

Hi Jiri,

Maybe could we just add the information to 'perf -v'? I mean we don't 
need the 'perf -vv', directly add the information to 'perf -v'. Is it OK?

Thanks
Jin Yao

> > thanks,
> > jirka