Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Aug 9, 2013 Kbuild

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 7a16102ef84e3db14b6802a06f7f99e2e55af85d:

Fio 2.1.2 (2013-08-06 09:39:54 -0600)

are available in the git repository at:
git://git.kernel.dk/fio.git master

Erwan Velu (10):
fio2gnplot: Print specific message if cmdline parsing fails
fio2gnuplot: Adding getoplong support for cmdline
fio2gnuplot: Fixing typo in error message
fio2gnuplot: Adding verbose option
fio2gnuplot: Deleting temporary files by default
fio2gnuplot: Managing temporary files in a better way
fio2gnuplot: Fixing help message
fio2gnuplot: Removing .py extension
fio2gnuplot: Adding manpage
genfio: Don't consider only /dev/ disk device

 Makefile                                   |    8 +-
 tools/genfio                               |   47 ++++++---
 tools/plot/{fio2gnuplot.py => fio2gnuplot} |   67 +++++++++---
 tools/plot/fio2gnuplot.1                   |  161 ++++++++++++++++++++++++++++
 tools/plot/fio2gnuplot.manpage             |  117 ++++++++++++++++++++
 5 files changed, 368 insertions(+), 32 deletions(-)
 rename tools/plot/{fio2gnuplot.py => fio2gnuplot} (87%)
 create mode 100644 tools/plot/fio2gnuplot.1
 create mode 100644 tools/plot/fio2gnuplot.manpage

---

Diff of recent changes:

Makefile +6 -2
index 8494b27..eb0e892 100644
@@ -20,7 +20,7 @@ OPTFLAGS= -O3 -g -ffast-math
 CFLAGS	= -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS)
 LIBS	+= -lm $(EXTLIBS)
 PROGS	= fio
-SCRIPTS = tools/fio_generate_plots tools/plot/fio2gnuplot.py tools/genfio
+SCRIPTS = tools/fio_generate_plots tools/plot/fio2gnuplot tools/genfio
 
 ifdef CONFIG_GFIO
   PROGS += gfio
@@ -275,11 +275,15 @@ distclean: clean FORCE
 cscope:
 	@cscope -b -R
 
-install: $(PROGS) $(SCRIPTS) FORCE
+tools/plot/fio2gnuplot.1:
+	@cat tools/plot/fio2gnuplot.manpage | txt2man -t fio2gnuplot >  tools/plot/fio2gnuplot.1
+
+install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 644 tools/plot/fio2gnuplot.1 $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 755 -d $(DESTDIR)$(sharedir)
 	$(INSTALL) -m 644 tools/plot/*gpm $(DESTDIR)$(sharedir)/
tools/genfio +33 -14

118 lines not on this page · raw message

tools/plot/fio2gnuplot new file +517 -0

517 lines not on this page · raw message

tools/plot/fio2gnuplot.1 new file +161 -0

161 lines not on this page · raw message

tools/plot/fio2gnuplot.manpage new file +117 -0

117 lines not on this page · raw message

tools/plot/fio2gnuplot.py deleted +0 -482

482 lines not on this page · raw message