[netperf-dev] netperf4 commit notice r138 -
branches/glib_migration/src
raj at netperf.org
raj at netperf.org
Fri Apr 7 11:31:07 PDT 2006
Author: raj
Date: 2006-04-07 11:31:04 -0700 (Fri, 07 Apr 2006)
New Revision: 138
Modified:
branches/glib_migration/src/default_commands.xml
branches/glib_migration/src/default_config.xml
branches/glib_migration/src/default_multi.xml
branches/glib_migration/src/default_tcp_rr.xml
branches/glib_migration/src/default_tcp_stream.xml
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
branches/glib_migration/src/netperf.c
branches/glib_migration/src/stephen_config.xml
branches/glib_migration/src/win_commands.xml
branches/glib_migration/src/win_config.xml
Log:
g_module_open means never having to use a library suffix.
Modified: branches/glib_migration/src/default_commands.xml
===================================================================
--- branches/glib_migration/src/default_commands.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/default_commands.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -21,7 +21,7 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
<!-- 20 second TCP_MAERTS test
@@ -39,7 +39,7 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s4"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
@@ -60,14 +60,14 @@
<idle tid="s2" />
<wait tid="s2" />
<report_stats test_set="s3"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
<!-- 20 second TCP_STREAM test with confidence
<create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
<create_test_set set_name="s1" tests_in_set="t0,t1" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" >
<wait tid="s0" />
<load tid="s0" />
Property changes on: branches/glib_migration/src/default_commands.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/default_config.xml
===================================================================
--- branches/glib_migration/src/default_config.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/default_config.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -5,11 +5,11 @@
<netserver nid="n1" >
<test tid="t0"
test_name = "sys_stats"
- library = "netsysstats.la" >
+ library = "netsysstats" >
</test>
<test tid="t1"
test_name = "send_tcp_stream"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<dependson testid="t2" netserverid="n1" />
<socket_args
send_buffer_size = "128"
@@ -18,20 +18,20 @@
</test>
<test tid="t2"
test_name = "recv_tcp_stream"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<socket_args
send_buffer_size = "128"
recv_buffer_size = "128" />
</test>
<test tid="t3"
test_name = "send_tcp_rr"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<dependson testid="t4" netserverid="n1" />
<socket_args />
</test>
<test tid="t4"
test_name = "recv_tcp_rr"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<socket_args />
</test>
</netserver>
Property changes on: branches/glib_migration/src/default_config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/default_multi.xml
===================================================================
--- branches/glib_migration/src/default_multi.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/default_multi.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -20,7 +20,7 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
-->
@@ -38,7 +38,7 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s4"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
-->
@@ -59,7 +59,7 @@
<idle tid="s2" />
<wait tid="s2" />
<report_stats test_set="s3"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
-->
@@ -67,7 +67,7 @@
<create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
<create_test_set set_name="s1" tests_in_set="t0,t1" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" >
<wait tid="s0" />
<load tid="s0" />
Property changes on: branches/glib_migration/src/default_multi.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/default_tcp_rr.xml
===================================================================
--- branches/glib_migration/src/default_tcp_rr.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/default_tcp_rr.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -18,6 +18,6 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
</commands>
Property changes on: branches/glib_migration/src/default_tcp_rr.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/default_tcp_stream.xml
===================================================================
--- branches/glib_migration/src/default_tcp_stream.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/default_tcp_stream.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -18,6 +18,6 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s1"
- library="nettest_bsd.la"
+ library="nettest_bsd"
function="report_bsd_test_results" />
</commands>
Property changes on: branches/glib_migration/src/default_tcp_stream.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/dns_commands.xml
===================================================================
--- branches/glib_migration/src/dns_commands.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/dns_commands.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -21,6 +21,6 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s0"
- library="nettest_dns.la"
+ library="nettest_dns"
function="report_dns_test_results" />
</commands>
Property changes on: branches/glib_migration/src/dns_commands.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/dns_config.xml
===================================================================
--- branches/glib_migration/src/dns_config.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/dns_config.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -6,7 +6,7 @@
<!-- within the netserver there can be several "test" entities -->
<test tid="t0"
test_name = "send_dns_rr"
- library = "nettest_dns.la" >
+ 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 -->
Property changes on: branches/glib_migration/src/dns_config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/dsk_commands.xml
===================================================================
--- branches/glib_migration/src/dsk_commands.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/dsk_commands.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -18,7 +18,7 @@
<idle tid="s0" />
<wait tid="s0" />
<report_stats test_set="s0"
- library="disktest.la"
+ library="disktest"
function="report_disk_test_results"
report_flags="PRINT_ALL"
/>
Property changes on: branches/glib_migration/src/dsk_commands.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/dsk_config.xml
===================================================================
--- branches/glib_migration/src/dsk_config.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/dsk_config.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -6,13 +6,13 @@
<!-- test to get cpu utilization -->
<test tid="t0"
test_name = "sys_stats"
- library = "netsysstats.la" >
+ 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.la" >
+ library = "disktest" >
<disk_args
file_name = "/dev/rdsk/junk" />
</test>
Property changes on: branches/glib_migration/src/dsk_config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/netperf.c
===================================================================
--- branches/glib_migration/src/netperf.c 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/netperf.c 2006-04-07 18:31:04 UTC (rev 138)
@@ -1647,7 +1647,7 @@
test_set->id = setid;
test_set->tests_in_set = xmlGetProp(cmd,(const xmlChar *)"tests_in_set");
tests = (char *)(test_set->tests_in_set);
- test_set->get_confidence = (void *)get_confidence;
+ test_set->get_confidence = get_confidence;
} else {
/* test set could not be allocated report error */
rc = NPE_MALLOC_FAILED5;
Modified: branches/glib_migration/src/stephen_config.xml
===================================================================
--- branches/glib_migration/src/stephen_config.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/stephen_config.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -5,11 +5,11 @@
<netserver nid="n1" >
<test tid="t0"
test_name = "sys_stats"
- library = "netsysstats.la" >
+ library = "netsysstats" >
</test>
<test tid="t1"
test_name = "send_tcp_stream"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<dependson testid="t2" netserverid="n1" />
<socket_args
send_buffer_size = "128"
@@ -18,20 +18,20 @@
</test>
<test tid="t2"
test_name = "recv_tcp_stream"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<socket_args
send_buffer_size = "128"
recv_buffer_size = "128" />
</test>
<test tid="t3"
test_name = "send_tcp_rr"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<dependson testid="t4" netserverid="n1" />
<socket_args />
</test>
<test tid="t4"
test_name = "recv_tcp_rr"
- library = "nettest_bsd.la" >
+ library = "nettest_bsd" >
<socket_args />
</test>
</netserver>
Property changes on: branches/glib_migration/src/stephen_config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/win_commands.xml
===================================================================
--- branches/glib_migration/src/win_commands.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/win_commands.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -1,87 +1,87 @@
-<?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 TCP_STREAM test
- -->
- <create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
- <create_test_set set_name="s1" tests_in_set="t0,t1" />
- <wait tid="s0" />
- <load tid="s0" />
- <wait tid="s0" />
- <measure tid="s0" />
- <wait tid="s0" seconds="20" />
- <load tid="s0" />
- <wait tid="s0" />
- <get_stats tid="t0" />
- <get_stats tid="t1" />
- <clear_stats tid="t0" />
- <clear_stats tid="t1" />
- <clear_stats tid="t2" />
- <idle tid="s0" />
- <wait tid="s0" />
- <report_stats test_set="s1"
- library="nettest_bsd.dll"
- function="report_bsd_test_results" />
-
-<!-- 20 second TCP_MAERTS test
- -->
- <create_test_set set_name="s4" tests_in_set="t0,t2" />
- <wait tid="s0" />
- <load tid="s0" />
- <wait tid="s0" />
- <measure tid="s0" />
- <wait tid="s0" seconds="20" />
- <load tid="s0" />
- <wait tid="s0" />
- <get_stats tid="s4" />
- <clear_stats tid="s0" />
- <idle tid="s0" />
- <wait tid="s0" />
- <report_stats test_set="s4"
- library="nettest_bsd.dll"
- function="report_bsd_test_results" />
-
-
-<!-- 20 second TCP_RR test
- -->
- <create_test_set set_name="s2" tests_in_set="t0,t3,t4" />
- <create_test_set set_name="s3" tests_in_set="t3,t0" />
- <wait tid="s2" />
- <load tid="s2" />
- <wait tid="s2" />
- <measure tid="s2" />
- <wait tid="s2" seconds="20" />
- <load tid="s2" />
- <wait tid="s2" />
- <get_stats tid="t0" />
- <get_stats tid="t3" />
- <clear_stats tid="s2" />
- <idle tid="s2" />
- <wait tid="s2" />
- <report_stats test_set="s3"
- library="nettest_bsd.dll"
- function="report_bsd_test_results" />
-
-<!-- 20 second TCP_STREAM test with confidence
- <create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
- <create_test_set set_name="s1" tests_in_set="t0,t1" />
- <report_stats test_set="s1"
- library="nettest_bsd.dll"
- function="report_bsd_test_results" >
- <wait tid="s0" />
- <load tid="s0" />
- <wait tid="s0" />
- <measure tid="s0" />
- <wait tid="s0" seconds="20" />
- <load tid="s0" />
- <wait tid="s0" />
- <get_stats tid="t0" />
- <get_stats tid="t1" />
- <clear_stats tid="s0" />
- <idle tid="s0" />
- <wait tid="s0" />
- </report_stats>
- -->
-
-</commands>
+<?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 TCP_STREAM test
+ -->
+ <create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
+ <create_test_set set_name="s1" tests_in_set="t0,t1" />
+ <wait tid="s0" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <measure tid="s0" />
+ <wait tid="s0" seconds="20" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <get_stats tid="t0" />
+ <get_stats tid="t1" />
+ <clear_stats tid="t0" />
+ <clear_stats tid="t1" />
+ <clear_stats tid="t2" />
+ <idle tid="s0" />
+ <wait tid="s0" />
+ <report_stats test_set="s1"
+ library="nettest_bsd.dll"
+ function="report_bsd_test_results" />
+
+<!-- 20 second TCP_MAERTS test
+ -->
+ <create_test_set set_name="s4" tests_in_set="t0,t2" />
+ <wait tid="s0" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <measure tid="s0" />
+ <wait tid="s0" seconds="20" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <get_stats tid="s4" />
+ <clear_stats tid="s0" />
+ <idle tid="s0" />
+ <wait tid="s0" />
+ <report_stats test_set="s4"
+ library="nettest_bsd.dll"
+ function="report_bsd_test_results" />
+
+
+<!-- 20 second TCP_RR test
+ -->
+ <create_test_set set_name="s2" tests_in_set="t0,t3,t4" />
+ <create_test_set set_name="s3" tests_in_set="t3,t0" />
+ <wait tid="s2" />
+ <load tid="s2" />
+ <wait tid="s2" />
+ <measure tid="s2" />
+ <wait tid="s2" seconds="20" />
+ <load tid="s2" />
+ <wait tid="s2" />
+ <get_stats tid="t0" />
+ <get_stats tid="t3" />
+ <clear_stats tid="s2" />
+ <idle tid="s2" />
+ <wait tid="s2" />
+ <report_stats test_set="s3"
+ library="nettest_bsd.dll"
+ function="report_bsd_test_results" />
+
+<!-- 20 second TCP_STREAM test with confidence
+ <create_test_set set_name="s0" tests_in_set="t0,t1,t2" />
+ <create_test_set set_name="s1" tests_in_set="t0,t1" />
+ <report_stats test_set="s1"
+ library="nettest_bsd.dll"
+ function="report_bsd_test_results" >
+ <wait tid="s0" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <measure tid="s0" />
+ <wait tid="s0" seconds="20" />
+ <load tid="s0" />
+ <wait tid="s0" />
+ <get_stats tid="t0" />
+ <get_stats tid="t1" />
+ <clear_stats tid="s0" />
+ <idle tid="s0" />
+ <wait tid="s0" />
+ </report_stats>
+ -->
+
+</commands>
Property changes on: branches/glib_migration/src/win_commands.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/win_config.xml
===================================================================
--- branches/glib_migration/src/win_config.xml 2006-04-07 16:45:41 UTC (rev 137)
+++ branches/glib_migration/src/win_config.xml 2006-04-07 18:31:04 UTC (rev 138)
@@ -1,38 +1,38 @@
-<?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 tid="t0"
- test_name = "sys_stats"
- library = "netsysstats.dll" >
- </test>
- <test tid="t1"
- test_name = "send_tcp_stream"
- library = "nettest_bsd.dll" >
- <dependson testid="t2" netserverid="n1" />
- <socket_args
- send_buffer_size = "128"
- recv_buffer_size = "128"
- send_size = "32" />
- </test>
- <test tid="t2"
- test_name = "recv_tcp_stream"
- library = "nettest_bsd.dll" >
- <socket_args
- send_buffer_size = "128"
- recv_buffer_size = "128" />
- </test>
- <test tid="t3"
- test_name = "send_tcp_rr"
- library = "nettest_bsd.dll" >
- <dependson testid="t4" netserverid="n1" />
- <socket_args />
- </test>
- <test tid="t4"
- test_name = "recv_tcp_rr"
- library = "nettest_bsd.dll" >
- <socket_args />
- </test>
-</netserver>
-</netperf>
+<?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 tid="t0"
+ test_name = "sys_stats"
+ library = "netsysstats.dll" >
+ </test>
+ <test tid="t1"
+ test_name = "send_tcp_stream"
+ library = "nettest_bsd.dll" >
+ <dependson testid="t2" netserverid="n1" />
+ <socket_args
+ send_buffer_size = "128"
+ recv_buffer_size = "128"
+ send_size = "32" />
+ </test>
+ <test tid="t2"
+ test_name = "recv_tcp_stream"
+ library = "nettest_bsd.dll" >
+ <socket_args
+ send_buffer_size = "128"
+ recv_buffer_size = "128" />
+ </test>
+ <test tid="t3"
+ test_name = "send_tcp_rr"
+ library = "nettest_bsd.dll" >
+ <dependson testid="t4" netserverid="n1" />
+ <socket_args />
+ </test>
+ <test tid="t4"
+ test_name = "recv_tcp_rr"
+ library = "nettest_bsd.dll" >
+ <socket_args />
+ </test>
+</netserver>
+</netperf>
Property changes on: branches/glib_migration/src/win_config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the netperf-dev
mailing list