Commit 59b23db2 authored by Dmitry Smirnov's avatar Dmitry Smirnov

New upstream release [1.1.0] + changelog summary.

parent dcf2f8d5
iowatcher/iowatcher.1
blktrace (1.1.0-1) UNRELEASED; urgency=low
* New upstream release [September 2014].
+ Install new binary `iowatcher` (Closes: #729204).
"iowatcher" became part of "blktrace".
* iowatcher-related changes:
+ Added "debian/blktrace.manpages" to install `iowatcher.1` man page.
+ Added "debian/clean" file.
+ Added "override_dh_installdocs" to install renamed iowatcher README.
+ New patches: [ffmpeg2avconv.patch, man.patch, procnum.patch].
+ Recommends: [libtheora-bin, libav-tools, librsvg2-bin].
* Modernise Vcs-Browser URL.
* Standards-Version: 3.9.6.
* watch file update; tighten match pattern to exclude git snapshots.
* Added "debian/dch.conf".
* Dropped obsolete "override_dh_builddeb".
* Build with all hardening.
* Copyright updates and corrections.
-- Dmitry Smirnov <onlyjob@debian.org> Wed, 25 Mar 2015 17:21:44 +1100
blktrace (1.0.5-1) unstable; urgency=low
* New upstream release [February 2012].
......
iowatcher/*.o
iowatcher/iowatcher
iowatcher/.depend
......@@ -20,6 +20,9 @@ Depends: ${misc:Depends},
${shlibs:Depends},
python,
lsb-base
Recommends: libtheora-bin
,libav-tools
,librsvg2-bin
Suggests: gnuplot-x11
Description: utilities for block layer IO tracing
blktrace is a block layer IO tracing mechanism which provides detailed
......
......@@ -4,6 +4,7 @@ Source: http://brick.kernel.dk/snaps/
Comment:
This package was debianized by Bas Zoetekouw <bas@debian.org>
on Sat Dec 9 16:58:09 CET 2006
Source-Git: http://git.kernel.dk/
Files: *
Copyright:
......@@ -22,15 +23,20 @@ Comment:
* Nathan Scott <nathans@sgi.com>
(bug fixes, process names, multiple devices)
Files: iowatcher/*
Copyright: 2012 Fusion-io <chris.mason@fusionio.com>
2005-2006 Jens Axboe
License: GPL-2
Files: jhash.h
Copyright: 1996 by Bob Jenkins <bob_jenkins@burtleburtle.net>
License: GPL-2+
Copyright: 2006 by Bob Jenkins <bob_jenkins@burtleburtle.net>
2009 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
License: public-domain
You can use this free for any purpose. It's in the public domain. It has no warranty.
Comment:
Original version is available in the public domain.
It was adapted for use in the Linux kernel by
David S. Miller <davem@redhat.com>.
The current version is therefore available under the
GNU General Public License, version 2.
Files: rbtree.*
Copyright: 1999 Andrea Arcangeli <andrea@suse.de>
......@@ -38,22 +44,20 @@ Copyright: 1999 Andrea Arcangeli <andrea@suse.de>
License: GPL-2+
Files: doc/*
blkparse.1
blkrawverify.1
blktrace.8
btrace.8
btt.1
verify_blkparse.1
Copyright: 2005-2006 Alan D. Brunelle <Alan.Brunelle@hp.com>
Copyright: 2005-2007 Alan D. Brunelle <Alan.Brunelle@hp.com>
2006 Bas Zoetekouw <bas@debian.org>
License: GPL-2+
2006 Jens Axboe
2006-2007 Nathan Scott.
2008 IBM Corp.
2008 Hewlett-Packard Development Company, L.P.
License: GPL-2
Comment:
Man pages were created from the upstream documentation for use with the
Debian operating system.
Files: debian/*
Copyright: 2006-2009 Bas Zoetekouw <bas@debian.org>
2012-2013 Dmitry Smirnov <onlyjob@debian.org>
2012-2015 Dmitry Smirnov <onlyjob@debian.org>
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......@@ -92,3 +96,16 @@ License: GPL-2+
The complete text of the GNU General Public License version 2
can be found in the file "/usr/share/common-licenses/GPL-2".
License: GPL-2
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License v2 as published
by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
The complete text of the GNU General Public License version 2
can be found in the file "/usr/share/common-licenses/GPL-2".
Last-Update: 2015-03-25
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: use avconv instead of ffmpeg
--- a/iowatcher/README
+++ b/iowatcher/README
@@ -15,9 +15,9 @@
rsvg-convert can turn the svgs into many other formats.
Building:
- Type make and make install. We need ffmpeg or png2theora, and
+ Type make and make install. We need avconv or png2theora, and
librsvg to make movies, otherwise there are no dependencies.
The basic options:
@@ -42,9 +42,9 @@
-m Create a movie. The file format depends on the extension used in the
-o filename.* option. If you specify an .ogv or .ogg extension, the
result will be Ogg Theora video, if png2theora is available.
If you use an .mp4 extension, the result will be an mp4 video if
- ffmpeg is avilable. You can use any other extension, but the end
+ avconv is avilable. You can use any other extension, but the end
result will be an mp4.
You can use --movie=spindle or --movie=rect, which changes the
style of the IO mapping.
--- a/iowatcher/iowatcher.1
+++ b/iowatcher/iowatcher.1
@@ -7,9 +7,9 @@
.B iowatcher
\fI[options]\fR [--] \fI[program arguments ...]\fR
.SH DESCRIPTION
-iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with ffmpeg) or ogg format (with png2theora).
+iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with avconv) or ogg format (with png2theora).
.SH OPTIONS
.TP
\fB--help\fP
@@ -50,9 +50,9 @@
\fB-m, --movie\fP \fI[style]\fP
Create a movie. The file format depends on the extension used in the \fB-o\fP
\fIfile\fP option. If you specify an .ogv or .ogg extension, the result will
be Ogg Theora video, if png2theora is available. If you use an .mp4 extension,
-the result will be an mp4 video if ffmpeg is available. You can use any other
+the result will be an mp4 video if avconv is available. You can use any other
extension, but the end result will be an mp4. The accepted \fIstyle\fP values
are \fBspindle\fP for a circular disc-like effect (default) or \fBrect\fP for a
rectangular graph style.
.TP
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -1025,10 +1025,10 @@
}
static void mencode_movie(char *movie_dir)
{
- fprintf(stderr, "Creating movie %s with ffmpeg\n", movie_dir);
- snprintf(line, line_len, "ffmpeg -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
+ fprintf(stderr, "Creating movie %s with avconv\n", movie_dir);
+ snprintf(line, line_len, "avconv -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
"-vcodec %s %s", movie_dir, output_filename, ffmpeg_codec,
output_filename);
system(line);
}
@@ -1331,9 +1331,9 @@
"\t-o (--output): output file name for the SVG image or video\n"
"\t-p (--prog): run a program while blktrace is run\n"
"\t-K (--keep-movie-svgs keep svgs generated for movie mode\n"
"\t-m (--movie [=spindle|rect]): create IO animations\n"
- "\t-C (--codec): ffmpeg codec. Use ffmpeg -codecs to list\n"
+ "\t-C (--codec): avconv codec. Use avconv -codecs to list\n"
"\t-r (--rolling): number of seconds in the rolling averge\n"
"\t-T (--title): graph title\n"
"\t-N (--no-graph): skip a single graph (io, tput, latency, queue_depth, \n"
"\t\t\tiops, cpu-sys, cpu-io, cpu-irq cpu-soft cpu-user)\n"
Last-Update: 2015-03-25
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: man page lintianisation: hyphen-used-as-minus-sign
--- a/iowatcher/iowatcher.1
+++ b/iowatcher/iowatcher.1
@@ -14,15 +14,15 @@
.TP
\fB--help\fP
Print a brief usage summary.
.TP
-\fB-d, --device\fP \fIdevice\fP
+\fB-d, \--device\fP \fIdevice\fP
Controls which device you are tracing. You can only trace one device at a time for now. It is sent directly to blktrace, and only needed when you are making a new trace.
.TP
-\fB-D, --blktrace-destination\fP \fIdestination\fP
+\fB-D, \--blktrace-destination\fP \fIdestination\fP
Destination for blktrace.
.TP
-\fB-p, --prog\fP
+\fB-p, \--prog\fP
Run a program while blktrace is run. The program and its arguments must be
specified after all other options. Note that this option previously required
the program to be given as a single argument but it now tells \fBiowatcher\fP
to expect extra arguments which it should be run during the trace.
@@ -31,69 +31,69 @@
End option parsing. If \fB--prog\fP is specified, everything after \fB--\fP is
the program to be run. This can be useful if the program name could otherwise
be mistaken for an option.
.TP
-\fB-K, --keep-movie-svgs\fP
+\fB-K, \--keep-movie-svgs\fP
Keep the SVG files generated for movie mode.
.TP
-\fB-t, --trace\fP \fIpath\fP
+\fB-t, \--trace\fP \fIpath\fP
Specify the name of the file or directory in which blktrace output is located.
\fBiowatcher\fP uses a dump from blkparse, so this option tries to guess the
name of the corresponding per-CPU blktrace data files if the dump file doesn't
already exist. To add multiple traces to a given graph, you can specify
\fB--trace\fP more than once. If \fIpath\fP is a directory, \fBiowatcher\fP
will use the name of the directory as the base name of the dump file and all
trace files found inside the directory will be processed.
.TP
-\fB-l, --label\fP \fIlabel\fP
+\fB-l, \--label\fP \fIlabel\fP
Sets a label in the graph for a trace file. The labels are added in the same order as the trace files.
.TP
-\fB-m, --movie\fP \fI[style]\fP
+\fB-m, \--movie\fP \fI[style]\fP
Create a movie. The file format depends on the extension used in the \fB-o\fP
\fIfile\fP option. If you specify an .ogv or .ogg extension, the result will
be Ogg Theora video, if png2theora is available. If you use an .mp4 extension,
the result will be an mp4 video if avconv is available. You can use any other
extension, but the end result will be an mp4. The accepted \fIstyle\fP values
are \fBspindle\fP for a circular disc-like effect (default) or \fBrect\fP for a
rectangular graph style.
.TP
-\fB-T, --title\fP \fItitle\fP
+\fB-T, \--title\fP \fItitle\fP
Set a \fItitle\fP to be placed at the top of the graph.
.TP
-\fB-o, --output\fP \fIfile\fP
+\fB-o, \--output\fP \fIfile\fP
Output filename for the SVG image or video. The video format used will depend
on the file name extension. See \fB--movie\fP for details.
.TP
-\fB-r, --rolling\fP \fIseconds\fP
+\fB-r, \--rolling\fP \fIseconds\fP
Control the duration for the rolling average. \fBiowatcher\fP tries to smooth out bumpy graphs by averaging the current second with seconds from the past. Larger numbers here give you flatter graphs.
.TP
-\fB-h, --height\fP \fIheight\fP
+\fB-h, \--height\fP \fIheight\fP
Set the height of each graph
.TP
-\fB-w, --width\fP \fIwidth\fP
+\fB-w, \--width\fP \fIwidth\fP
Set the width of each graph
.TP
-\fB-c, --columns\fP \fIcolumns\fP
+\fB-c, \--columns\fP \fIcolumns\fP
Number of columns in graph output
.TP
-\fB-x, --xzoom\fP \fImin:max\fP
+\fB-x, \--xzoom\fP \fImin:max\fP
Limit processed time range to \fImin:max\fP.
.TP
-\fB-y, --yzoom\fP \fImin:max\fP
+\fB-y, \--yzoom\fP \fImin:max\fP
Limit processed sectors to \fImin:max\fP.
.TP
-\fB-a, --io-plot-action\fP \fIaction\fP
+\fB-a, \--io-plot-action\fP \fIaction\fP
Plot \fIaction\fP (one of Q, D, or C) in the IO graph.
.TP
-\fB-P, --per-process-io\fP
+\fB-P, \--per-process-io\fP
Distinguish between processes in the IO graph.
.TP
-\fB-O, --only-graph\fP \fIgraph\fP
+\fB-O, \--only-graph\fP \fIgraph\fP
Add a single graph to the output (see section \fBGRAPHS\fP for options). By
default all graphs are included. Use \fB-O\fP to generate only the required
graphs. \fB-O\fP may be used more than once.
.TP
-\fB-N, --no-graph\fP \fItype\fP
+\fB-N, \--no-graph\fP \fItype\fP
Remove a single graph from the output (see section \fBGRAPHS\fP for options).
This option may be used more than once.
.SH GRAPHS
Values accepted by the \fB-O\fP and \fB-N\fP options are:
@@ -103,39 +103,39 @@
.SH EXAMPLES
Generate graph from the existing trace.dump:
.PP
.RS
-# iowatcher -t trace
+# iowatcher \-t trace
.RE
.PP
Skip the IO graph:
.PP
.RS
-# iowatcher -t trace.dump -o trace.svg -N io
+# iowatcher \-t trace.dump \-o trace.svg \-N io
.RE
.PP
Only graph tput and latency:
.PP
.RS
-# iowatcher -t trace.dump -o trace.svg -O tput -O latency
+# iowatcher \-t trace.dump \-o trace.svg \-O tput \-O latency
.RE
.PP
Generate a graph from two runs, and label them:
.PP
.RS
-# iowatcher -t ext4.dump -t xfs.dump -l Ext4 -l XFS -o trace.svg
+# iowatcher \-t ext4.dump \-t xfs.dump \-l Ext4 \-l XFS \-o trace.svg
.RE
.PP
Run a fio benchmark and store the trace in trace.dump, add a title to the top, use /dev/sda for blktrace:
.PP
.RS
-# iowatcher -d /dev/sda -t trace.dump -T 'Fio Benchmark' -p fio some_job_file
+# iowatcher \-d /dev/sda \-t trace.dump \-T 'Fio Benchmark' \-p fio some_job_file
.RE
.PP
Make a movie from an existing trace:
.PP
.RS
-# iowatcher -t trace --movie -o trace.mp4
+# iowatcher \-t trace \--movie \-o trace.mp4
.RE
.SH AUTHORS
iowatcher was created and is maintained by Chris Mason.
Last-Update: 2015-03-25
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: reduce number of `rsvg-convert` processes to save RAM.
Default 8 may consume ~3...4 GiB and force extensive swapping...
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -1018,9 +1018,9 @@
static void convert_movie_files(char *movie_dir)
{
fprintf(stderr, "Converting svg files in %s\n", movie_dir);
- snprintf(line, line_len, "find %s -name \\*.svg | xargs -I{} -n 1 -P 8 rsvg-convert -o {}.png {}",
+ snprintf(line, line_len, "find %s -name \\*.svg | xargs -I{} -n 1 -P 4 rsvg-convert -o {}.png {}",
movie_dir);
system(line);
}
10_btrace_paths.patch
ffmpeg2avconv.patch
man.patch
procnum.patch
spelling.patch
......@@ -52,6 +52,10 @@ override_dh_auto_install:
override_dh_installinit:
dh_installinit --name=mountdebugfs --no-restart-on-upgrade
override_dh_installdocs:
dh_installdocs
cp -v iowatcher/README $(CURDIR)/debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/README-iowatcher
override_dh_compress:
dh_compress -X.pdf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment