[netperf-dev] netperf2 commit notice r102 - in trunk: . doc src
raj at netperf.org
raj at netperf.org
Wed Mar 7 11:10:16 PST 2007
Author: raj
Date: 2007-03-07 11:10:15 -0800 (Wed, 07 Mar 2007)
New Revision: 102
Modified:
trunk/Release_Notes
trunk/doc/netperf.info
trunk/src/netsh.c
Log:
fix -I to include an implicit -i as necessary
Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes 2007-02-26 22:29:03 UTC (rev 101)
+++ trunk/Release_Notes 2007-03-07 19:10:15 UTC (rev 102)
@@ -1,3 +1,11 @@
+These are the Release Notes leading-up to Revision 2.4.4 of netperf:
+
+Things changed in this release:
+
+*) Setting -I without setting -i will now implicitly set the iteration
+ minimum aand maximums as if a -i 10,3 were set. Also, some further
+ sanity checking on the bounds for each is made.
+
These are the Release Notes for Revision 2.4.3 of netperf:
Things changed in this release:
Modified: trunk/doc/netperf.info
===================================================================
--- trunk/doc/netperf.info 2007-02-26 22:29:03 UTC (rev 101)
+++ trunk/doc/netperf.info 2007-03-07 19:10:15 UTC (rev 102)
@@ -41,7 +41,8 @@
* Address Resolution::
* Enhancing Netperf::
* Netperf4::
-* Index:: Index for this manual.
+* Concept Index::
+* Option Index::
--- The Detailed Node Listing ---
@@ -288,8 +289,13 @@
For convenience and ease of remembering, a link to the download site
is provided via the NetperfPage (http://www.netperf.org/)
- Those wishing to be on the bleeding edge of netperf development can
-grab the top of trunk from the netperf subversion repository
+ The bits corresponding to each discrete release of netperf are
+tagged (http://www.netperf.org/svn/netperf2/tags) for retrieval via
+subversion. For example, there is a tag for the first version
+corresponding to this version of the manual - netperf 2.4.3
+(http://www.netperf.org/svn/netperf2/tags/netperf-2.4.3). Those
+wishing to be on the bleeding edge of netperf development can use
+subversion to grab the top of trunk
(http://www.netperf.org/svn/netperf2/trunk).
There are likely other places around the Internet from which one can
@@ -733,6 +739,10 @@
conjunction with the `-w' option it can cause the rate at which
data is sent to be "paced."
+`-B <string>'
+ This option will cause `<string>' to be appended to the brief (see
+ -P) output of netperf.
+
`-c [rate]'
This option will ask that CPU utilization and service demand be
calculated for the local system. For those CPU utilization
@@ -885,6 +895,10 @@
If netperf determines that the desired confidence intervals have
not been met, it emits a noticeable warning.
+ The total test time will be somewhere between the minimum and
+ maximum number of iterations multiplied by the test length
+ supplied by the `-l' option.
+
`-l testlen'
This option controls the length of any one iteration of the
requested test. A positive value for TESTLEN will run each
@@ -901,6 +915,10 @@
of the link(s) over which the data connection passes, or those
tests where there may be non-trivial numbers of retransmissions.
+ If confidence intervals are enabled via either `-I' or `-i' the
+ total length of the netperf test will be somewhere between the
+ minimum and maximum iteration count multiplied by TESTLEN.
+
`-L <optionspec>'
This option is identical to the `-H' option with the difference
being it sets the _local_ hostname/IP and/or address family
@@ -2622,7 +2640,7 @@
the changes incorporated :)
-File: netperf.info, Node: Netperf4, Next: Index, Prev: Enhancing Netperf, Up: Top
+File: netperf.info, Node: Netperf4, Next: Concept Index, Prev: Enhancing Netperf, Up: Top
12 Netperf4
***********
@@ -2643,72 +2661,191 @@
(http://www.netperf.org/svn/netperf4/trunk).
-File: netperf.info, Node: Index, Prev: Netperf4, Up: Top
+File: netperf.info, Node: Concept Index, Next: Option Index, Prev: Netperf4, Up: Top
-Index
-*****
+Concept Index
+*************
[index ]
* Menu:
-* chapter, Installing Netperf: Installing Netperf. (line 6)
-* chapter, Introduction: Introduction. (line 6)
-* chapter, The Design of Netperf: The Design of Netperf. (line 6)
+* Aggregate Performance: Using Netperf to Measure Aggregate Performance.
+ (line 3)
+* Bandwidth Limitation: Installing Netperf Bits.
+ (line 41)
+* Connection Latency: TCP_CC. (line 3)
+* CPU Utilization: The Design of Netperf.
+ (line 35)
+* Design of Netperf: The Design of Netperf.
+ (line 6)
+* Installation: Installing Netperf. (line 6)
+* Introduction: Introduction. (line 6)
+* Latency, Connection Establishment <1>: XTI_TCP_CRR. (line 3)
+* Latency, Connection Establishment <2>: XTI_TCP_CC. (line 3)
+* Latency, Connection Establishment <3>: TCP_CRR. (line 3)
+* Latency, Connection Establishment: TCP_CC. (line 3)
+* Latency, Request-Response <1>: SCTP_RR. (line 3)
+* Latency, Request-Response <2>: DLCO_RR. (line 3)
+* Latency, Request-Response <3>: DLCL_RR. (line 3)
+* Latency, Request-Response <4>: XTI_UDP_RR. (line 3)
+* Latency, Request-Response <5>: XTI_TCP_CRR. (line 3)
+* Latency, Request-Response <6>: XTI_TCP_RR. (line 3)
+* Latency, Request-Response <7>: UDP_RR. (line 3)
+* Latency, Request-Response <8>: TCP_CRR. (line 3)
+* Latency, Request-Response: TCP_RR. (line 3)
+* Limiting Bandwidth <1>: UDP_STREAM. (line 9)
+* Limiting Bandwidth: Installing Netperf Bits.
+ (line 41)
+* Measuring Latency: TCP_RR. (line 3)
+* Packet Loss: UDP_RR. (line 3)
+* Port Reuse: TCP_CC. (line 13)
+* TIME_WAIT: TCP_CC. (line 13)
+
+File: netperf.info, Node: Option Index, Prev: Concept Index, Up: Top
+Option Index
+************
+
+ [index ]
+* Menu:
+
+* --enable-burst, Configure: Using Netperf to Measure Aggregate Performance.
+ (line 3)
+* --enable-cpuutil, Configure: Installing Netperf Bits.
+ (line 22)
+* --enable-dlpi, Configure: Installing Netperf Bits.
+ (line 28)
+* --enable-histogram, Configure: Installing Netperf Bits.
+ (line 41)
+* --enable-intervals, Configure: Installing Netperf Bits.
+ (line 41)
+* --enable-sctp, Configure: Installing Netperf Bits.
+ (line 28)
+* --enable-unix, Configure: Installing Netperf Bits.
+ (line 28)
+* --enable-xti, Configure: Installing Netperf Bits.
+ (line 28)
+* -4, Global: Global Options. (line 379)
+* -4, Test-specific <1>: Options Common to TCP UDP and SCTP _RR tests.
+ (line 84)
+* -4, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 106)
+* -6 Test-specific: Options Common to TCP UDP and SCTP _RR tests.
+ (line 90)
+* -6, Global: Global Options. (line 388)
+* -6, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 112)
+* -A, Global: Global Options. (line 18)
+* -a, Global: Global Options. (line 6)
+* -B, Global: Global Options. (line 29)
+* -b, Global: Global Options. (line 22)
+* -C, Global: Global Options. (line 42)
+* -c, Global: Global Options. (line 33)
+* -D, Global: Global Options. (line 56)
+* -d, Global: Global Options. (line 47)
+* -F, Global: Global Options. (line 74)
+* -f, Global: Global Options. (line 67)
+* -H, Global: Global Options. (line 92)
+* -h, Global: Global Options. (line 88)
+* -H, Test-specific: Options Common to TCP UDP and SCTP _RR tests.
+ (line 17)
+* -h, Test-specific <1>: Options Common to TCP UDP and SCTP _RR tests.
+ (line 10)
+* -h, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 10)
+* -i, Global: Global Options. (line 168)
+* -I, Global: Global Options. (line 127)
+* -L, Global: Global Options. (line 209)
+* -l, Global: Global Options. (line 189)
+* -L, Test-specific <1>: Options Common to TCP UDP and SCTP _RR tests.
+ (line 26)
+* -L, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 25)
+* -M, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 48)
+* -m, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 32)
+* -N, Global: Global Options. (line 234)
+* -n, Global: Global Options. (line 221)
+* -O, Global: Global Options. (line 279)
+* -o, Global: Global Options. (line 270)
+* -P, Global: Global Options. (line 303)
+* -p, Global: Global Options. (line 283)
+* -P, Test-specific <1>: Options Common to TCP UDP and SCTP _RR tests.
+ (line 33)
+* -P, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 61)
+* -r, Test-specific: Options Common to TCP UDP and SCTP _RR tests.
+ (line 36)
+* -S Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 85)
+* -S, Test-specific: Options Common to TCP UDP and SCTP _RR tests.
+ (line 66)
+* -s, Test-specific <1>: Options Common to TCP UDP and SCTP _RR tests.
+ (line 48)
+* -s, Test-specific: Options common to TCP UDP and SCTP tests.
+ (line 64)
+* -t, Global: Global Options. (line 312)
+* -v, Global: Global Options. (line 341)
+* -W, Global: Global Options. (line 370)
+* -w, Global: Global Options. (line 363)
+
+
Tag Table:
Node: Top441
-Node: Introduction2722
-Node: Conventions5183
-Node: Installing Netperf6946
-Node: Getting Netperf Bits8500
-Node: Installing Netperf Bits10026
-Node: Verifying Installation16490
-Node: The Design of Netperf17194
-Node: CPU Utilization18776
-Node: Global Command-line Options27389
-Node: Command-line Options Syntax27928
-Node: Global Options29310
-Node: Using Netperf to Measure Bulk Data Transfer48123
-Node: Issues in Bulk Transfer48788
-Node: Options common to TCP UDP and SCTP tests52317
-Node: TCP_STREAM58305
-Node: TCP_MAERTS62073
-Node: TCP_SENDFILE63306
-Node: UDP_STREAM65622
-Node: XTI_TCP_STREAM69058
-Node: XTI_UDP_STREAM69703
-Node: SCTP_STREAM70348
-Node: DLCO_STREAM71048
-Node: DLCL_STREAM73021
-Node: STREAM_STREAM73895
-Node: DG_STREAM74741
-Node: Using Netperf to Measure Request/Response75410
-Node: Issues in Request/Response77331
-Node: Options Common to TCP UDP and SCTP _RR tests79337
-Node: TCP_RR84009
-Node: TCP_CC86353
-Node: TCP_CRR88550
-Node: UDP_RR89596
-Node: XTI_TCP_RR91617
-Node: XTI_TCP_CC92200
-Node: XTI_TCP_CRR92366
-Node: XTI_UDP_RR92534
-Node: DLCL_RR93111
-Node: DLCO_RR93264
-Node: SCTP_RR93416
-Node: Using Netperf to Measure Aggregate Performance93552
-Node: Running Concurrent Netperf Tests94387
-Node: Using --enable-burst98279
-Node: Using Netperf to Measure Bidirectional Transfer104464
-Node: Bidirectional Transfer with Concurrent Tests105537
-Node: Bidirectional Transfer with TCP_RR107403
-Node: Other Netperf Tests109937
-Node: CPU rate calibration110383
-Node: Address Resolution112724
-Node: Enhancing Netperf114700
-Node: Netperf4115937
-Node: Index116838
+Node: Introduction2702
+Node: Conventions5163
+Node: Installing Netperf6926
+Node: Getting Netperf Bits8480
+Node: Installing Netperf Bits10298
+Node: Verifying Installation16762
+Node: The Design of Netperf17466
+Node: CPU Utilization19048
+Node: Global Command-line Options27661
+Node: Command-line Options Syntax28200
+Node: Global Options29582
+Node: Using Netperf to Measure Bulk Data Transfer48878
+Node: Issues in Bulk Transfer49543
+Node: Options common to TCP UDP and SCTP tests53072
+Node: TCP_STREAM59060
+Node: TCP_MAERTS62828
+Node: TCP_SENDFILE64061
+Node: UDP_STREAM66377
+Node: XTI_TCP_STREAM69813
+Node: XTI_UDP_STREAM70458
+Node: SCTP_STREAM71103
+Node: DLCO_STREAM71803
+Node: DLCL_STREAM73776
+Node: STREAM_STREAM74650
+Node: DG_STREAM75496
+Node: Using Netperf to Measure Request/Response76165
+Node: Issues in Request/Response78086
+Node: Options Common to TCP UDP and SCTP _RR tests80092
+Node: TCP_RR84764
+Node: TCP_CC87108
+Node: TCP_CRR89305
+Node: UDP_RR90351
+Node: XTI_TCP_RR92372
+Node: XTI_TCP_CC92955
+Node: XTI_TCP_CRR93121
+Node: XTI_UDP_RR93289
+Node: DLCL_RR93866
+Node: DLCO_RR94019
+Node: SCTP_RR94171
+Node: Using Netperf to Measure Aggregate Performance94307
+Node: Running Concurrent Netperf Tests95142
+Node: Using --enable-burst99034
+Node: Using Netperf to Measure Bidirectional Transfer105219
+Node: Bidirectional Transfer with Concurrent Tests106292
+Node: Bidirectional Transfer with TCP_RR108158
+Node: Other Netperf Tests110692
+Node: CPU rate calibration111138
+Node: Address Resolution113479
+Node: Enhancing Netperf115455
+Node: Netperf4116692
+Node: Concept Index117601
+Node: Option Index119991
End Tag Table
Modified: trunk/src/netsh.c
===================================================================
--- trunk/src/netsh.c 2007-02-26 22:29:03 UTC (rev 101)
+++ trunk/src/netsh.c 2007-03-07 19:10:15 UTC (rev 102)
@@ -1,5 +1,5 @@
char netsh_id[]="\
-@(#)netsh.c (c) Copyright 1993-2004 Hewlett-Packard Company. Version 2.4.3";
+@(#)netsh.c (c) Copyright 1993-2007 Hewlett-Packard Company. Version 2.4.3pre";
/****************************************************************/
@@ -561,9 +561,15 @@
if (arg2[0] ) {
iteration_min = convert(arg2);
}
+ /* if the iteration_max is < iteration_min make iteration_max
+ equal iteration_min */
+ if (iteration_max < iteration_min) iteration_max = iteration_min;
+ /* limit minimum to 3 iterations */
+ if (iteration_max < 3) iteration_max = 3;
+ if (iteration_min < 3) iteration_min = 3;
/* limit maximum to 30 iterations */
- if(iteration_max>30) iteration_max=30;
- if(iteration_min>30) iteration_min=30;
+ if (iteration_max > 30) iteration_max = 30;
+ if (iteration_min > 30) iteration_min = 30;
break;
case 'I':
/* set the confidence level (95 or 99) and width */
@@ -578,6 +584,13 @@
if (arg2[0] ) {
interval = (double) convert(arg2)/100;
}
+ /* make sure that iteration_min and iteration_max are at least
+ at a reasonable default value. if a -i option has previously
+ been parsed, these will no longer be 1, so we can check
+ against 1 */
+ if (iteration_min == 1) iteration_min = 3;
+ if (iteration_max == 1) iteration_max = 10;
+
break;
case 'k':
/* local dirty and clean counts */
More information about the netperf-dev
mailing list