[netperf-dev] netperf4 commit notice r133 - in
branches/glib_migration: . src
raj at netperf.org
raj at netperf.org
Thu Apr 6 14:07:57 PDT 2006
Author: raj
Date: 2006-04-06 14:06:23 -0700 (Thu, 06 Apr 2006)
New Revision: 133
Modified:
branches/glib_migration/README.windows
branches/glib_migration/src/disktest.c
branches/glib_migration/src/disktest.h
branches/glib_migration/src/generic_test.c
branches/glib_migration/src/netconfidence.c
branches/glib_migration/src/netconfidence.h
branches/glib_migration/src/netcpu.h
branches/glib_migration/src/netlib.c
branches/glib_migration/src/netlib.h
branches/glib_migration/src/netlib_hpux.c
branches/glib_migration/src/netlib_linux.c
branches/glib_migration/src/netlib_none.c
branches/glib_migration/src/netmsg.c
branches/glib_migration/src/netmsg.h
branches/glib_migration/src/netperf.c
branches/glib_migration/src/netperf.h
branches/glib_migration/src/netperf_hist.h
branches/glib_migration/src/netserver.c
branches/glib_migration/src/netsysstats.h
branches/glib_migration/src/netsysstats_common.c
branches/glib_migration/src/netsysstats_hpux.c
branches/glib_migration/src/netsysstats_linux.c
branches/glib_migration/src/netsysstats_none.c
branches/glib_migration/src/nettest_bsd.c
branches/glib_migration/src/nettest_bsd.h
branches/glib_migration/src/nettest_dns.c
branches/glib_migration/src/nettest_dns.h
branches/glib_migration/src/nettest_vst.c
branches/glib_migration/src/nettest_vst.h
Log:
Implement a quick kludge for systems where the dynamically loaded library
cannot link directly to routines in th emain program - in this case the
get_confidence routine. This is in theory going to be removed when we
restructure some of the "library" code to go into a shared library of its
own against which netperf, netserver and the test libraries can be linked.
Also try setting the eol-style to "native" to make sure things are a bit
better when going back and forth between Windows and the rest of the world.
Modified: branches/glib_migration/README.windows
===================================================================
--- branches/glib_migration/README.windows 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/README.windows 2006-04-06 21:06:23 UTC (rev 133)
@@ -1,6 +1,7 @@
Netperf4 presently compiles under Windows - that is one can get a
cleanly compiled netperf and netserver binary. The DLLs are still a
-work in progress.
+work in progress. This work is being done in the Windows DDK,
+specifically version 3790.1830.
There are a number of dependencies that have to be satisfied:
Property changes on: branches/glib_migration/src/disktest.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/disktest.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/generic_test.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netconfidence.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netconfidence.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netcpu.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netlib.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netlib.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netlib_hpux.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netlib_linux.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netlib_none.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netmsg.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netmsg.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/netperf.c
===================================================================
--- branches/glib_migration/src/netperf.c 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/src/netperf.c 2006-04-06 21:06:23 UTC (rev 133)
@@ -1642,6 +1642,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;
} else {
/* test set could not be allocated report error */
rc = NPE_MALLOC_FAILED5;
Property changes on: branches/glib_migration/src/netperf.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/netperf.h
===================================================================
--- branches/glib_migration/src/netperf.h 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/src/netperf.h 2006-04-06 21:06:23 UTC (rev 133)
@@ -264,6 +264,10 @@
typedef xmlNodePtr (*TestDecode)(xmlNodePtr statistics);
typedef int (*TestClear)(void *test_info);
typedef xmlNodePtr (*TestStats)(void *test_data);
+/* a kludge until we restructure to have the get_confidence routine in
+ a utility dynamic library that netperf, netserver and test libs can
+ link against. */
+typedef double (*GetConfidence)();
#define NETPERF_MAX_TEST_FUNCTION_NAME 64
#define NETPERF_MAX_TEST_LIBRARY_NAME PATH_MAX
@@ -350,7 +354,7 @@
is called by netperf to decode, accumulate,
and report statistics nodes returned by tests
from this library. */
-
+
xmlNodePtr received_stats; /* a node to which all test_stats received
by netperf from this test are appended as
children */
@@ -424,6 +428,14 @@
struct test_set_instance *next; /* pointer to the next test set instance
in the hash */
+ GetConfidence get_confidence; /* a temporary kludge to allow the
+ formatters in the test libraries
+ to access the get_confidence
+ routine in the main executable.
+ At least until we can create a
+ "utility" library for everyone
+ to link against. */
+
confidence_t confidence; /* confidence parameters structure */
} tset_t;
Property changes on: branches/glib_migration/src/netperf.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netperf_hist.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netserver.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netsysstats.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netsysstats_common.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netsysstats_hpux.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netsysstats_linux.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/netsysstats_none.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/nettest_bsd.c
===================================================================
--- branches/glib_migration/src/nettest_bsd.c 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/src/nettest_bsd.c 2006-04-06 21:06:23 UTC (rev 133)
@@ -150,12 +150,7 @@
static void
-report_test_failure(test, function, err_code, err_string)
- test_t *test;
- char *function;
- int err_code;
- char *err_string;
-{
+report_test_failure(test_t *test, char *function, int err_code, char * err_string) {
if (test->debug) {
fprintf(test->where,"%s: called report_test_failure:",function);
fprintf(test->where,"reporting %s errno = %d\n",err_string,GET_ERRNO);
@@ -2306,7 +2301,7 @@
} /* end of recv_tcp_rr */
-/* This routine implements the TCP request/responce test */
+/* This routine implements the TCP request/response test */
/* (a.k.a. rr) for the sockets interface. It receives its */
/* parameters via the xml node contained in the test structure */
/* output to the standard output. */
@@ -2825,14 +2820,14 @@
NETPERF_DEBUG_ENTRY(test_set->debug,test_set->where);
/* calculate confidence and summary result values */
- confidence = get_confidence(rd->run_time,
- &(test_set->confidence),
- &(rd->ave_time),
- &(temp));
- rd->result_confidence = get_confidence(rd->results,
- &(test_set->confidence),
- &(rd->result_measured_mean),
- &(rd->result_interval));
+ confidence = (test_set->get_confidence)(rd->run_time,
+ &(test_set->confidence),
+ &(rd->ave_time),
+ &(temp));
+ rd->result_confidence = (test_set->get_confidence)(rd->results,
+ &(test_set->confidence),
+ &(rd->result_measured_mean),
+ &(rd->result_interval));
if (test_set->debug) {
fprintf(test_set->where,
"\tresults conf = %.2f%%\tmean = %10f +/- %8f\n",
@@ -2840,7 +2835,7 @@
rd->result_measured_mean, rd->result_interval);
fflush(test_set->where);
}
- rd->cpu_util_confidence = get_confidence(rd->utilization,
+ rd->cpu_util_confidence = (test_set->get_confidence)(rd->utilization,
&(test_set->confidence),
&(rd->cpu_util_measured_mean),
&(rd->cpu_util_interval));
@@ -2851,7 +2846,7 @@
rd->cpu_util_measured_mean, rd->cpu_util_interval);
fflush(test_set->where);
}
- rd->service_demand_confidence = get_confidence(rd->servdemand,
+ rd->service_demand_confidence = (test_set->get_confidence)(rd->servdemand,
&(test_set->confidence),
&(rd->service_demand_measured_mean),
&(rd->service_demand_interval));
Property changes on: branches/glib_migration/src/nettest_bsd.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/nettest_bsd.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/nettest_dns.c
===================================================================
--- branches/glib_migration/src/nettest_dns.c 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/src/nettest_dns.c 2006-04-06 21:06:23 UTC (rev 133)
@@ -2251,11 +2251,11 @@
NETPERF_DEBUG_ENTRY(test_set->debug,test_set->where);
/* calculate confidence and summary result values */
- confidence = get_confidence(rd->run_time,
+ confidence = (test_set->get_confidence)(rd->run_time,
&(test_set->confidence),
&(rd->ave_time),
&(temp));
- rd->result_confidence = get_confidence(rd->results,
+ rd->result_confidence = (test_set->get_confidence)(rd->results,
&(test_set->confidence),
&(rd->result_measured_mean),
&(rd->result_interval));
@@ -2266,7 +2266,7 @@
rd->result_measured_mean, rd->result_interval);
fflush(test_set->where);
}
- rd->cpu_util_confidence = get_confidence(rd->utilization,
+ rd->cpu_util_confidence = (test_set->get_confidence)(rd->utilization,
&(test_set->confidence),
&(rd->cpu_util_measured_mean),
&(rd->cpu_util_interval));
@@ -2277,7 +2277,7 @@
rd->cpu_util_measured_mean, rd->cpu_util_interval);
fflush(test_set->where);
}
- rd->service_demand_confidence = get_confidence(rd->servdemand,
+ rd->service_demand_confidence = (test_set->get_confidence)(rd->servdemand,
&(test_set->confidence),
&(rd->service_demand_measured_mean),
&(rd->service_demand_interval));
Property changes on: branches/glib_migration/src/nettest_dns.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/nettest_dns.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/glib_migration/src/nettest_vst.c
===================================================================
--- branches/glib_migration/src/nettest_vst.c 2006-04-05 23:07:48 UTC (rev 132)
+++ branches/glib_migration/src/nettest_vst.c 2006-04-06 21:06:23 UTC (rev 133)
@@ -2755,34 +2755,37 @@
NETPERF_DEBUG_ENTRY(test_set->debug,test_set->where);
/* calculate confidence and summary result values */
- confidence = get_confidence(rd->xmit_results,
- &(test_set->confidence),
- &(rd->xmit_measured_mean),
- &(rd->xmit_interval));
+ confidence = (test_set->get_confidence)(rd->xmit_results,
+ &(test_set->confidence),
+ &(rd->xmit_measured_mean),
+ &(rd->xmit_interval));
if (test_set->debug || loc_debug) {
fprintf(test_set->where,
"\txmit_results conf = %.2f%%\tmean = %10f +/- %8f\n",
100.0 * confidence, rd->xmit_measured_mean, rd->xmit_interval);
fflush(test_set->where);
}
- confidence = get_confidence(rd->recv_results,
- &(test_set->confidence),
- &(rd->recv_measured_mean),
- &(rd->recv_interval));
+
+ confidence = (test_set->get_confidence)(rd->recv_results,
+ &(test_set->confidence),
+ &(rd->recv_measured_mean),
+ &(rd->recv_interval));
if (test_set->debug || loc_debug) {
fprintf(test_set->where,
"\trecv_results conf = %.2f%%\tmean = %10f +/- %8f\n",
100.0 * confidence, rd->recv_measured_mean, rd->recv_interval);
fflush(test_set->where);
}
- confidence = get_confidence(rd->run_time,
- &(test_set->confidence),
- &(rd->ave_time),
- &(temp));
- rd->result_confidence = get_confidence(rd->results,
- &(test_set->confidence),
- &(rd->result_measured_mean),
- &(rd->result_interval));
+
+ confidence = (test_set->get_confidence)(rd->run_time,
+ &(test_set->confidence),
+ &(rd->ave_time),
+ &(temp));
+
+ rd->result_confidence = (test_set->get_confidence)(rd->results,
+ &(test_set->confidence),
+ &(rd->result_measured_mean),
+ &(rd->result_interval));
if (test_set->debug || loc_debug) {
fprintf(test_set->where,
"\tresults conf = %.2f%%\tmean = %10f +/- %8f\n",
@@ -2790,7 +2793,7 @@
rd->result_measured_mean, rd->result_interval);
fflush(test_set->where);
}
- rd->cpu_util_confidence = get_confidence(rd->utilization,
+ rd->cpu_util_confidence = (test_set->get_confidence)(rd->utilization,
&(test_set->confidence),
&(rd->cpu_util_measured_mean),
&(rd->cpu_util_interval));
@@ -2801,7 +2804,7 @@
rd->cpu_util_measured_mean, rd->cpu_util_interval);
fflush(test_set->where);
}
- rd->service_demand_confidence = get_confidence(rd->servdemand,
+ rd->service_demand_confidence = (test_set->get_confidence)(rd->servdemand,
&(test_set->confidence),
&(rd->service_demand_measured_mean),
&(rd->service_demand_interval));
Property changes on: branches/glib_migration/src/nettest_vst.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/glib_migration/src/nettest_vst.h
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the netperf-dev
mailing list