[v3,30/38] tools: split libxenstat into new tools/libs/stat directory

Message ID	20200823093519.18386-31-jgross@suse.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=cIP9=CB=lists.xenproject.org=xen-devel-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3AC342074D From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xenproject.org Cc: Juergen Gross <jgross@suse.com>, Andrew Cooper <andrew.cooper3@citrix.com>, George Dunlap <george.dunlap@citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Jan Beulich <jbeulich@suse.com>, Julien Grall <julien@xen.org>, Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org> Subject: [PATCH v3 30/38] tools: split libxenstat into new tools/libs/stat directory Date: Sun, 23 Aug 2020 11:35:11 +0200 Message-Id: <20200823093519.18386-31-jgross@suse.com> In-Reply-To: <20200823093519.18386-1-jgross@suse.com> References: <20200823093519.18386-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
Series	tools: move most libraries into tools/libs \| expand [v3,00/38] tools: move most libraries into tools/libs [v3,01/38] stubdom: add stubdom/mini-os.mk for Xen paths used by Mini-OS [v3,02/38] tools: switch XEN_LIBXEN* make variables to lower case (XEN_libxen) [v3,03/38] tools: add a copy of library headers in tools/include [v3,04/38] tools: don't call make recursively from libs.mk [v3,05/38] tools: define ROUNDUP() in tools/include/xen-tools/libs.h [v3,06/38] tools: generate most contents of library make variables [v3,07/38] stubdom: add correct dependencies for Xen libraries [v3,08/38] stubdom: simplify building xen libraries for stubdoms [v3,09/38] tools: drop explicit path specifications for qemu build [v3,10/38] tools: tweak tools/libs/libs.mk for being able to support libxenctrl [v3,11/38] tools/python: drop libxenguest from setup.py [v3,12/38] tools: fix pkg-config file for libxenguest [v3,13/38] tools: don't assume libxenguest and libxenctrl to be in same directory [v3,14/38] tools/misc: don't use libxenctrl internals from xen-hptool [v3,15/38] tools/misc: don't include xg_save_restore.h from xen-mfndump.c [v3,16/38] tools/misc: replace PAGE_SIZE with XC_PAGE_SIZE in xen-mfndump.c [v3,17/38] tools/misc: drop all libxc internals from xen-mfndump.c [v3,18/38] tools/libxc: remove unused headers xc_efi.h and xc_elf.h [v3,19/38] tools/libxc: move xc_[un]map_domain_meminfo() into new source xg_domain.c [v3,20/38] tools/libxc: rename all libxenguest sources to xg_ [v3,21/38] tools/libxc: rename libxenguest internal headers [v3,22/38] tools/misc: rename xc_dom.h do xenctrl_dom.h [v3,23/38] tools/libxc: untangle libxenctrl from libxenguest [v3,24/38] tools/xcutils: use official headers in readnotes [v3,25/38] tools/xenpaging: remove libxc internals [v3,26/38] tools: move libxenctrl below tools/libs [v3,27/38] tools/libxc: move libxenguest to tools/libs/guest [v3,28/38] tools: split libxenstore into new tools/libs/store directory [v3,29/38] tools: split libxenvchan into new tools/libs/vchan directory [v3,30/38] tools: split libxenstat into new tools/libs/stat directory [v3,31/38] tools/libxl: fix dependencies of libxl tests [v3,32/38] tools/libxl: don't include libxl_osdeps.h from libxlutil sources [v3,33/38] tools/libxl: add missing items to clean target [v3,34/38] tools/libxl: move xl parsing checks to tools/xl [v3,35/38] tools/xl: don't assume libxl and libxlutil are in one directory [v3,36/38] tools/libxl: move libxenlight to tools/libs/light [v3,37/38] tools: add support for library names other than libxen* [v3,38/38] tools: move libxlutil to tools/libs/util

diff --git a/.gitignore b/.gitignore index b7171ff2eb..44abbc7e43 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,10 @@ tools/libs/guest/xc_core.h tools/libs/guest/xc_core_arm.h tools/libs/guest/xc_core_x86.h tools/libs/guest/xc_private.h +tools/libs/stat/_paths.h +tools/libs/stat/headers.chk +tools/libs/stat/libxenstat.map +tools/libs/stat/xenstat.pc tools/libs/store/headers.chk tools/libs/store/list.h tools/libs/store/utils.h @@ -276,9 +280,6 @@ tools/xenmon/xentrace_setmask tools/xenmon/xenbaked tools/xenpaging/xenpaging tools/xenpmd/xenpmd -tools/xenstat/libxenstat/src/_paths.h -tools/xenstat/libxenstat/xenstat.pc -tools/xenstat/xentop/xentop tools/xenstore/xenstore tools/xenstore/xenstore-chmod tools/xenstore/xenstore-exists @@ -291,6 +292,7 @@ tools/xenstore/xenstore-ls tools/xenstore/xenstored tools/xenstore/xenstored_test tools/xenstore/xs_tdb_dump +tools/xentop/xentop tools/xentrace/xentrace_setsize tools/xentrace/tbctl tools/xentrace/xenctx diff --git a/tools/Makefile b/tools/Makefile index 0db01707a4..ea69675cca 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,7 +17,7 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon -SUBDIRS-y += xenstat +SUBDIRS-y += xentop SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage SUBDIRS-$(CONFIG_Linux) += vchan diff --git a/tools/Rules.mk b/tools/Rules.mk index c5f7cd26e0..241e8e7d9a 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -18,7 +18,6 @@ include $(XEN_ROOT)/tools/libs/uselibs.mk XEN_libxenlight = $(XEN_ROOT)/tools/libxl # Currently libxlutil lives in the same directory as libxenlight XEN_libxlutil = $(XEN_libxenlight) -XEN_libxenstat = $(XEN_ROOT)/tools/xenstat/libxenstat/src CFLAGS_xeninclude = -I$(XEN_INCLUDE) @@ -108,11 +107,6 @@ ifeq ($(CONFIG_Linux),y) LDLIBS_libxenstore += -ldl endif -CFLAGS_libxenstat = -I$(XEN_libxenstat) -SHDEPS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -LDLIBS_libxenstat = $(SHDEPS_libxenstat) $(XEN_libxenstat)/libxenstat$(libextension) -SHLIB_libxenstat = $(SHDEPS_libxenstat) -Wl,-rpath-link=$(XEN_libxenstat) - ifeq ($(debug),y) # Disable optimizations CFLAGS += -O0 -fno-omit-frame-pointer diff --git a/tools/libs/Makefile b/tools/libs/Makefile index 756d059ee7..e8fcd59214 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -13,6 +13,7 @@ SUBDIRS-y += ctrl SUBDIRS-y += guest SUBDIRS-y += hypfs SUBDIRS-y += store +SUBDIRS-y += stat SUBDIRS-$(CONFIG_Linux) += vchan ifeq ($(CONFIG_RUMP),y) diff --git a/tools/xenstat/libxenstat/COPYING b/tools/libs/stat/COPYING similarity index 100% rename from tools/xenstat/libxenstat/COPYING rename to tools/libs/stat/COPYING diff --git a/tools/xenstat/libxenstat/Makefile b/tools/libs/stat/Makefile similarity index 55% rename from tools/xenstat/libxenstat/Makefile rename to tools/libs/stat/Makefile index b5e623b155..5463f5f7ca 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/libs/stat/Makefile @@ -15,80 +15,24 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -LDCONFIG=ldconfig -MAKE_LINK=ln -sf - -MAJOR=4.15 -MINOR=0 - -LIB=src/libxenstat.a -SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR) -SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so -OBJECTS-y=src/xenstat.o src/xenstat_qmp.o -OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o -OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o -OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o -OBJECTS-$(CONFIG_FreeBSD) += src/xenstat_freebsd.o -SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) - -CFLAGS+=-fPIC -Werror -CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) -include $(XEN_ROOT)/tools/config.h - -LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) -lyajl -LDLIBS-$(CONFIG_SunOS) += -lkstat - -PKG_CONFIG := xenstat.pc -PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) - -ifneq ($(CONFIG_LIBXC_MINIOS),y) -PKG_CONFIG_INST := $(PKG_CONFIG) -$(PKG_CONFIG_INST): PKG_CONFIG_PREFIX = $(prefix) -$(PKG_CONFIG_INST): PKG_CONFIG_INCDIR = $(includedir) -$(PKG_CONFIG_INST): PKG_CONFIG_LIBDIR = $(libdir) -endif - -PKG_CONFIG_LOCAL := $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) -include $(XEN_ROOT)/tools/config.h -$(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX = $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_libxenstat) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) +SRCS-y += xenstat.c +SRCS-y += xenstat_qmp.c +SRCS-$(CONFIG_Linux) += xenstat_linux.c +SRCS-$(CONFIG_SunOS) += xenstat_solaris.c +SRCS-$(CONFIG_NetBSD) += xenstat_netbsd.c +SRCS-$(CONFIG_FreeBSD) += xenstat_freebsd.c -.PHONY: all -all: $(LIB) $(SHLIB) $(SHLIB_LINKS) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) - -$(OBJECTS-y): src/_paths.h - -$(LIB): $(OBJECTS-y) - $(AR) rc $@ $^ - $(RANLIB) $@ - -$(SHLIB): $(OBJECTS-y) - $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \ - $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS) +LDLIBS-y += -lyajl +LDLIBS-$(CONFIG_SunOS) += -lkstat +APPEND_LDFLAGS += $(LDLIBS-y) -src/libxenstat.so.$(MAJOR): $(SHLIB) - $(MAKE_LINK) $(<F) $@ +include $(XEN_ROOT)/tools/libs/libs.mk -src/libxenstat.so: src/libxenstat.so.$(MAJOR) - $(MAKE_LINK) $(<F) $@ +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_libxenstat)/include -.PHONY: install -install: all - $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a - $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR) - ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstat.so - $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR) - -.PHONY: uninstall -uninstall: - rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenstat.pc - rm -f $(DESTDIR)$(libdir)/libxenstat.so - rm -f $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR) - rm -f $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR).$(MINOR) - rm -f $(DESTDIR)$(libdir)/libxenstat.a - rm -f $(DESTDIR)$(includedir)/xenstat.h +$(LIB_OBJS): _paths.h PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py @@ -109,9 +53,9 @@ install-bindings: install-perl-bindings install-python-bindings .PHONY: uninstall-bindings uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings -$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) src/xenstat.h +$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h -SWIG_FLAGS=-module xenstat -Isrc +SWIG_FLAGS=-module xenstat -Iinclude -I. # Python bindings PYTHON_VERSION=$(PYTHON:python%=%) @@ -175,16 +119,14 @@ install: install-perl-bindings uninstall: uninstall-perl-bindings endif -.PHONY: clean -clean: - rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \ - $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) src/_paths.h - rm -f xenstat.pc +clean: cleanlocal -.PHONY: distclean -distclean: clean +.PHONY: cleanlocal +cleanlocal: + rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) _paths.h + rm -f libxenstat.map -include $(DEPS_INCLUDE) -genpath-target = $(call buildmakevars2header,src/_paths.h) +genpath-target = $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) diff --git a/tools/xenstat/libxenstat/bindings/swig/perl/.empty b/tools/libs/stat/bindings/swig/perl/.empty similarity index 100% rename from tools/xenstat/libxenstat/bindings/swig/perl/.empty rename to tools/libs/stat/bindings/swig/perl/.empty diff --git a/tools/xenstat/libxenstat/bindings/swig/python/.empty b/tools/libs/stat/bindings/swig/python/.empty similarity index 100% rename from tools/xenstat/libxenstat/bindings/swig/python/.empty rename to tools/libs/stat/bindings/swig/python/.empty diff --git a/tools/xenstat/libxenstat/bindings/swig/xenstat.i b/tools/libs/stat/bindings/swig/xenstat.i similarity index 100% rename from tools/xenstat/libxenstat/bindings/swig/xenstat.i rename to tools/libs/stat/bindings/swig/xenstat.i diff --git a/tools/xenstat/libxenstat/src/xenstat.h b/tools/libs/stat/include/xenstat.h similarity index 98% rename from tools/xenstat/libxenstat/src/xenstat.h rename to tools/libs/stat/include/xenstat.h index 76a660f321..c3b98909dd 100644 --- a/tools/xenstat/libxenstat/src/xenstat.h +++ b/tools/libs/stat/include/xenstat.h @@ -71,6 +71,9 @@ unsigned long long xenstat_node_tot_mem(xenstat_node * node); /* Get amount of free memory on a node */ unsigned long long xenstat_node_free_mem(xenstat_node * node); +/* Get amount of freeable memory on a node */ +long xenstat_node_freeable_mb(xenstat_node * node); + /* Find the number of domains existing on a node */ unsigned int xenstat_node_num_domains(xenstat_node * node); diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/libs/stat/xenstat.c similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat.c rename to tools/libs/stat/xenstat.c diff --git a/tools/xenstat/libxenstat/xenstat.pc.in b/tools/libs/stat/xenstat.pc.in similarity index 82% rename from tools/xenstat/libxenstat/xenstat.pc.in rename to tools/libs/stat/xenstat.pc.in index ad00577c89..6005593ba1 100644 --- a/tools/xenstat/libxenstat/xenstat.pc.in +++ b/tools/libs/stat/xenstat.pc.in @@ -7,4 +7,4 @@ Description: The Xenstat library for Xen hypervisor Version: @@version@@ Cflags: -I${includedir} Libs: @@libsflag@@${libdir} -lxenstat -Requires.private: xencontrol,xenstore +Requires.private: xencontrol,xenstore,yajl diff --git a/tools/xenstat/libxenstat/src/xenstat_freebsd.c b/tools/libs/stat/xenstat_freebsd.c similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat_freebsd.c rename to tools/libs/stat/xenstat_freebsd.c diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/libs/stat/xenstat_linux.c similarity index 98% rename from tools/xenstat/libxenstat/src/xenstat_linux.c rename to tools/libs/stat/xenstat_linux.c index 7530349eee..793263f2b6 100644 --- a/tools/xenstat/libxenstat/src/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -64,7 +64,7 @@ static const char PROCNETDEV_HEADER[] = /* We need to get the name of the bridge interface for use with bonding interfaces */ /* Use excludeName parameter to avoid adding bridges we don't care about, eg. virbr0 */ -void getBridge(char *excludeName, char *result, size_t resultLen) +static void getBridge(char *excludeName, char *result, size_t resultLen) { struct dirent *de; DIR *d; @@ -89,7 +89,7 @@ void getBridge(char *excludeName, char *result, size_t resultLen) /* parseNetLine provides regular expression based parsing for lines from /proc/net/dev, all the */ /* information are parsed but not all are used in our case, ie. for xenstat */ -int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsigned long long *rxPackets, +static int parseNetDevLine(char *line, char *iface, unsigned long long *rxBytes, unsigned long long *rxPackets, unsigned long long *rxErrs, unsigned long long *rxDrops, unsigned long long *rxFifo, unsigned long long *rxFrames, unsigned long long *rxComp, unsigned long long *rxMcast, unsigned long long *txBytes, unsigned long long *txPackets, unsigned long long *txErrs, diff --git a/tools/xenstat/libxenstat/src/xenstat_netbsd.c b/tools/libs/stat/xenstat_netbsd.c similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat_netbsd.c rename to tools/libs/stat/xenstat_netbsd.c diff --git a/tools/xenstat/libxenstat/src/xenstat_priv.h b/tools/libs/stat/xenstat_priv.h similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat_priv.h rename to tools/libs/stat/xenstat_priv.h diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat_qmp.c rename to tools/libs/stat/xenstat_qmp.c diff --git a/tools/xenstat/libxenstat/src/xenstat_solaris.c b/tools/libs/stat/xenstat_solaris.c similarity index 100% rename from tools/xenstat/libxenstat/src/xenstat_solaris.c rename to tools/libs/stat/xenstat_solaris.c diff --git a/tools/libs/uselibs.mk b/tools/libs/uselibs.mk index edb4b34256..a9dc2ce994 100644 --- a/tools/libs/uselibs.mk +++ b/tools/libs/uselibs.mk @@ -24,3 +24,5 @@ LIBS_LIBS += store USELIBS_store := toolcore LIBS_LIBS += vchan USELIBS_vchan := toollog store gnttab evtchn +LIBS_LIBS += stat +USELIBS_stat := ctrl store diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile deleted file mode 100644 index b300f31289..0000000000 --- a/tools/xenstat/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SUBDIRS := -SUBDIRS += libxenstat -SUBDIRS += xentop - -.PHONY: all install clean distclean uninstall - -all install clean distclean uninstall: %: subdirs-% diff --git a/tools/xenstat/xentop/Makefile b/tools/xentop/Makefile similarity index 97% rename from tools/xenstat/xentop/Makefile rename to tools/xentop/Makefile index ec612db2a2..0034114684 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xentop/Makefile @@ -10,7 +10,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk ifneq ($(XENSTAT_XENTOP),y) diff --git a/tools/xenstat/xentop/TODO b/tools/xentop/TODO similarity index 100% rename from tools/xenstat/xentop/TODO rename to tools/xentop/TODO diff --git a/tools/xenstat/xentop/xentop.c b/tools/xentop/xentop.c similarity index 100% rename from tools/xenstat/xentop/xentop.c rename to tools/xentop/xentop.c

[v3,30/38] tools: split libxenstat into new tools/libs/stat directory

Commit Message

Comments

Patch