[netperf-dev] netperf4 commit notice r172 - in
branches/glib_migration: src suites/disk suites/dns
raj at netperf.org
raj at netperf.org
Tue Apr 18 17:41:16 PDT 2006
Author: raj
Date: 2006-04-18 17:41:15 -0700 (Tue, 18 Apr 2006)
New Revision: 172
Added:
branches/glib_migration/suites/disk/dsk_commands.xml
branches/glib_migration/suites/disk/dsk_config.xml
branches/glib_migration/suites/dns/dns_commands.xml
branches/glib_migration/suites/dns/dns_config.xml
Removed:
branches/glib_migration/src/dns_commands.xml
branches/glib_migration/src/dns_config.xml
branches/glib_migration/src/dsk_commands.xml
branches/glib_migration/src/dsk_config.xml
Modified:
branches/glib_migration/src/Makefile.am
branches/glib_migration/src/Makefile.in
Log:
Put the XML files with their suites
Modified: branches/glib_migration/src/Makefile.am
===================================================================
--- branches/glib_migration/src/Makefile.am 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/Makefile.am 2006-04-19 00:41:15 UTC (rev 172)
@@ -13,9 +13,10 @@
# anything that might be platform-specific and thus not covered
# directly in COMMON_SRC or *_SOURCES should be in EXTRA_DIST
-EXTRA_DIST = missing/* dirs NetPerfDir/* NetServerDir/* *.xml netperf_docs.dtd netperf.h netsysstats*.c netlib_*.c
+EXTRA_DIST = missing/* dirs NetPerfDir/* NetServerDir/* *.xml netperf_docs.dtd netsysstats*.c netlib_*.c
-COMMON_SRC = netperf_hist.h netlib.c netperf.h netlib.h netcpu.h netmsg.c netmsg.h netconfidence.c netconfidence.h
+# some of the other include files are actually up in include/
+COMMON_SRC = netlib.c netcpu.h netmsg.c netmsg.h netconfidence.c
netperf_SOURCES = netperf.c $(COMMON_SRC) $(USE_NETLIB_SOURCE)
netserver_SOURCES = netserver.c $(COMMON_SRC) $(USE_NETLIB_SOURCE)
@@ -23,11 +24,6 @@
netperfdir = @datadir@/netperf
netperf_DATA = netperf_docs.dtd default_commands.xml default_config.xml
-# in theory this will cause these header files to be put in the
-# installed headers location, where folks who want to make their own
-# test libraries can find them
-include_HEADERS = netperf.h netconfidence.h netperf_hist.h
-
# in theory, the stuff below should deal with creating the requisite
# "core" libs. optional libs are in suites/
lib_LTLIBRARIES = nettest_bsd.la netsysstats.la
Modified: branches/glib_migration/src/Makefile.in
===================================================================
--- branches/glib_migration/src/Makefile.in 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/Makefile.in 2006-04-19 00:41:15 UTC (rev 172)
@@ -159,9 +159,10 @@
# anything that might be platform-specific and thus not covered
# directly in COMMON_SRC or *_SOURCES should be in EXTRA_DIST
-EXTRA_DIST = missing/* dirs NetPerfDir/* NetServerDir/* *.xml netperf_docs.dtd netperf.h netsysstats*.c netlib_*.c
+EXTRA_DIST = missing/* dirs NetPerfDir/* NetServerDir/* *.xml netperf_docs.dtd netsysstats*.c netlib_*.c
-COMMON_SRC = netperf_hist.h netlib.c netperf.h netlib.h netcpu.h netmsg.c netmsg.h netconfidence.c netconfidence.h
+# some of the other include files are actually up in include/
+COMMON_SRC = netlib.c netcpu.h netmsg.c netmsg.h netconfidence.c
netperf_SOURCES = netperf.c $(COMMON_SRC) $(USE_NETLIB_SOURCE)
netserver_SOURCES = netserver.c $(COMMON_SRC) $(USE_NETLIB_SOURCE)
@@ -169,11 +170,6 @@
netperfdir = @datadir@/netperf
netperf_DATA = netperf_docs.dtd default_commands.xml default_config.xml
-# in theory this will cause these header files to be put in the
-# installed headers location, where folks who want to make their own
-# test libraries can find them
-include_HEADERS = netperf.h netconfidence.h netperf_hist.h
-
# in theory, the stuff below should deal with creating the requisite
# "core" libs. optional libs are in suites/
lib_LTLIBRARIES = nettest_bsd.la netsysstats.la
@@ -243,10 +239,8 @@
$(netperf_SOURCES) $(netserver_SOURCES)
DATA = $(netperf_DATA)
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am \
- missing/getaddrinfo.c missing/inet_ntop.c
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am missing/getaddrinfo.c \
+ missing/inet_ntop.c
SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
all: all-am
@@ -404,25 +398,7 @@
echo " rm -f $(DESTDIR)$(netperfdir)/$$f"; \
rm -f $(DESTDIR)$(netperfdir)/$$f; \
done
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(includedir)
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
- done
-uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
- rm -f $(DESTDIR)$(includedir)/$$f; \
- done
-
ETAGS = etags
ETAGSFLAGS =
@@ -511,12 +487,12 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
install-binPROGRAMS: install-libLTLIBRARIES
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(netperfdir) $(DESTDIR)$(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(netperfdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -560,8 +536,7 @@
info-am:
-install-data-am: install-data-local install-includeHEADERS \
- install-netperfDATA
+install-data-am: install-data-local install-netperfDATA
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
@@ -589,25 +564,22 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-netperfDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-netperfDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libLTLIBRARIES clean-libtool ctags \
distclean distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-binPROGRAMS install-data install-data-am \
- install-data-local install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLTLIBRARIES install-man install-netperfDATA \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
- pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-netperfDATA
+ install-data-local install-exec install-exec-am install-info \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-netperfDATA install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-netperfDATA
missing/getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c
Deleted: branches/glib_migration/src/dns_commands.xml
===================================================================
--- branches/glib_migration/src/dns_commands.xml 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/dns_commands.xml 2006-04-19 00:41:15 UTC (rev 172)
@@ -1,26 +0,0 @@
-<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
-<commands xmlns="http://www.netperf.org/ns/netperf">
-
-<!-- 20 second DNS_RR test, details of the config in the config file
- eg dns_config.xml or whatever you may want to use -->
-
- <!-- cause a set of tests to be instantiated -->
- <create_test_set set_name="s0" tests_in_set="t0" />
- <wait tid="s0" />
- <!-- now ask that all the tests in the set go to the load state -->
- <load tid="s0" />
- <wait tid="s0" />
- <!-- now ask that all the tests in the set go to the MEAS state -->
- <measure tid="s0" />
- <wait tid="s0" seconds="20" />
- <load tid="s0" />
- <wait tid="s0" />
- <get_stats tid="t0" />
- <clear_stats tid="t0" />
- <idle tid="s0" />
- <wait tid="s0" />
- <report_stats test_set="s0"
- library="nettest_dns"
- function="report_dns_test_results" />
-</commands>
Deleted: branches/glib_migration/src/dns_config.xml
===================================================================
--- branches/glib_migration/src/dns_config.xml 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/dns_config.xml 2006-04-19 00:41:15 UTC (rev 172)
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE netperf SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
-<netperf xmlns="http://www.netperf.org/ns/netperf">
-<!-- the "netserver" entity gives info on how to contact the netserver -->
-<netserver nid="n1" >
- <!-- within the netserver there can be several "test" entities -->
- <test tid="t0"
- test_name = "send_dns_rr"
- library = "nettest_dns" >
- <!-- The dependency data section gives the info for the DNS server -->
- <dependency_data use_tcp = "false" remote_port = "53" remote_host="15.243.160.51" />
- <!-- We get local addressing info from the socket_args entity -->
- <socket_args
- fill_file = "/tmp/dns_requests"
- send_buffer_size = "128"
- recv_buffer_size = "128" />
- <dns_args
- max_outstanding = "1"
- timeout = "5000" />
- </test>
-</netserver>
-</netperf>
Deleted: branches/glib_migration/src/dsk_commands.xml
===================================================================
--- branches/glib_migration/src/dsk_commands.xml 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/dsk_commands.xml 2006-04-19 00:41:15 UTC (rev 172)
@@ -1,26 +0,0 @@
-<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
-<commands xmlns="http://www.netperf.org/ns/netperf">
-
-<!-- 30 second raw_seq_disk_io test
- -->
- <create_test_set set_name="s0" tests_in_set="t0,t1" />
- <wait tid="s0" />
- <load tid="s0" />
- <wait tid="s0" />
- <measure tid="s0" />
- <wait tid="s0" seconds="30" />
- <load tid="s0" />
- <wait tid="s0" />
- <get_stats tid="s0" />
- <wait tid="s0" />
- <clear_stats tid="s0" />
- <idle tid="s0" />
- <wait tid="s0" />
- <report_stats test_set="s0"
- library="disktest"
- function="report_disk_test_results"
- report_flags="PRINT_ALL"
- />
-
-</commands>
Deleted: branches/glib_migration/src/dsk_config.xml
===================================================================
--- branches/glib_migration/src/dsk_config.xml 2006-04-19 00:31:36 UTC (rev 171)
+++ branches/glib_migration/src/dsk_config.xml 2006-04-19 00:41:15 UTC (rev 172)
@@ -1,20 +0,0 @@
-<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE netperf SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
-<netperf xmlns="http://www.netperf.org/ns/netperf">
-<!-- This is just another boring comment -->
-<netserver nid="n1" >
-<!-- test to get cpu utilization -->
- <test tid="t0"
- test_name = "sys_stats"
- library = "netsysstats" >
- </test>
-<!-- test to do raw sequential disk io i
- you must place a valid raw disk file in file_name -->
- <test tid="t1"
- test_name = "raw_seq_disk_io"
- library = "disktest" >
- <disk_args
- file_name = "/dev/rdsk/junk" />
- </test>
-</netserver>
-</netperf>
Copied: branches/glib_migration/suites/disk/dsk_commands.xml (from rev 163, branches/glib_migration/src/dsk_commands.xml)
Copied: branches/glib_migration/suites/disk/dsk_config.xml (from rev 163, branches/glib_migration/src/dsk_config.xml)
Copied: branches/glib_migration/suites/dns/dns_commands.xml (from rev 163, branches/glib_migration/src/dns_commands.xml)
Copied: branches/glib_migration/suites/dns/dns_config.xml (from rev 163, branches/glib_migration/src/dns_config.xml)
More information about the netperf-dev
mailing list