diff options
Diffstat (limited to 'tools/xenmon')
| -rw-r--r-- | tools/xenmon/Makefile | 11 | ||||
| -rw-r--r-- | tools/xenmon/xenmon.py | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 3d46dbe548..c1f4cd3f46 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -10,17 +10,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -INSTALL = install -INSTALL_PROG = $(INSTALL) -m0755 -INSTALL_DIR = $(INSTALL) -d -m0755 -INSTALL_DATA = $(INSTALL) -m0644 - -sbindir=/usr/sbin - XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -g +sbindir=/usr/sbin + +CFLAGS += -Werror CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) LDFLAGS += -L $(XEN_LIBXC) diff --git a/tools/xenmon/xenmon.py b/tools/xenmon/xenmon.py index 402b6b4e18..d828834a10 100644 --- a/tools/xenmon/xenmon.py +++ b/tools/xenmon/xenmon.py @@ -653,7 +653,6 @@ def writelog(): # start xenbaked def start_xenbaked(): global options - global args os.system("killall -9 xenbaked") # assumes that xenbaked is in your path @@ -672,9 +671,17 @@ def main(): parser = setup_cmdline_parser() (options, args) = parser.parse_args() + + if len(args): + parser.error("No parameter required") if options.mspersample < 0: parser.error("option --ms_per_sample: invalid negative value: '%d'" % options.mspersample) + # If --ms_per_sample= is too large, no data may be logged. + if not options.live and options.duration != 0 and \ + options.mspersample > options.duration * 1000: + parser.error("option --ms_per_sample: too large (> %d ms)" % + (options.duration * 1000)) start_xenbaked() if options.live: |