Skip to content

Commit

Permalink
Merge pull request #54 from GavinB-hpe/UpdateLicenses
Browse files Browse the repository at this point in the history
Update licenses
  • Loading branch information
GavinB-hpe authored Jan 21, 2021
2 parents bcb868b + 0dbda2d commit 3bc455b
Show file tree
Hide file tree
Showing 111 changed files with 3,230 additions and 1,472 deletions.
22 changes: 11 additions & 11 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
This file is here for people to list their contributions to the
netperf benchmark. When you enhance or fix something, put your name
and a description of the what/where/whey/why/how here. If you like,
feel free to include an email address.
feel free to include an email address.

I would like to apologize in advance to anyone I've forgotten to
include.

Rick Jones <raj@cup.hp.com>
Responsible for initial packaging and release of netperf and
"editorial" continuity for subsequent releases.
"editorial" continuity for subsequent releases.

Karen Choy
Code to allow netserver to run as a standalone daemon.
Code to allow netserver to run as a standalone daemon.

Dave Shield <daves@csc.liv.ac.uk>
Wrote the first revision of the netperf and netserver manpages.

Sarr Blumson <sarr@citi.umich.edu>
Fixes for AIX 3.1 and 3.2. Also fixes for Solaris 2.1 without
realizing it ;-)
realizing it ;-)

Jeff Smits <jgs@usl.com>
Fixes for TCP_RR and UDP_RR on sytems with an htonl that is not a no-op.
Expand All @@ -28,7 +28,7 @@ Example code for DLPI tests.

Several Folks
Code to tell SunOS 4 to *not* restart system calls on receipt of a
signal.
signal.

Fore Systems Inc.
Manpages for the FORE API and question answering
Expand All @@ -52,7 +52,7 @@ His prompting finally got me off my whatever to put the confidence
interval stuff from the guys at IBM into netperf

Peter Skopp pds@cs.columbia.edu
Fixes to make netperf more secure.
Fixes to make netperf more secure.

Tom Wilson <tcwilson@newbridge.com>
A fix to send_udp_rr to correct bogus throughput values.
Expand Down Expand Up @@ -81,7 +81,7 @@ Changes to make netperf more profiling friendly
Kris Corwin
discovery of a debug statement outside of if (debug) that may have
been the cause of all the nasty connection refused errors in random
UDP_RR tests...
UDP_RR tests...

Charles Harris
Initial prototype of the TCP_SENDFILE test support
Expand All @@ -101,7 +101,7 @@ initial mods for sendfile() under Linux
Fabrice Bacchella
for pointing-out that Solaris 9 has a copy of Linux sendfile()

Andrew Gallatin
Andrew Gallatin
for assistance with the FreeBSD sysctl() stuff, and later making it
calibration-free
fixes to configure to recognize Solaris 11
Expand All @@ -113,7 +113,7 @@ Mark Cooper
pointing-out the need for -lresolv when compiling -DDO_DNS on RedHat
7.1

Carl Mascott
Carl Mascott
finding some cut-and-paste erors in create_data_socket error logging

Fabrice Bacchella
Expand Down Expand Up @@ -151,7 +151,7 @@ Access to AIX for initial porting of netperf 2.4.0
James Carlson
Assistance finding the right magic to compile SCTP on Solaris 10.

Gavin
Gavin
Pointers on Solaris 10 Microstate accounting.

Brent Draney
Expand Down Expand Up @@ -228,7 +228,7 @@ Fixes for *BSD CPU util.

Adam Bidema
Fixes for launching netserver children when the path to netserver.exe
is very long.
is very long.

Gisle Vanem
MingW cnd MSDOS (djgpp) cleanups.
Expand Down
62 changes: 20 additions & 42 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,43 +1,21 @@


Copyright (C) 1993 Hewlett-Packard Company
ALL RIGHTS RESERVED.

The enclosed software and documentation includes copyrighted works
of Hewlett-Packard Co. For as long as you comply with the following
limitations, you are hereby authorized to (i) use, reproduce, and
modify the software and documentation, and to (ii) distribute the
software and documentation, including modifications, for
non-commercial purposes only.

1. The enclosed software and documentation is made available at no
charge in order to advance the general development of
high-performance networking products.

2. You may not delete any copyright notices contained in the
software or documentation. All hard copies, and copies in
source code or object code form, of the software or
documentation (including modifications) must contain at least
one of the copyright notices.

3. The enclosed software and documentation has not been subjected
to testing and quality control and is not a Hewlett-Packard Co.
product. At a future time, Hewlett-Packard Co. may or may not
offer a version of the software and documentation as a product.

4. THE SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS".
HEWLETT-PACKARD COMPANY DOES NOT WARRANT THAT THE USE,
REPRODUCTION, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR
DOCUMENTATION WILL NOT INFRINGE A THIRD PARTY'S INTELLECTUAL
PROPERTY RIGHTS. HP DOES NOT WARRANT THAT THE SOFTWARE OR
DOCUMENTATION IS ERROR FREE. HP DISCLAIMS ALL WARRANTIES,
EXPRESS AND IMPLIED, WITH REGARD TO THE SOFTWARE AND THE
DOCUMENTATION. HP SPECIFICALLY DISCLAIMS ALL WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

5. HEWLETT-PACKARD COMPANY WILL NOT IN ANY EVENT BE LIABLE FOR ANY
DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
(INCLUDING LOST PROFITS) RELATED TO ANY USE, REPRODUCTION,
MODIFICATION, OR DISTRIBUTION OF THE SOFTWARE OR DOCUMENTATION.

# Copyright 2021 Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
#
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
# USE OR OTHER DEALINGS IN THE SOFTWARE.

20 changes: 20 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# Copyright 2021 Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
#
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
# USE OR OTHER DEALINGS IN THE SOFTWARE.

AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
SUBDIRS = src doc
Expand Down
19 changes: 6 additions & 13 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@


BE SURE TO READ THE MANUAL. EVEN THOUGH IT MAY BE OUTDATED.

This is a brief readme file for the netperf TCP/UDP/sockets/etc
Expand All @@ -10,19 +11,9 @@ ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ .

BE SURE TO READ THE MANUAL. EVEN THOUGH IT MAY BE OUTDATED.

There is a COPYRIGHT file included. It is called COPYING because that
is what autosomethingorother wanted. It is based on what the HP Legal
Eagles gave me. I am not sure if the legalese is clear, but the intent
is to say "Here is a benchmark. Use it in good health. Pass it along,
port it, enhance it. You didn't pay for this tool, so don't expect it
to be perfect ;-)" The rest of it is there to keep the layers happy...

While the copyright is pretty much in spirit an "open source" one, it
is not in letter - I never took the time to try to get it approved.
If you feel strongly about the license of the code you use and want
something under the GPL, consider netperf4:
This version of netperf has been opensourced by Hewlett Packard Enterprise
using the MIT license.

http://www.netperf.org/svn/netperf4/trunk

Feel free to report netperf results in public forums, but please be
excruciatingly complete in your description of the test envorinment.
Expand All @@ -43,7 +34,9 @@ If you run into severe difficulties, or are just feeling chatty,
please feel free to drop some email to me - Rick Jones
<rick.jones2@hp.com>. Be sure to include a meaningful subject lines.

happy benchmarking,
happy benchmarking,
rick jones

BE SURE TO READ THE MANUAL. EVEN THOUGH IT MAY BE OUTDATED.

Licenses updated.
2 changes: 1 addition & 1 deletion README.hpux
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ where interrupt cycles go missing. SOOO, since there is an accurate
way to know what the total number of cycles should have been over the
interval, and we know (ass-u-me) that the idle cycle counter is good
(since the pstat mechanism has tested that one OK), we will take the
ratio of idle to total cycles to compute CPU util.
ratio of idle to total cycles to compute CPU util.

We will still calculate fractions for user, kernel and interrupt, and
report them in debug (-d) output, but with a warning for interrupt
Expand Down
18 changes: 9 additions & 9 deletions README.ovms
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ netserver accordingly. The version that ships is setup for where Rick
Jones did his initial porting work and most likely is not apropriate
for you :)

$ define sys$output sys$sysroot:[netperf]hello_service.log
$ define sys$error sys$sysroot:[netperf]hello_service.log
$ run sys$sysroot:[netperf]netserver.exe
$ define sys$output sys$sysroot:[netperf]hello_service.log
$ define sys$error sys$sysroot:[netperf]hello_service.log
$ run sys$sysroot:[netperf]netserver.exe

Then it will be necessary to "define" netperf (netserver) as an
auxilliary service. This will need to be customized as apropriate for
your system

$ tcpip set service netserver -
_$ /port=12865 -
_$ /protocol=tcp -
_$ /user=system -
$ tcpip set service netserver -
_$ /port=12865 -
_$ /protocol=tcp -
_$ /user=system -
_$ /limit=48 -
_$ /process_name=netserver -
_$ /file=sys$sysroot:[netperf]netserver_run.com
_$ /process_name=netserver -
_$ /file=sys$sysroot:[netperf]netserver_run.com

And then it is necessary to enable the service:

Expand Down
30 changes: 15 additions & 15 deletions Release_Notes
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ These are the Release Notes for Revision 2.5.0 of netperf:
UDP_STREAM test when the socket buffer size is larger than the
TX queue. Provided by Andrew Gallatin.

*) Fix the configure script to know it does not have to look for an
*) Fix the configure script to know it does not have to look for an
SCTP library on FreeBSD 8.X

*) The BSD and "omni" tests now have a test-specific -R option which
Expand Down Expand Up @@ -248,7 +248,7 @@ Things changed in this release:
to name that person when told it is OK :)

*) Fixes from Adam Bidema for launching netserver children when the
path to netserver.exe is very long.
path to netserver.exe is very long.

*) For the first time, netperf2 has a dependency, albeit optional, on
another non-base-os bit of code - libsmbios under Linux. It will
Expand Down Expand Up @@ -454,7 +454,7 @@ Things changed in this release:

*) The nettest_ipv6.* files are no longer included in the source
tar/zip file. IPv6 functionality has been subsumed into the
nettest_bsd.* files for some time now.
nettest_bsd.* files for some time now.

*) Use a higher resolution "time" source for HISTOGRAM support under
Windows, courtesy of Spencer Frink. Prior to this it had no better
Expand All @@ -467,7 +467,7 @@ Things changed in this release:
*) A bug fix for buffer filling from a file to properly advance the
buffer pointer when the file is smaller than the send buffer.

*) Enable certain UDP tests which previously used unconnected sockets
*) Enable certain UDP tests which previously used unconnected sockets
to use connected sockets. Courtesy of Shilpi Agarwal.

*) The OSX CPU utilization code actually gets put into the tarball in
Expand Down Expand Up @@ -515,7 +515,7 @@ Things changed in this release:
setups the mapping only knows about retrieving actual CPU ids under
HP-UX.

*) The netcpu_sysctl method becomes calibration-free, courtesy of
*) The netcpu_sysctl method becomes calibration-free, courtesy of
Andrew Gallatin

These are the Release Notes for Revision 2.4.1 of netperf:
Expand All @@ -539,7 +539,7 @@ Things changed in this release:
expense of an EXTREME increase in CPU utilization. (To the extent
I'm considering disabling measurement of local CPU utilization when
that mode is enabled, and bursts have been requested - your
feedback on that topic would be most appreciated)
feedback on that topic would be most appreciated)

If only --enable-intervals is used with configure, the old set the
interval timer and wait method is still used.
Expand Down Expand Up @@ -697,7 +697,7 @@ Things changed in this release:
*) Netperf now uses getaddrinfo() to resolve hostnames and IP
addresses. A replacement getaddrinfo() is provided for those
platforms where the configure script cannot tell that getaddrinfo
is present.
is present.

There are cases where a host's getaddrinfo call may return results
that ignore the hints for protocol. Netperf catches these and
Expand Down Expand Up @@ -796,7 +796,7 @@ Things changed in this release:
*) DLPI tests are compiled-in with --enable-dlpi=yes at configure
time.

*) XTI tests are compiled-in with --enable-xti=yes at configure time.
*) XTI tests are compiled-in with --enable-xti=yes at configure time.

Things not changed in this release:

Expand Down Expand Up @@ -866,17 +866,17 @@ Things changed in this release
TEN_USEC row and renames TENTH_MSEC to HUNDRED_USEC. If you want
the old behaviour add -DOLD_HISTOGRAM to CFLAGS.

*) Add missing '!' in the recv_udp*_stream so we recognize the end of
*) Add missing '!' in the recv_udp*_stream so we recognize the end of
a timed test correctly.

*) Replace "||" with "&&" to fix an infinite loop in
recv_tcp_conn_rr() most likely introduced in 2.2pl5.
recv_tcp_conn_rr() most likely introduced in 2.2pl5.

*) Code has been added to kludge around the bug in Linux getsockopt()
where it almost always returns twice the value for which one
asks unlike virtually every other stack on the face of the
planet. This was doing some unpleasant things to tests in which
confidence intervals were requested.
confidence intervals were requested.

Things not changed in this release

Expand Down Expand Up @@ -974,11 +974,11 @@ Things changed in this release
initial prototype.

*) The Fore ATM API and HiPPI tests have been dropped from the
distribution.
distribution.

Things I would have liked to have changed, but did not have time for:

*) Conversion of the source and makefile to use the GNU configure/autoconf
*) Conversion of the source and makefile to use the GNU configure/autoconf
utility to make it easier for folks to build by not having to edit
makefiles... You will notice that I have started to switch from
"DO_MUMBLE" to "HAVE_MUMBLE"
Expand Down Expand Up @@ -1016,15 +1016,15 @@ These are the Release Notes for the 2.1 revision of netperf:
Things Changed in this release:

*) The XTI (Version 2 of the spec) tests are now documented in the
manual.
manual.

*) The TCP_CRR (Connect Request/Response) test is now documented in
the manual, including a description of how it mimics the behaviour
of http (the protocol underlying the WWW).

*) Support for for Windows NT 3.51 OS in the BSD Sockets tests (ok, so
they are really Winsock in that case :). Other test suites may be
ported as required/desired/appropriate.
ported as required/desired/appropriate.

*) Tests for TCP and UDP, using the IPv6 extensions to BSD sockets are
included in this release. They are included by adding -DUSE_IPv6 to
Expand Down
Loading

0 comments on commit 3bc455b

Please sign in to comment.