Implement VBD and VIF handling on Solaris for libxenstat
PATCH 1/1 Implement VBD and VIF handling on Solaris for libxenstat
# HG changeset patch
# User [email protected]
# Date 1170985988 28800
# Node ID c2eb82b28b7d685cca993fd3fb2865051006ffc8 # Parent 546eef87339a3864af25a390457801dad737bf68 Implement VBD and VIF handling on Solaris for libxenstat.
Also, fix up a confusion with ERR that was breaking xentop.
Signed-off-by John Levon <[email protected]>
tools/xenstat/libxenstat/Makefile +22 -9
@@ -14,7 +14,6 @@ XEN_ROOT=../../.. include $(XEN_ROOT)/tools/Rules.mk -LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse prefix=/usr includedir=$(prefix)/include
@@ -29,26 +28,40 @@ LIB=src/libxenstat.a LIB=src/libxenstat.a SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR) SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so -OBJECTS=src/xenstat.o +OBJECTS-y=src/xenstat.o +OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o +OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) WARN_FLAGS=-Wall -Werror CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ +LDLIBS-y = -lxenstore -lxenctrl +LDLIBS-$(CONFIG_SunOS) += -lkstat +ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so +ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so +ARLIBS-x86_32 = /usr/lib/libkstat.so +ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH)) .PHONY: all all: $(LIB) -$(LIB): $(OBJECTS) - $(AR) rc $@ $^ $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so +$(LIB): $(OBJECTS-y) + $(AR) rc $@ $^ $(ARLIBS-y) $(RANLIB) $@ -$(SHLIB): $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_CFLAGS) -o $@ $(OBJECTS) \ - -lxenstore -lxenctrl +$(SHLIB): $(OBJECTS-y) + $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_CFLAGS) -o $@ \ + $(OBJECTS-y) $(LDLIBS-y) -src/xenstat.o: src/xenstat.c src/xenstat.h +src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h + $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< + +src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h + $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< + +src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h $(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $< src/libxenstat.so.$(MAJOR): $(LIB)
@@ -140,5 +153,5 @@ endif .PHONY: clean clean: - rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS) \ + rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \ $(BINDINGS) $(BINDINGSRC)
tools/xenstat/libxenstat/src/xenstat.c +9 -280
344 lines not on this page · raw message
tools/xenstat/libxenstat/src/xenstat.h +5 -0
@@ -16,6 +16,9 @@*/ /* libxenstat API */ + +#ifndef XENSTAT_H +#define XENSTAT_H /* Opaque handles */ typedef struct xenstat_handle xenstat_handle ;
@@ -176,3 +179,5 @@ unsigned long long xenstat_vbd_oo_reqs(xunsigned long long xenstat_vbd_oo_reqs (xenstat_vbd * vbd);unsigned long long xenstat_vbd_rd_reqs (xenstat_vbd * vbd);unsigned long long xenstat_vbd_wr_reqs (xenstat_vbd * vbd); + +#endif /* XENSTAT_H */
tools/xenstat/libxenstat/src/xenstat_linux.c new file +265 -0
265 lines not on this page · raw message
tools/xenstat/libxenstat/src/xenstat_priv.h new file +101 -0
101 lines not on this page · raw message
tools/xenstat/libxenstat/src/xenstat_solaris.c new file +431 -0
431 lines not on this page · raw message
tools/xenstat/xentop/xentop.c +6 -2
@@ -52,7 +52,11 @@#define KEY_ESCAPE '\x1B'#ifdef HOST_SunOS -/* Old curses library on Solaris takes non-const strings. */ +/* Old curses library on Solaris takes non-const strings. Also, ERR interferes +* with curse's definition. +*/ +#undef ERR +#define ERR (-1)#define curses_str_t char *#else #define curses_str_t const char *
@@ -924,7 +928,7 @@ void do_vbd(xenstat_domain *domain)xenstat_vbd_rd_reqs (vbd), xenstat_vbd_wr_reqs(vbd));#else - print("VBD %4u OO: %8llu RD: %8llu WR: %8llu\n", + print("VBD %4d OO: %8llu RD: %8llu WR: %8llu\n", xenstat_vbd_dev(vbd), xenstat_vbd_oo_reqs(vbd), xenstat_vbd_rd_reqs(vbd),