From d768f73dcef0741ffeb69b467fc7759d78d99b10 Mon Sep 17 00:00:00 2001 From: Jon Dugan Date: Wed, 2 Dec 2009 02:08:47 +0000 Subject: [PATCH] more cleanup and rearrangement --- AUTHORS | 18 ++++++++++ COPYING | 40 --------------------- ChangeLog | 73 -------------------------------------- src/LICENSE.txt => LICENSE | 0 README | 26 ++++++-------- src/TODO.txt => TODO | 0 src/AUTHORS | 54 ---------------------------- src/README.txt | 15 -------- 8 files changed, 29 insertions(+), 197 deletions(-) delete mode 100644 COPYING delete mode 100644 ChangeLog rename src/LICENSE.txt => LICENSE (100%) rename src/TODO.txt => TODO (100%) delete mode 100644 src/AUTHORS delete mode 100644 src/README.txt diff --git a/AUTHORS b/AUTHORS index 924e5dd..640ffec 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,21 @@ + +iperf3 is a complete rewrite of iperf2, with a goal of making the +code smaller and easier to maintain, and to support a client library +verion of the functionality. + + +Main designer: Jon Dugan, ESnet +Original implementation: Kaustubh Prabhu (summer student) +major overall: Brian Tierney, ESnet + + +------------------------------------------------- + +iperf3 contains some orginal code from iperf2. + +Here are the authors of iperf2. + + Mark Gates Alex Warshavsky diff --git a/COPYING b/COPYING deleted file mode 100644 index 9a8683d..0000000 --- a/COPYING +++ /dev/null @@ -1,40 +0,0 @@ -Copyright (c) 1999-2007, The Board of Trustees of the University of Illinois -All Rights Reserved. - -Iperf performance test -Mark Gates -Ajay Tirumala -Jim Ferguson -Jon Dugan -Feng Qin -Kevin Gibbs -John Estabrook -National Laboratory for Applied Network Research -National Center for Supercomputing Applications -University of Illinois at Urbana-Champaign -http://www.ncsa.uiuc.edu - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software (Iperf) 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: - - -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimers. - -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimers in the documentation and/or -other materials provided with the distribution. - -Neither the names of the University of Illinois, NCSA, nor the names of its -contributors may be used to endorse or promote products derived from this -Software without specific prior written permission. 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 CONTIBUTORS 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. diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index ca26911..0000000 --- a/ChangeLog +++ /dev/null @@ -1,73 +0,0 @@ -2008-05-09 Gerrit Renker - -* replace costly gettimeofday() with nanonsleep() See: -https://sourceforge.net/tracker/index.php?func=detail&aid=1940009&group_id=128336&atid=711373 - -2008-05-09 Jon Dugan - -* change currLen to unsigned to squelch warning generated by Nathan's patch - -2008-05-09 Nathan Jones - -* prevent underflow when the amount of data to be transmitted (-n) is not a -multiple of the buffer size (-l) Patch: -https://sourceforge.net/tracker/index.php?func=detail&aid=1943432&group_id=128336&atid=711373 - -2008-04-08 Jon Dugan - -* print report headers only once -* use appropriate report header for UDP tests - -2008-04-07 Jon Dugan - -* Add man page to autoconf goo -* Bump the version in autoconf -* Add missing LICENSE file - -2008-04-04 Jon Dugan - -* Incorporate help string fixes from Claus Klein -* Incorporate patch to restore header line in stats output from Claus Klein -* Reworked help string code to remove redundancy -* Add initial man page - -2008-03-19 Stephen Hemminger - -* Add new option to allow selecting the sender congestion control -algorithm. This is a Linux specific extension useful for testing -other congestion control algorithms. - -2008-03-19 Stephen Hemminger - -* Use sched_yield rather than usleep(0) as it behaves better on Linux - -2008-03-12 Jon Dugan - -* Rework Client::RunTCP so to update the stats for every packet if -i is set. -If -i is not set then the stats are only updated at the end of the run. This -was fallout of Andrew's patch. - -* Added -Wall to CXXFLAGS and CFLAGS. This generated a lot of noise in the -autotools generated files. - -* Added initial AUTHORS file. This is incomplete, but it's a start. - -2008-03-12 Andrew Gallatin - -* Rework threading. This is done by having a condition variable for the reporting -thread rather than using sched_yield and/or usleep. - -* Address performance issues on non Linux systems by avoiding system calls -which are expensive on platforms other than Linux. - -* Fixes from FreeBSD ports: max_size_t is now 64 bits and not Iperf does not -exit on ENOBUFS. - -2007-10-01 JSE - -* ChangeLog file added - -2007-10-05 JSE - -* Thread.c (thread_stop): "pthread_cancel (oldTID )" should be -"pthread_cancel (thread->mTID)" diff --git a/src/LICENSE.txt b/LICENSE similarity index 100% rename from src/LICENSE.txt rename to LICENSE diff --git a/README b/README index 3b93902..d774f0e 100644 --- a/README +++ b/README @@ -1,19 +1,15 @@ -This is Iperf v2.0.0, a tool for measuring Internet bandwidth performance. -See the doc directory for more documentation. -Briefly: - ./configure -- configure for your machine - make -- compile Iperf - make install -- install Iperf, if desired +This is iperf3, a tool for measuring Internet bandwidth performance. - iperf -s (on machine "foo.bar.edu") - iperf -c foo.bar.edu (on some other machine) - iperf -h (for help screen) - iperf -v (for version information) +iperf3 should work on Linux, FreeBSD, and Mac OSX -Copyright 1999, 2000, 2001, 2002, 2003, 2004 -The Board of Trustees of the University of Illinois -All rights reserved -See UI License (doc/ui_license.html) for complete details. +Prerequisites: + libuuid: this is not installed by default for Debian/Ubuntu Systems + to install: apt-get install uuid-dev + +To build, just type 'make' (or 'gmake' on FreeBSD) + +For more information see: http://code.google.com/p/iperf/ + +Note that iperf3 is NOT backwards compatible with iperf2. -$Id: README,v 1.1.1.1 2004/05/18 01:50:44 kgibbs Exp $ diff --git a/src/TODO.txt b/TODO similarity index 100% rename from src/TODO.txt rename to TODO diff --git a/src/AUTHORS b/src/AUTHORS deleted file mode 100644 index 640ffec..0000000 --- a/src/AUTHORS +++ /dev/null @@ -1,54 +0,0 @@ - -iperf3 is a complete rewrite of iperf2, with a goal of making the -code smaller and easier to maintain, and to support a client library -verion of the functionality. - - -Main designer: Jon Dugan, ESnet -Original implementation: Kaustubh Prabhu (summer student) -major overall: Brian Tierney, ESnet - - -------------------------------------------------- - -iperf3 contains some orginal code from iperf2. - -Here are the authors of iperf2. - - -Mark Gates -Alex Warshavsky - - * original authors - -Ajay Tirumala - - * general improvements - -Jim Ferguson - - * Project management - -Jon Dugan - - * Project maintainer and release coordinator - * various patches and autoconf fixes, general maintenance - -Feng Qin -Kevin Gibbs - - * windows porting work - -John Estabrook - -Andrew Gallatin - * threading fix and non Linux performance improvements - -Stephen Hemminger - * Linux congestion control selection and theading improvements - -Nathan Jones - * patch for underflow when value specified in -n is not a multiple of -l - -Gerrit Renker - * replace costly gettimeofday() with nanonsleep() diff --git a/src/README.txt b/src/README.txt deleted file mode 100644 index d774f0e..0000000 --- a/src/README.txt +++ /dev/null @@ -1,15 +0,0 @@ - -This is iperf3, a tool for measuring Internet bandwidth performance. - -iperf3 should work on Linux, FreeBSD, and Mac OSX - -Prerequisites: - libuuid: this is not installed by default for Debian/Ubuntu Systems - to install: apt-get install uuid-dev - -To build, just type 'make' (or 'gmake' on FreeBSD) - -For more information see: http://code.google.com/p/iperf/ - -Note that iperf3 is NOT backwards compatible with iperf2. -