Recent changes (master)
Subsystems (2)
The following changes since commit 11fd6aa8569c55c8488020e4e315d550d121ff79:
Fix 'nice' parameter range: should be -20 to 19, not -19 to 20. (2017-10-26 15:31:35 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to e2b7f9fb0d105de217fe97817b47c594232ac14f:
Merge branch 'misc' of https://github.com/sitsofe/fio (2017-10-30 09:05:43 -0600)
----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'misc' of https://github.com/sitsofe/fio
Sitsofe Wheeler (9):
steadystate_tests.py: fix up usage comment
tools: use /usr/bin/python2.7 as the interpreter
fio: fix interpreter lines
doc: fix groff line that started with a dot
COPYING: update license file
fio: update FSF address
doc: IO -> I/O, sync filecreate documentation
doc: minor formatting fixes
doc: rewrite write_*_log sections
COPYING | 39 ++++++++++---------- HOWTO | 78 +++++++++++++++++++-------------------- backend.c | 2 +- crc/crc32.c | 2 +- crc/crc32.h | 2 +- crc/crc32c.h | 2 +- doc/conf.py | 1 - engines/pmemblk.c | 4 +- exp/expression-parser.l | 2 +- exp/expression-parser.y | 2 +- exp/test-expression-parser.c | 2 +- fifo.c | 2 +- fifo.h | 2 +- fio.1 | 77 +++++++++++++++++++------------------- fio.c | 2 +- gfio.c | 2 +- graph.c | 2 +- lib/rbtree.c | 2 +- lib/rbtree.h | 2 +- libfio.c | 2 +- oslib/libmtd.c | 2 +- oslib/libmtd.h | 2 +- oslib/libmtd_common.h | 2 +- oslib/libmtd_int.h | 2 +- oslib/libmtd_legacy.c | 2 +- oslib/libmtd_xalloc.h | 2 +- tools/fio_jsonplus_clat2csv | 2 +- tools/fiologparser.py | 3 +- tools/genfio | 4 +- tools/hist/fiologparser_hist.py | 2 +- tools/hist/fiologparser_hist.py.1 | 2 +- tools/hist/half-bins.py | 3 +- tools/plot/fio2gnuplot | 4 +- unit_tests/steadystate_tests.py | 4 +- 34 files changed, 131 insertions(+), 134 deletions(-)
---
Diff of recent changes:
COPYING +19 -20
@@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.
HOWTO +39 -39
131 lines not on this page · raw message
backend.c +1 -1
@@ -18,7 +18,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include <unistd.h>
crc/crc32.c +1 -1
@@ -13,7 +13,7 @@You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <inttypes.h> #include "crc32.h"
crc/crc32.h +1 -1
@@ -13,7 +13,7 @@You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef CRC32_H #define CRC32_H
crc/crc32c.h +1 -1
@@ -13,7 +13,7 @@You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef CRC32C_H #define CRC32C_H
doc/conf.py +0 -1
@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # fio documentation build configuration file, created by
engines/pmemblk.c +2 -2
@@ -14,8 +14,8 @@* * You should have received a copy of the GNU General Public * License along with this program; if not, write to the Free -* Software Foundation, Inc., 59 Temple Place, Suite 330, -* Boston, MA 02111-1307 USA +* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. */ /*
exp/expression-parser.l +1 -1
@@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */
exp/expression-parser.y +1 -1
@@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */
exp/test-expression-parser.c +1 -1
@@ -15,7 +15,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */
fifo.c +1 -1
@@ -15,7 +15,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */
fifo.h +1 -1
@@ -17,7 +17,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include "minmax.h"
fio.1 +39 -38
117 lines not on this page · raw message
fio.c +1 -1
@@ -18,7 +18,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include <unistd.h>
gfio.c +1 -1
@@ -18,7 +18,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include <locale.h>
graph.c +1 -1
@@ -17,7 +17,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include <string.h>
lib/rbtree.c +1 -1
@@ -15,7 +15,7 @@You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. linux/lib/rbtree.c */
lib/rbtree.h +1 -1
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. linux/include/linux/rbtree.h
libfio.c +1 -1
@@ -18,7 +18,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */
oslib/libmtd.c +1 -1
@@ -14,7 +14,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Artem Bityutskiy *
oslib/libmtd.h +1 -1
@@ -13,7 +13,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Artem Bityutskiy *
oslib/libmtd_common.h +1 -1
@@ -13,7 +13,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Imported from mtd-utils by dehrenberg */
oslib/libmtd_int.h +1 -1
@@ -14,7 +14,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Artem Bityutskiy *
oslib/libmtd_legacy.c +1 -1
@@ -13,7 +13,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Artem Bityutskiy *
oslib/libmtd_xalloc.h +1 -1
@@ -21,7 +21,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __MTD_UTILS_XALLOC_H__
tools/fio_jsonplus_clat2csv +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2.7 # # fio_jsonplus_clat2csv #
tools/fiologparser.py +1 -2
@@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2.7 # # fiologparser.py #
@@ -218,4 +218,3 @@ if __name__ == '__main__': print_all_stats(ctx, series) else: print_default(ctx, series) -
tools/genfio +2 -2
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # # Copyright (C) 2013 eNovance SAS <[email protected]> # Author: Erwan Velu <[email protected]>
@@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BLK_SIZE= BLOCK_SIZE=4k
tools/hist/fiologparser_hist.py +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/python2.7 """ Utility for converting *_clat_hist* files generated by fio into latency statistics.
tools/hist/fiologparser_hist.py.1 +1 -1
@@ -17,7 +17,7 @@ end-time, samples, min, avg, median, 90%, 95%, 99%, max 1000, 15, 192, 1678.107, 1788.859, 1856.076, 1880.040, 1899.208, 1888.000 2000, 43, 152, 1642.368, 1714.099, 1816.659, 1845.552, 1888.131, 1888.000 4000, 39, 1152, 1546.962, 1545.785, 1627.192, 1640.019, 1691.204, 1744 -... +\[char46].. .fi .PP
tools/hist/half-bins.py +1 -2
@@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/python2.7 """ Cut the number bins in half in fio histogram output. Example usage: $ half-bins.py -c 2 output_clat_hist.1.log > smaller_clat_hist.1.log
@@ -35,4 +35,3 @@ if __name__ == '__main__': 'e.g. coarseness of 4 merges each 2^4 = 16 consecutive ' 'bins.') main(p.parse_args()) -
tools/plot/fio2gnuplot +2 -2
@@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2.7 # # Copyright (C) 2013 eNovance SAS <[email protected]> # Author: Erwan Velu <[email protected]>
@@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import os import fnmatch
unit_tests/steadystate_tests.py +2 -2
@@ -1,10 +1,10 @@ -#!/usr/bin/python +#!/usr/bin/python2.7 # # steadystate_tests.py # # Test option parsing and functonality for fio's steady state detection feature. # -# steadystate_tests.py ./fio file-for-read-testing file-for-write-testing +# steadystate_tests.py --read file-for-read-testing --write file-for-write-testing ./fio # # REQUIREMENTS # Python 2.6+