Re: [Xen-devel] [PATCH v3 1/8] xenalyze: add to tools/xentrace/

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, May 22, 2015 at 08:19:32AM +0000, Olaf Hering wrote:
> This merges xenalyze.hg, changeset 150:24308507be1d,
> into tools/xentrace/xenalyze.c to have the tool and
> public/trace.h in one place.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  .gitignore                |     1 +
>  tools/xentrace/Makefile   |     9 +-
>  tools/xentrace/analyze.h  |   107 +
>  tools/xentrace/mread.c    |   160 +
>  tools/xentrace/mread.h    |    18 +
>  tools/xentrace/pv.h       |    41 +
>  tools/xentrace/xenalyze.c | 10407 
> ++++++++++++++++++++++++++++++++++++++++++++
>  7 files changed, 10742 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 3bc9cd9..3f42ded 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -173,6 +173,7 @@ tools/misc/gtracestat
>  tools/misc/xenlockprof
>  tools/misc/lowmemd
>  tools/misc/xencov
> +tools/xentrace/xenalyze
>  tools/pygrub/build/*
>  tools/python/build/*
>  tools/security/secpol_tool
> diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
> index 8b80541..57691af 100644
> --- a/tools/xentrace/Makefile
> +++ b/tools/xentrace/Makefile
> @@ -7,6 +7,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
>  LDLIBS += $(LDLIBS_libxenctrl)
>  
>  BIN      = xentrace xentrace_setsize
> +SBIN     = xenalyze

Why is xenalyze not placed in the same directory as xentrace? My
impression is that they are closely related. What did I miss?

And given that xenalyze only analyse the log it shouldn't require
privilege to run so it should be placed in BIN?

>  LIBBIN   = xenctx
>  SCRIPTS  = xentrace_format
>  MAN1     = $(wildcard *.1)
> @@ -16,15 +17,17 @@ MAN8     = $(wildcard *.8)
>  all: build
>  
>  .PHONY: build
> -build: $(BIN) $(LIBBIN)
> +build: $(BIN) $(SBIN) $(LIBBIN)
>  
>  .PHONY: install
>  install: build
>       $(INSTALL_DIR) $(DESTDIR)$(bindir)
> +     $(INSTALL_DIR) $(DESTDIR)$(sbindir)
>       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
>       $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
>       $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
>       $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir)
> +     $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir)
>       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
>       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
>       $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)

And of course if it is placed under BIN you won't need the above hunk
anymore.

Wei.

> @@ -46,5 +49,9 @@ xenctx: xenctx.o
>  xentrace_setsize: setsize.o
>       $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS)
>  
> +xenalyze.o: CFLAGS += -I$(XEN_ROOT)/xen/include
> +xenalyze: xenalyze.o mread.o
> +     $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS)
> +
>  -include $(DEPS)
>  

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel