[netperf-dev] netperf4 commit notice r75 - trunk/src
burger at netperf.org
burger at netperf.org
Tue Mar 7 10:13:21 PST 2006
Author: burger
Date: 2006-03-07 10:13:17 -0800 (Tue, 07 Mar 2006)
New Revision: 75
Modified:
trunk/src/default_commands.xml
trunk/src/default_multi.xml
trunk/src/default_tcp_rr.xml
trunk/src/default_tcp_stream.xml
trunk/src/dns_commands.xml
trunk/src/dns_config.xml
trunk/src/netperf.c
trunk/src/netserver.c
trunk/src/stephen_config.xml
Log:
Move some output from always to debug or verbose.
Fix up dtd declaration in all xml files.
Stephen Burger
Modified: trunk/src/default_commands.xml
===================================================================
--- trunk/src/default_commands.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/default_commands.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
+<!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
Modified: trunk/src/default_multi.xml
===================================================================
--- trunk/src/default_multi.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/default_multi.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "./netperf_docs.dtd" >
+<!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
Modified: trunk/src/default_tcp_rr.xml
===================================================================
--- trunk/src/default_tcp_rr.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/default_tcp_rr.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "./netperf_docs.dtd" >
+<!DOCTYPE commands SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
<commands xmlns="http://www.netperf.org/ns/netperf">
<!-- 20 second TCP_RR test -->
<create_test_set set_name="s0" tests_in_set="t0,t3,t4" />
Modified: trunk/src/default_tcp_stream.xml
===================================================================
--- trunk/src/default_tcp_stream.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/default_tcp_stream.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "./netperf_docs.dtd" >
+<!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" />
Modified: trunk/src/dns_commands.xml
===================================================================
--- trunk/src/dns_commands.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/dns_commands.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "./netperf_docs.dtd" >
+<!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
Modified: trunk/src/dns_config.xml
===================================================================
--- trunk/src/dns_config.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/dns_config.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE netperf SYSTEM "./netperf_docs.dtd" >
+<!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" >
Modified: trunk/src/netperf.c
===================================================================
--- trunk/src/netperf.c 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/netperf.c 2006-03-07 18:13:17 UTC (rev 75)
@@ -1331,6 +1331,14 @@
__func__,
test->id,
test->test_name);
+ fprintf(where,
+ "err_str='%s'\n",
+ test->err_str);
+ fprintf(where,
+ "err_no=%d\t%s\n",
+ test->err_no,
+ npe_to_str(test->err_no));
+
fflush(where);
break;
}
@@ -1343,7 +1351,7 @@
get_expiration_time(&delta_time,&abstime);
prc = pthread_cond_timedwait(h->condition, h->hash_lock, &abstime);
- if (prc != 0) {
+ if (debug && (prc != 0)) {
fprintf(where,
"wait_for_tests_to_initialize: thread conditional wait returned %d\n",prc);
fflush(where);
@@ -2076,11 +2084,10 @@
static int
process_command(xmlNodePtr cmd)
{
- int loc_debug = 1;
int rc = NPE_SUCCESS;
struct netperf_cmd *which_cmd;
- if (debug || loc_debug) {
+ if (debug || want_verbose) {
fprintf(where,"process_command: received %s command\n",cmd->name);
fflush(where);
}
Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/netserver.c 2006-03-07 18:13:17 UTC (rev 75)
@@ -691,6 +691,8 @@
} else {
/* we should never really get here sgb 2005-12-06 */
fprintf(where, "%s entered through some unknown path!!!!\n", __func__);
+ fprintf(where, "netperf->state_req = %d \t netperf->err_rc = %d\n",
+ netperf->state_req, netperf->err_rc);
fflush(where);
exit(-2);
}
Modified: trunk/src/stephen_config.xml
===================================================================
--- trunk/src/stephen_config.xml 2006-03-03 00:59:45 UTC (rev 74)
+++ trunk/src/stephen_config.xml 2006-03-07 18:13:17 UTC (rev 75)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE netperf SYSTEM "./netperf_docs.dtd" >
+<!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" >
More information about the netperf-dev
mailing list