Recent changes

Recent changes

[Jens Axboe]

The following changes since commit 7174703f7b648246e68651d7364daa5baccff9d3:
  Alan D. Brunelle (1):
        Some fixes - added in 4 figures, fixed an error in a section label.

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Bas Zoetekouw (1):
      Add store barrier defines for a bunch of archs

 barrier.h |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 425c69552d4fbf7705c74aef4761324ed641cb28:
  Bas Zoetekouw (1):
        Add store barrier defines for a bunch of archs

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Alan D. Brunelle (1):
      A couple of weeks ago Ming Zhang had noted that btt was using tremendous

 btt/Makefile         |   12 +++++--
 btt/bt_timeline.c    |   41 ++++++++++++++++++---
 btt/devs.c           |   11 +++---
 btt/globals.h        |   27 +++++++++-----
 btt/inlines.h        |   94 +++++++++++++++++++++++++++++++++++---------------
 btt/trace.c          |   17 +++++----
 btt/trace_complete.c |   19 +++++-----
 btt/trace_im.c       |   43 ++++++++--------------
 btt/trace_issue.c    |   41 +++++++--------------
 btt/trace_queue.c    |    8 ++--
 btt/trace_remap.c    |   12 +++---
 btt/trace_requeue.c  |   18 +++++-----
 12 files changed, 200 insertions(+), 143 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit c8b0b334cc1028ad8aa5407667233747af96a942:
  Alan D. Brunelle (1):
        A couple of weeks ago Ming Zhang had noted that btt was using tremendous

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Alan D. Brunelle (1):
      Combine all outstanding patches into one /big patch/

 btt/Makefile      |   31 ++++++++--------
 btt/args.c        |   75 +++++++++++++++++++++++++++++----------
 btt/bno_dump.c    |   92 ++++++++++++++++++++++++++++++++++++++++++++++++
 btt/bt_timeline.c |   53 ++++++++++++++++++----------
 btt/devmap.c      |   10 +++++
 btt/devs.c        |   46 ++++++++++++++++++++++++-
 btt/doc/btt.tex   |   48 ++++++++++++++++++++++++-
 btt/globals.h     |   29 +++++++++++----
 btt/inlines.h     |  100 ++++++++++++++++++++++++++++++++++++-----------------
 btt/misc.c        |   35 +++++++++++++++---
 btt/output.c      |   13 +++----
 btt/proc.c        |   32 ++++++++++++++---
 btt/seek.c        |   50 ++++++++++++++++++++++-----
 btt/trace_issue.c |    1 +
 14 files changed, 492 insertions(+), 123 deletions(-)
 create mode 100644 btt/bno_dump.c

Recent changes

[Jens Axboe]

The following changes since commit 6904079488cd3063d171021c8954f955f4236849:
  Alan D. Brunelle (1):
        Combine all outstanding patches into one /big patch/

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Alan D. Brunelle (2):
      Cleaned out the btt/README file.
      Add in unplug IO count histogram

 btt/Makefile      |    2 +-
 btt/README        |   75 ++------------------------------------------
 btt/args.c        |   12 ++++++-
 btt/bt_timeline.c |    2 +-
 btt/devs.c        |    2 +
 btt/doc/btt.tex   |   36 +++++++++++++++++++--
 btt/globals.h     |    9 ++++-
 btt/trace_plug.c  |    1 +
 btt/unplug_hist.c |   90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 149 insertions(+), 80 deletions(-)
 create mode 100644 btt/unplug_hist.c

Recent changes

[Jens Axboe]

The following changes since commit fc16a815417c438ed6d980d3a08d2f37122810cc:
  Alan D. Brunelle (1):
        Add in unplug IO count histogram

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Alan D. Brunelle (1):
      Fix unplug histogram placement.

 btt/unplug_hist.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 5406b9715ffa8deecea13185a281196f878c53c6:
  Alan D. Brunelle (1):
        Fix unplug histogram placement.

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Alan D. Brunelle (1):
      btrace: Add in -r support for btrace

 btrace |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 btrace

Recent changes

[Jens Axboe]

The following changes since commit 3b79b22702659877d9ced51d77b175f2cbdbf940:
  Alan D. Brunelle (1):
        btrace: Add in -r support for btrace

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Jens Axboe (1):
      Fix crash with '-' stdin input

 blkparse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 00cd304410a4e750ef929823dca3b932baa797b0:
  Jens Axboe (1):
        Fix crash with '-' stdin input

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Jens Axboe (2):
      Fix queued vs dispatch numbers
      Account size of merges

 blkparse.c |   11 ++++++-----
 blktrace.h |    1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit fb2ec7961d3cfc7fb8f84bcf6ae803ed1c7bd180:
  Jens Axboe (1):
        Account size of merges

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Jens Axboe (1):
      Small format update for empty requests

 blkparse_fmt.c |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit d57450af7817f35ddaa3241426a6213689a3eec6:
  Jens Axboe (1):
        Small format update for empty requests

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Jens Axboe (1):
      Make the %C format specified explanation more clear

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 683ffbab5860bf116b9c07abd7641892d8d0a39f:
  Jens Axboe (1):
        Make the %C format specified explanation more clear

are found in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git

Jens Axboe (1):
      Update email address

 doc/blktrace.tex |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 758019ab551c13f57ba95c3512c73d61322632da:
  Jens Axboe (1):
        Update email address

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jens Axboe (1):
      git:// url location update

 README |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit e0ede9d3eec5d558abf98d94fa9b6098dc5ee013:
  Jens Axboe (1):
        git:// url location update

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jens Axboe (1):
      Add man pages

 Makefile              |    3 +
 doc/blkparse.1        |  565 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/blkrawverify.1    |   47 ++++
 doc/blktrace.8        |  255 ++++++++++++++++++++++
 doc/btrace.8          |   84 ++++++++
 doc/btt.1             |  192 +++++++++++++++++
 doc/verify_blkparse.1 |   44 ++++
 7 files changed, 1190 insertions(+), 0 deletions(-)
 create mode 100644 doc/blkparse.1
 create mode 100644 doc/blkrawverify.1
 create mode 100644 doc/blktrace.8
 create mode 100644 doc/btrace.8
 create mode 100644 doc/btt.1
 create mode 100644 doc/verify_blkparse.1

Recent changes

[Jens Axboe]

The following changes since commit 98eee4e48b9461a04c2461a856c9592d504a6fb1:
  Jens Axboe (1):
        Add man pages

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Vincent Legoll (1):
      Fix Makefile buglets

 Makefile |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 2885ecaa19a04ab9980896d1a849cdae9238b7d1:
  Vincent Legoll (1):
        Fix Makefile buglets

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jens Axboe (1):
      Disregard generated doc files in .gitignore

 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit f806a4478092ab8e2383efd05aa88073e55df7e7:
  Jens Axboe (1):
        Disregard generated doc files in .gitignore

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jan Blunck (1):
      Makefile fixes

 Makefile     |   12 ++++++------
 btt/Makefile |   29 ++++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit e2d964ec9f7f92da9abe0fb2588606dda39306ce:
  Jan Blunck (1):
        Makefile fixes

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Valerie Henson (1):
      blktrace: fix indent typo

 doc/blktrace.8 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit bb4afebb049c1a1ba6adb4a564413337ca985805:
  Valerie Henson (1):
        blktrace: fix indent typo

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jens Axboe (2):
      blktrace man page: mention buffer size / number of buffers defaults.
      blktrace 0.99.3

 blkparse.c     |    2 +-
 blktrace.c     |    2 +-
 doc/blktrace.8 |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit a5981e2e795319502cc8dda629482928f3b7b204:
  Jens Axboe (1):
        blktrace 0.99.3

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Major revamping (ver 2.0)

 btt/bt_timeline.c             |    7 +-
 btt/devs.c                    |   26 ++-
 btt/doc/btt.tex               |  323 +++++++----------------------------------
 btt/doc/sample-btt-output.tex |  138 ++++++++++++++++++
 btt/globals.h                 |   41 ++---
 btt/inlines.h                 |  187 ++++--------------------
 btt/iostat.c                  |    6 +-
 btt/output.c                  |  111 ++++++++------
 btt/proc.c                    |   72 +++++++---
 btt/seek.c                    |   18 +--
 btt/trace.c                   |   86 ++---------
 btt/trace_complete.c          |  192 ++++++------------------
 btt/trace_im.c                |   95 ++++---------
 btt/trace_issue.c             |   85 ++++--------
 btt/trace_queue.c             |   62 ++------
 btt/trace_remap.c             |   88 +----------
 btt/trace_requeue.c           |   21 +---
 17 files changed, 523 insertions(+), 1035 deletions(-)
 create mode 100644 btt/doc/sample-btt-output.tex

Recent changes

[Jens Axboe]

The following changes since commit 4c48f14ea8ae2fae86811ac4dc1d72ad9bb601c2:
  Alan D. Brunelle (1):
        Major revamping (ver 2.0)

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Bas Zoetekouw (2):
      Fix compilation on m68k
      btt manpages

 barrier.h |    2 +-
 doc/btt.1 |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 141 insertions(+), 24 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 9a8e0e1766abcf7fbc71b7a60cd6d0c85573bd52:
  Bas Zoetekouw (1):
        btt manpages

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (2):
      Added list_splice to btt/list.h
      Add btrecord/btreplay capability

 Makefile                  |   11 +-
 btreplay/Makefile         |   45 ++
 btreplay/btrecord.c       |  780 ++++++++++++++++++++++
 btreplay/btrecord.h       |   95 +++
 btreplay/btreplay.c       | 1590 +++++++++++++++++++++++++++++++++++++++++++++
 btreplay/doc/Makefile     |   18 +
 btreplay/doc/abstract.tex |   34 +
 btreplay/doc/btreplay.tex |  521 +++++++++++++++
 btt/list.h                |   47 ++
 9 files changed, 3140 insertions(+), 1 deletions(-)
 create mode 100644 btreplay/Makefile
 create mode 100644 btreplay/btrecord.c
 create mode 100644 btreplay/btrecord.h
 create mode 100644 btreplay/btreplay.c
 create mode 100644 btreplay/doc/Makefile
 create mode 100644 btreplay/doc/abstract.tex
 create mode 100644 btreplay/doc/btreplay.tex

Recent changes

[Jens Axboe]

The following changes since commit d47a3fec3f4bbcf6b0c6ef757a4eb449dd81d10a:
  Alan D. Brunelle (1):
        Add btrecord/btreplay capability

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Converted fatal to an inline function

 btreplay/btrecord.c |   23 ++++++++++++++++-------
 btreplay/btreplay.c |   23 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 0106d9cfa13b912042bace7bbb2d2475dfd35e10:
  Alan D. Brunelle (1):
        Converted fatal to an inline function

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (3):
      Converted fatal from macro to inline
      Merge branch 'master' of git://brick.kernel.dk/data/git/blktrace
      Added O_NOATIME to replay file

Joshua Root (1):
      Fix segfault in replay_sub when verbose is 1

 btreplay/btreplay.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 60d658630cfe397a93a97f1b38350b27eacc317e:
  Alan D. Brunelle (1):
        Added O_NOATIME to replay file

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Aneesh Kumar K.V (1):
      blktrace segfault

 blktrace.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit c0c1840adae820efa96fb0ff797b8bc60a672d63:
  Aneesh Kumar K.V (1):
        blktrace segfault

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Fixed REMAP to update Q2A & fixed #Q calculations

 btt/globals.h     |    2 +-
 btt/output.c      |   18 ++++++++++++++----
 btt/trace_queue.c |    1 +
 btt/trace_remap.c |   34 ++++++++++++++++++++++++----------
 4 files changed, 40 insertions(+), 15 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 77f256cda4b2f076f5169fdf1bc815f629eea361:
  Alan D. Brunelle (1):
        Fixed REMAP to update Q2A & fixed #Q calculations

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Added active requests at Q information.

 btt/doc/btt.tex   |   32 +++++++++++++++++++++++++++++---
 btt/globals.h     |    1 +
 btt/output.c      |   42 ++++++++++++++++++++++++++++++++++++++++++
 btt/trace_issue.c |    3 +++
 btt/trace_queue.c |    3 +++
 5 files changed, 78 insertions(+), 3 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 50f7389936188591eda0f114ab682520e6fe90c9:
  Alan D. Brunelle (1):
        Added active requests at Q information.

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Jens Axboe (1):
      memset() must be done after NULL check

 blktrace.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 24c7e97eb6a28a3cfcc966aa2d38af6caed01997:
  Jens Axboe (1):
        memset() must be done after NULL check

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Joshua Root (1):
      Remove strange make dependency

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 99a55a0392b1634ce81e594f48a1105e8ebc1d58:
  Joshua Root (1):
        Remove strange make dependency

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (2):
      Added in Q2D histograms (requires -A)
      Merge branch 'master' into add-q2d

 btt/Makefile      |    2 +-
 btt/devs.c        |    4 ++
 btt/doc/btt.tex   |   21 +++++++++
 btt/globals.h     |   11 +++++
 btt/output.c      |   48 +++++++++++++++++++++
 btt/q2d.c         |  121 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 btt/trace_issue.c |    4 ++
 7 files changed, 210 insertions(+), 1 deletions(-)
 create mode 100644 btt/q2d.c

Recent changes

[Jens Axboe]

The following changes since commit 02a94ed057ba88861ed041496646a8be53d0b2e7:
  Alan D. Brunelle (1):
        Merge branch 'master' into add-q2d

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Bas Zoetekouw (1):
      btreplay/btrecord man pages

 doc/btrecord.8 |  210 ++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/btreplay.8 |  235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 445 insertions(+), 0 deletions(-)
 create mode 100644 doc/btrecord.8
 create mode 100644 doc/btreplay.8

Recent changes

[Jens Axboe]

The following changes since commit a84a97fdf8ce07ccda8dcc4f32f0df2291f2f54f:
  Bas Zoetekouw (1):
        btreplay/btrecord man pages

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Separated out g/i/m trace handling.

 btt/bt_timeline.c    |    2 +-
 btt/doc/btt.tex      |   46 +++++++++--
 btt/globals.h        |   19 +++--
 btt/inlines.h        |   82 ++++++++++++++++----
 btt/iostat.c         |   17 ++---
 btt/output.c         |  209 +++++++++++++++++++++++++++----------------------
 btt/proc.c           |    7 ++-
 btt/trace_complete.c |   22 ++++--
 btt/trace_im.c       |   52 +++++++-----
 btt/trace_issue.c    |    6 +-
 btt/trace_queue.c    |   11 ++-
 11 files changed, 305 insertions(+), 168 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit ae6d30f4475181d685d1f33faf056755803f189b:
  Alan D. Brunelle (1):
        Separated out g/i/m trace handling.

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Dave Boutcher (1):
      Fix Q counts during requeue and merges.

 btt/trace_im.c      |    3 +++
 btt/trace_requeue.c |    9 +++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 461afe819c41fa811f9c6264524cb8edbd2acc63:
  Dave Boutcher (1):
        Fix Q counts during requeue and merges.

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (2):
      Fixed excess bucket information for unplug histograms.
      UNPLUG does the timing stuff, UNPLUG TIMEOUT only does timeout

 btt/devs.c        |   18 ++++++++++++------
 btt/globals.h     |    3 ++-
 btt/output.c      |    2 +-
 btt/trace_plug.c  |   14 +++++---------
 btt/unplug_hist.c |    4 ++--
 5 files changed, 22 insertions(+), 19 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 00a47cd169f2cc87b5f63fe93226b7231dee678c:
  Alan D. Brunelle (1):
        UNPLUG does the timing stuff, UNPLUG TIMEOUT only does timeout

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Added new IOs per unplug table

 btt/bt_timeline.c |    2 +-
 btt/devs.c        |   10 +++-
 btt/doc/btt.tex   |  101 ++++++++++++++++++++++++++++++----------------
 btt/globals.h     |    8 ++-
 btt/output.c      |  115 ++++++++++++++++++++++++++++++++++++++---------------
 btt/trace_plug.c  |   10 ++++-
 6 files changed, 170 insertions(+), 76 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit b70a66427b4674b2a37660a196e5c6db181dd4ec:
  Alan D. Brunelle (1):
        Added new IOs per unplug table

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (2):
      Added bno_plot.py - generate interactive 3D plot of IO blocks and sizes
      Merge branch 'bno_plot.submit'

 Makefile        |    3 +-
 btt/bno_plot.py |  127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 1 deletions(-)
 create mode 100644 btt/bno_plot.py

Recent changes

[Jens Axboe]

The following changes since commit feb161907bf39fab6bedacf066fe7de6639cea93:
  Alan D. Brunelle (1):
        Merge branch 'bno_plot.submit'

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Alan D. Brunelle (1):
      Added info about bno_plot.py and clean ups

 btt/bno_plot.py               |    4 +-
 btt/doc/Makefile              |    2 +-
 btt/doc/bno_plot.eps          | 7696 +++++++++++++++++++++++++++++++++++++++++
 btt/doc/btt.tex               |   70 +-
 btt/doc/sample-btt-output.tex |  177 +-
 5 files changed, 7828 insertions(+), 121 deletions(-)
 create mode 100644 btt/doc/bno_plot.eps

Recent changes

[Jens Axboe]

The following changes since commit ef14423994b40499402269896fc1aa5567bcdba9:
  Alan D. Brunelle (1):
        Added info about bno_plot.py and clean ups

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Aaron Carroll (2):
      btt: fix iostat interval default
      btt: fix missing cleanup call

Alan D. Brunelle (1):
      Cleanups: Fixed IOPs in btt left over at end of run

 btt/Makefile         |    3 +-
 btt/args.c           |    1 -
 btt/bno_dump.c       |    2 +-
 btt/bt_timeline.c    |   44 ++-------------------
 btt/devs.c           |   56 +--------------------------
 btt/dip_rb.c         |    7 +--
 btt/globals.h        |   45 ++-------------------
 btt/inlines.h        |  104 +++++++-------------------------------------------
 btt/iostat.c         |    4 +-
 btt/misc.c           |    4 +-
 btt/mmap.c           |    8 +---
 btt/output.c         |    2 -
 btt/proc.c           |   11 ++---
 btt/seek.c           |    8 ++--
 btt/trace.c          |   13 +-----
 btt/trace_complete.c |    8 ++--
 btt/trace_issue.c    |    8 +--
 btt/trace_queue.c    |    2 +-
 btt/unplug_hist.c    |    3 -
 19 files changed, 54 insertions(+), 279 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 8b10aae0cd4137f1cc9848181e4f45a9fa20de24:
  Alan D. Brunelle (1):
        Cleanups: Fixed IOPs in btt left over at end of run

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Bas Zoetekouw (4):
      Added man page for bno_plot and updated btt man page to refer to bno_plot
      Really commit the changes to btt.1
      Don't like btrecord against libaio and librt, as it doesn't use any of their symbols
      Fix section of btrecord and btreplay man pages

 btreplay/Makefile |    2 +-
 doc/bno_plot.1    |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/btrecord.8    |    2 +-
 doc/btreplay.8    |    2 +-
 doc/btt.1         |    8 +++++-
 5 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 doc/bno_plot.1

Recent changes

[Jens Axboe]

The following changes since commit 967492e81cd045b058fc93dacc15924bebd00b9b:
  Bas Zoetekouw (1):
        Fix section of btrecord and btreplay man pages

are available in the git repository at:

  git://git.kernel.dk/data/git/blktrace.git master

Christof Schmitt (2):
      blkparse: Add PC requests to depth trace
      blkparse: Introduce optional accounting of PC requests

 blkparse.c |  138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 blktrace.h |    3 +
 2 files changed, 139 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 967492e81cd045b058fc93dacc15924bebd00b9b:
  Bas Zoetekouw (1):
        Fix section of btrecord and btreplay man pages

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Christof Schmitt (2):
      blkparse: Add PC requests to depth trace
      blkparse: Introduce optional accounting of PC requests

 blkparse.c |  138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 blktrace.h |    3 +
 2 files changed, 139 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 801646d63fe28ae2c50ab5bd0e9ea4f75ff64d97:
  Christof Schmitt (1):
        blkparse: Introduce optional accounting of PC requests

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Luis Useche (3):
      eliminate check of empty -F format
      Fix problem with -w option
      Add -x accellerator option

 blkparse.c                |   10 ++++++----
 blkparse_fmt.c            |    4 ----
 btreplay/btreplay.c       |   27 ++++++++++++++++++++++++---
 btreplay/doc/btreplay.tex |   13 ++++++++++++-
 4 files changed, 42 insertions(+), 12 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 4a7968cc672f39573abc6002f0afbed2a8e8139b:
  Luis Useche (1):
        Add -x accellerator option

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Added -X option - generate easily parseable file

 btt/args.c        |   36 ++++++++++++++++++++++++-----
 btt/bt_timeline.c |    5 ++-
 btt/doc/btt.tex   |   56 +++++++++++++++++++++++++++++++++++++++++++--
 btt/globals.h     |    3 +-
 btt/output.c      |   64 +++++++++++++++++++++++++++++++++++++++++++++++++---
 5 files changed, 148 insertions(+), 16 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit f028c9584055737f429979e18ab7436583ed41b5:
  Alan D. Brunelle (1):
        Added -X option - generate easily parseable file

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Added S2G times + fixed up -X output to include X2X

 btt/bt_timeline.c    |    2 +-
 btt/doc/btt.tex      |   38 ++++++++++++++++++++++++++++++--------
 btt/globals.h        |    8 ++++++--
 btt/inlines.h        |    5 +++++
 btt/output.c         |   42 +++++++++++++++++++++++++++---------------
 btt/trace.c          |    1 +
 btt/trace_complete.c |    3 +++
 btt/trace_im.c       |   36 +++++++++++++++++++++++++++++++-----
 btt/trace_issue.c    |    4 ++++
 btt/trace_queue.c    |    3 +++
 10 files changed, 111 insertions(+), 31 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 354db430eeaced3b8234668e6527910875d54e50:
  Alan D. Brunelle (1):
        Added S2G times + fixed up -X output to include X2X

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Fixed percentage calculations for phases of an I/O

 btt/output.c |   86 +++++++++++++++++----------------------------------------
 1 files changed, 26 insertions(+), 60 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit dd14158dca460522c22afbd7e22343e4012fffe0:
  Alan D. Brunelle (1):
        Fixed percentage calculations for phases of an I/O

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (1):
      blkparse: cope with missing process notify event

 blkparse.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit ebe2d1aa7f334fc526a97f8acf62f1fe7dac9a8a:
  Jens Axboe (1):
        blkparse: cope with missing process notify event

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      Added in -m option, seeks-per-second
      Handled no difference in seek times

 btt/args.c        |   17 +-
 btt/bt_timeline.c |    5 +-
 btt/doc/btt.tex   |   54 +-
 btt/doc/sps.eps   | 5377 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 btt/globals.h     |    2 +-
 btt/seek.c        |   70 +-
 6 files changed, 5517 insertions(+), 8 deletions(-)
 create mode 100644 btt/doc/sps.eps

Recent changes

[Jens Axboe]

The following changes since commit 5bebfd168c3f3f42acfd4a0263e9f4d1f5faea16:
  Alan D. Brunelle (1):
        Handled no difference in seek times

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (3):
      Added in handling of MESSAGE notes
      Added in new message updates to the documentation.
      Put message notes from kernel into a separate file for easy tracking

 blkparse.c        |   24 +++++++++++++++++++++---
 blkparse_fmt.c    |    6 +++++-
 blktrace_api.h    |    2 ++
 btt/args.c        |   11 ++++++++++-
 btt/bt_timeline.c |    4 +++-
 btt/globals.h     |    3 ++-
 btt/iostat.c      |    2 +-
 btt/misc.c        |   16 ++++++++++++++++
 btt/output.c      |   52 ++++++++++++++++------------------------------------
 btt/trace.c       |   19 +++++++++++++++++++
 doc/blktrace.tex  |   13 ++++++++++++-
 11 files changed, 107 insertions(+), 45 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 84a26fcd9adebd1537bf2c4eee69d1ca23ccbc5f:
  Alan D. Brunelle (1):
        Put message notes from kernel into a separate file for easy tracking

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jeff Moyer (1):
      spelling and grammar fixes for btreplay.tex

 btreplay/doc/btreplay.tex |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit ea86559e392fc012f9b30eb109d3421d463c8848:
  Jeff Moyer (1):
        spelling and grammar fixes for btreplay.tex

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

David Woodhouse (2):
      blktrace: support discard requests
      Add documentation of 'D' discard operation

 act_mask.c       |    1 +
 blkparse_fmt.c   |    5 ++++-
 blkrawverify.c   |    1 +
 blktrace_api.h   |    1 +
 doc/blkparse.1   |    6 +++---
 doc/blktrace.tex |    4 ++--
 6 files changed, 12 insertions(+), 6 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 64c031619f9d7fbafce96d6e6c29f945b589141b:
  David Woodhouse (1):
        Add documentation of 'D' discard operation

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (1):
      Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/blktrace

Nathan Scott (2):
      man page typo
      spec file tweak

 btrace.spec    |    1 +
 doc/blktrace.8 |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 4133e838c72f5f66e0c5b57af1aa24bf10a23b07:
  Nathan Scott (1):
        spec file tweak

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (3):
      Added in %done for btt
      Merge branch 'master' of ssh://alanbrunelle@git.kernel.dk/data/git/blktrace
      Removed excessive amounts of seek modes (for random sets of I/Os)

 btt/globals.h |    1 +
 btt/mmap.c    |    5 +++++
 btt/output.c  |   18 +++++++++++++-----
 btt/trace.c   |    2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit abf63eafd11e42e0f065e56fc4773e6854087d41:
  Alan D. Brunelle (1):
        Removed excessive amounts of seek modes (for random sets of I/Os)

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      Added in -Q / --active-queue-depth option
      Added in -L option - output periodic latency information

Jens Axboe (1):
      blktrace: accept -v (lower case) for version info as well

Martin Peschke (1):
      blkiomon: I/O monitor

Stefan Raspl (1):
      Add driver data support

 Makefile             |    5 +-
 act_mask.c           |    1 +
 blkiomon.c           |  708 ++++++++++++++++++++++++++++++++++++++++++++++++++
 blkiomon.h           |  105 ++++++++
 blkparse.c           |    3 +
 blktrace.c           |    9 +-
 blktrace_api.h       |    3 +
 btt/Makefile         |    3 +-
 btt/aqd.c            |   83 ++++++
 btt/args.c           |   22 ++-
 btt/bt_timeline.c    |    4 +-
 btt/devs.c           |    8 +
 btt/doc/btt.tex      |   18 ++-
 btt/globals.h        |   19 ++-
 btt/latency.c        |    2 +
 btt/plat.c           |  102 ++++++++
 btt/trace_complete.c |    1 +
 btt/trace_issue.c    |    1 +
 doc/blkiomon.8       |  116 ++++++++
 doc/btt.1            |   23 ++-
 stats.h              |  155 +++++++++++
 21 files changed, 1381 insertions(+), 10 deletions(-)
 create mode 100644 blkiomon.c
 create mode 100644 blkiomon.h
 create mode 100644 btt/aqd.c
 create mode 100644 btt/plat.c
 create mode 100644 doc/blkiomon.8
 create mode 100644 stats.h

Recent changes

[Jens Axboe]

The following changes since commit 2baef5087c57d39ee2fc488cd52348f61f32b1fc:
  Alan D. Brunelle (1):
        Added in -L option - output periodic latency information

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Martin Peschke (1):
      blkparse: add hint for discarded drv_data traces

 blkparse.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit c701176c4befb44efe68e3b5e09ca710b4be357d:
  Martin Peschke (1):
        blkparse: add hint for discarded drv_data traces

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Martin Peschke (1):
      blkiomon: drv_data traces pass-through

 blkiomon.c |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 3bc3451b471fe4cea365654481258a1a1913018e:
  Martin Peschke (1):
        blkiomon: drv_data traces pass-through

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Martin Peschke (6):
      blkiomon: fix cross-arch data analysis issue
      blkiomon: fix unit in histogram output
      blkiomon: fix trace debug output
      blkiomon: fix some debug messages
      blkiomon: separate statistics for read and write requests
      blkiomon: add through-put statistics

 blkiomon.c |   62 +++++++++++++++++++++++++++++++++++------------------------
 blkiomon.h |   56 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 71 insertions(+), 47 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 53cab5f58afd61525674ba7d6de8ac111f173a90:
  Martin Peschke (1):
        blkiomon: add through-put statistics

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (2):
      Update rbtree to version with unified parent + color
      Set release version 1.0.0

 blkparse.c |    2 +-
 blktrace.c |    2 +-
 rbtree.c   |  195 ++++++++++++++++++++++++++++++-----------------------------
 rbtree.h   |   22 ++++++-
 4 files changed, 119 insertions(+), 102 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 07b96824e26286321b99c30526d8d67aca16e584:
  Jens Axboe (1):
        Set release version 1.0.0

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (3):
      Moved btrecord/btreplay to version 1.0.0
      Merge branch 'master' of ssh://alanbrunelle@git.kernel.dk/data/git/blktrace
      Added in -z to provide running waiting-for-issue latencies

 btreplay/btrecord.h |    8 ++++----
 btt/args.c          |   12 +++++++++++-
 btt/bt_timeline.c   |    4 ++--
 btt/devs.c          |    3 +++
 btt/doc/btt.tex     |   23 +++++++++++++++--------
 btt/globals.h       |    8 +++++---
 btt/latency.c       |    7 +++++++
 btt/trace_issue.c   |    2 ++
 doc/btt.1           |   15 +++++++++++++--
 9 files changed, 62 insertions(+), 20 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit e47ada103e028a691d296d09d0bc673a3af6a3dc:
  Alan D. Brunelle (1):
        Added in -z to provide running waiting-for-issue latencies

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (6):
      Fixed segfault in aqd.c : need to check for NULL (not requested)
      Fixed 'M' displays on per-io output and added in I/O separator
      Merge branch 'fix-m' into add-P
      Added -P to create a data file w/ Q, D and C per line
      Merge branch 'fix-m'
      Merge branch 'add-P'

 btt/aqd.c            |   22 +++++++++++++---------
 btt/args.c           |   12 +++++++++++-
 btt/bt_timeline.c    |    4 ++--
 btt/devs.c           |   15 +++++++++++++++
 btt/doc/btt.tex      |    9 ++++++++-
 btt/globals.h        |    3 ++-
 btt/trace_complete.c |   24 +++++++++++++++++++++++-
 doc/btt.1            |   11 +++++++++++
 8 files changed, 85 insertions(+), 15 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 0f067275d74a96ca9d574e9912a60bfa81b4df97:
  Alan D. Brunelle (1):
        Merge branch 'add-P'

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      gcc 4.3.2 has started to warn about:

 btt/output.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit ef02006b0131f298595b37afb07562ee50fae5cc:
  Alan D. Brunelle (1):
        gcc 4.3.2 has started to warn about:

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Added no messages option to blkparse.c

 blkparse.c       |   20 +++++++++++++++++---
 doc/blkparse.1   |    9 +++++++++
 doc/blktrace.tex |    1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 19cfaf3f4d8e53ce43cccd809676f8f2a40f0b34:
  Alan D. Brunelle (1):
        Added no messages option to blkparse.c

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Martin Peschke (2):
      The git commit 11914a53d2ec2974a565311af327b8983d8c820d added __BLK_TA_ABORT
      A couple of min-counters weren't initialised correctly (thrput_r,

 blkiomon.c     |    6 +-----
 blktrace_api.h |    2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 61165962f86cb2de0b163f6083bff5649f692e91:
  Martin Peschke (1):
        A couple of min-counters weren't initialised correctly (thrput_r,

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      Increased limits to allow for large system runs
      Fix btt to handle large numbers of output files

 blktrace.c     |   65 +++++++++++++++++++++++++++++++++++++++++++++++++------
 btt/aqd.c      |    2 +-
 btt/args.c     |   10 ++++----
 btt/bno_dump.c |    2 +-
 btt/devmap.c   |    2 +-
 btt/devs.c     |    2 +-
 btt/globals.h  |    1 +
 btt/latency.c  |    2 +-
 btt/misc.c     |   46 ++++++++++++++++++++++++++++++++++++++-
 btt/output.c   |    4 +-
 btt/plat.c     |    2 +-
 btt/seek.c     |    4 +-
 12 files changed, 119 insertions(+), 23 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 99bb5ebc255618e4af913d2e5f1bf268af552bdf:
  Alan D. Brunelle (1):
        Fix btt to handle large numbers of output files

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Rewrote blktrace to have a single thread per CPU

 blktrace.c | 3230 ++++++++++++++++++++++++++++++++++--------------------------
 btt/list.h |   23 +
 2 files changed, 1878 insertions(+), 1375 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 3fe0b570b01622e329b9c999ebf867b1f1cb2e20:
  Alan D. Brunelle (1):
        Rewrote blktrace to have a single thread per CPU

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (5):
      Added accept as a system call needing resource increases
      Invoke gethostbyname once, handle errors better
      Synchronized trace gathering
      btt: fixed open in setup_ifile
      Moved starting of tracing after tracers are going

 blktrace.c    |  119 ++++++++++++++++++++++++++++++++++++++++++++++----------
 btt/globals.h |    1 +
 btt/misc.c    |   64 +++++++++++++++++++------------
 btt/mmap.c    |    3 +-
 4 files changed, 139 insertions(+), 48 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 3b552a2d1ff8ecccbbb82668f73d1cb134fca1e9:
  Alan D. Brunelle (1):
        Moved starting of tracing after tracers are going

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (4):
      Cleaned up devs that have no data
      Reworked blktrace master/thread interface
      Code review updates
      btt: Missed fopen conversion to my_fopen

 blktrace.c        |  738 ++++++++++++++++++++++++++++-------------------------
 btt/bt_timeline.c |    2 +
 btt/devs.c        |   52 +++--
 btt/globals.h     |    1 +
 btt/unplug_hist.c |    2 +-
 5 files changed, 433 insertions(+), 362 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 8f34184f8c7905bb929862d224a7c4969bc9190e:
  Alan D. Brunelle (1):
        btt: Missed fopen conversion to my_fopen

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      btt general cleanup plus valgrind clean
      btt: Added no remap option

 btt/aqd.c         |   13 +----
 btt/args.c        |  111 ++++++++++++++++++++--------------------------
 btt/bno_dump.c    |   36 +++++----------
 btt/bt_timeline.c |   28 ++++--------
 btt/devmap.c      |   60 +++++++++++++++----------
 btt/devs.c        |   50 ++++++++++-----------
 btt/doc/btt.tex   |    7 +++-
 btt/globals.h     |   63 ++++++++++-----------------
 btt/inlines.h     |    7 +--
 btt/iostat.c      |   61 ++++++++++---------------
 btt/latency.c     |   33 +++++--------
 btt/misc.c        |  126 +++++++++++++++++++++++++----------------------------
 btt/mmap.c        |   12 +++--
 btt/output.c      |    4 +-
 btt/plat.c        |   19 ++------
 btt/proc.c        |   31 +++++++------
 btt/q2d.c         |    4 +-
 btt/seek.c        |  109 +++++++++++++++++++++-------------------------
 btt/trace.c       |   15 +++----
 btt/trace_plug.c  |    2 +-
 btt/trace_remap.c |    6 ++-
 btt/unplug_hist.c |   11 ++---
 doc/btt.1         |   10 ++++
 23 files changed, 375 insertions(+), 443 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit ee27874baa43db7d697b5de72938e4ccb71bdabb:
  Alan D. Brunelle (1):
        btt: Added no remap option

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Fixed EAGAIN handling in blktrace.c

Jens Axboe (1):
      O_NOATIME isn't always present

 blktrace.c          |    7 +++++--
 btreplay/btreplay.c |    9 ++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 5d65b5e6333cfdd14ab0e944cef8474445e531b3:
  Alan D. Brunelle (1):
        Fixed EAGAIN handling in blktrace.c

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (2):
      Update Jenkins hash to lookup3() variant
      Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/blktrace

 jhash.h |  154 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 84 insertions(+), 70 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit c2039a2eebe7d48d8e1f62e727affa28f0e2b65e:
  Jens Axboe (1):
        Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/blktrace

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Generate matplotlib plots for btt generated data

 btt/btt_plot.py |  394 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 394 insertions(+), 0 deletions(-)
 create mode 100755 btt/btt_plot.py

Recent changes

[Jens Axboe]

The following changes since commit 726d2aee9d2b97b32daa08824857c77f9536609f:
  Alan D. Brunelle (1):
        Generate matplotlib plots for btt generated data

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Tom Zanussi (1):
      Blktrace failed to lock reader threads on the cpu used by the corresponding writer. This resulted in stale data being consumed when blktrace accidently read at a position that was being written to at the same time. This issue surfaced as "bad trace magic" warnings emitted by blktrace tools.

 blktrace.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit f547a39d32d514eb7bce82b955193b73e9828c85:
  Tom Zanussi (1):
        Blktrace failed to lock reader threads on the cpu used by the corresponding writer. This resulted in stale data being consumed when blktrace accidently read at a position that was being written to at the same time. This issue surfaced as "bad trace magic" warnings emitted by blktrace tools.

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Carl Henrik Lunde (1):
      Add NOTIFY to activity mask

 act_mask.c       |    1 +
 doc/blktrace.8   |    2 ++
 doc/blktrace.tex |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit cfa089d429acfcb5a21be63ded7f943287401fef:
  Carl Henrik Lunde (1):
        Add NOTIFY to activity mask

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Eric Sandeen (1):
      fix trivial typo in manpage

 doc/blktrace.8 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit d8ba9b683e1a341ab72c40836c05a360875c2e5e:
  Eric Sandeen (1):
        fix trivial typo in manpage

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      Working on fixing % time q plugged
      Fixed plug/unplug logic in btt

 btt/devs.c       |   19 ++++++++++++-------
 btt/globals.h    |    4 ++--
 btt/output.c     |   17 +++++++++--------
 btt/trace_plug.c |    3 ++-
 4 files changed, 25 insertions(+), 18 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit bb4a66074cecd59afc37f0053fdf42661503f51c:
  Alan D. Brunelle (1):
        Fixed plug/unplug logic in btt

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jeff Moyer (1):
      handle race to mkdir at startup

 blktrace.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 60886290e2ba6ddae1213f3a13929193180c8c55:
  Jeff Moyer (1):
        handle race to mkdir at startup

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Martin Peschke (2):
      fix include statement in stats.h
      fix off-by-one issues in blkiomon.h

 stats.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit b5f8804a588fffdea10a0cd46a36fc196acea9f2:
  Martin Peschke (1):
        fix off-by-one issues in blkiomon.h

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      Converted to using the correct remap entries

Eric Sandeen (5):
      fix max-pkts option inconsistencies
      more manpage fixups
      fix up btrace options & manpage
      blkiomon manpage and usage reference invalid "msg-queue-name" option
      blkrawverify: warn and return error if no traces are found

Jens Axboe (1):
      Version 1.0.1

Martin Peschke (1):
      blkiomon: fix unaligned accesses on ia64

 blkiomon.c          |    4 ++--
 blkiomon.h          |    4 ++--
 blkparse.c          |    2 +-
 blkparse_fmt.c      |   27 ++++++++++++++++-----------
 blkrawverify.c      |    8 +++++++-
 blktrace_api.h      |    4 ++--
 btrace              |    7 ++-----
 btreplay/btrecord.c |    2 +-
 btt/trace_remap.c   |    9 ++++-----
 doc/blkiomon.8      |    4 ++--
 doc/blkparse.1      |    9 +--------
 doc/blkrawverify.1  |    2 +-
 doc/bno_plot.1      |    2 +-
 doc/btrace.8        |   20 ++++++++++++--------
 doc/btrecord.8      |   12 ++++++------
 doc/btreplay.8      |   10 ++++------
 doc/btt.1           |    3 ++-
 17 files changed, 66 insertions(+), 63 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 1e09f6e9012826fca69fa07222b7bc53c3e629ee:
  Jens Axboe (1):
        Version 1.0.1

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (2):
      Added in running stats for btt
      Added in running stats documentation

 btt/Makefile         |    2 +-
 btt/bt_timeline.c    |    6 +-
 btt/devs.c           |    2 +
 btt/doc/Makefile     |    2 +-
 btt/doc/btt.tex      |   49 ++-
 btt/doc/rstats.eps   | 1267 ++++++++++++++++++++++++++++++++++++++++++++++++++
 btt/globals.h        |   11 +-
 btt/rstats.c         |  136 ++++++
 btt/trace.c          |    2 +
 btt/trace_complete.c |    4 +-
 10 files changed, 1473 insertions(+), 8 deletions(-)
 create mode 100644 btt/doc/rstats.eps
 create mode 100644 btt/rstats.c

Recent changes

[Jens Axboe]

The following changes since commit 57c9bbc7f6bd3680910f99ba30d70b54a3076833:
  Alan D. Brunelle (1):
        Added in running stats documentation

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (2):
      blkparse: allow stdout output with -d option (using '-' as the filename)
      Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace

 blkparse.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 677ef89ccb24fb3e38b13b02b9394318afb78f30:
  Jens Axboe (1):
        Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      btt: better data file naming

 btt/aqd.c         |    6 ++--
 btt/bno_dump.c    |   18 ++++++---------
 btt/devs.c        |   63 +++++++++++++++++++++++-----------------------------
 btt/globals.h     |   15 ++++++------
 btt/latency.c     |   18 ++++++--------
 btt/misc.c        |    5 ++++
 btt/plat.c        |    6 ++--
 btt/rstats.c      |   14 ++++++-----
 btt/seek.c        |    8 ++++--
 btt/unplug_hist.c |   15 ++++++------
 10 files changed, 83 insertions(+), 85 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit a155ab989ffc8b9cf95a631309e9a825d04bcc68:
  Alan D. Brunelle (1):
        btt: better data file naming

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Alan D. Brunelle (1):
      btt: Added in I/O activity per device and system-wide

 btt/Makefile         |    2 +-
 btt/args.c           |   12 +-
 btt/bt_timeline.c    |    5 +-
 btt/btt_plot.py      |  102 +-
 btt/devs.c           |    2 +
 btt/doc/Makefile     |    2 +-
 btt/doc/btt.tex      |   73 +-
 btt/doc/live.eps     |65949 ++++++++++++++++++++++++++++++++++++++++++++++++++
 btt/globals.h        |   16 +-
 btt/output.c         |   34 +
 btt/p_live.c         |  202 +
 btt/trace_complete.c |    1 +
 doc/btt.1            |   10 +
 13 files changed, 66380 insertions(+), 30 deletions(-)
 create mode 100644 btt/doc/live.eps
 create mode 100644 btt/p_live.c

Recent changes

[Jens Axboe]

The following changes since commit 2e37a10ee8b470b805e7c26c703073dbc54ca84e:
  Alan D. Brunelle (1):
        btt: Added in I/O activity per device and system-wide

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Eric Sandeen (1):
      add libpthread to btreplay/Makefile LIBS

 btreplay/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Recent changes

[Jens Axboe]

The following changes since commit 0d76d14f46195eb4295c35bf15531890378c7684:

  add libpthread to btreplay/Makefile LIBS (2010-02-22 19:56:52 +0100)

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

Alan D. Brunelle (2):
      Corrected memory leak in btt/p_live.c
      Fixed incorrect sizeof instead of strlen in btt/rstats.c

 btt/p_live.c |    1 +
 btt/rstats.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/btt/p_live.c b/btt/p_live.c
index 8bbb893..17f06bb 100644
--- a/btt/p_live.c
+++ b/btt/p_live.c
@@ -86,6 +86,7 @@ static void __p_live_add(struct rb_root *root, __u64 dt, __u64 ct)
 			list_del(&plp->head);
 			rb_erase(&plp->rb_node, root);
 			__p_live_add(root, min(plp->dt, dt), max(plp->ct, ct));
+			free(plp);
 			return;
 		}
 
diff --git a/btt/rstats.c b/btt/rstats.c
index 71f010b..5a336fe 100644
--- a/btt/rstats.c
+++ b/btt/rstats.c
@@ -38,7 +38,7 @@ static LIST_HEAD(rstats);
 
 static int do_open(struct files *fip, char *bn, char *pn)
 {
-	fip->nm = malloc(sizeof(bn) + 16);
+	fip->nm = malloc(strlen(bn) + 16);
 	sprintf(fip->nm, "%s_%s.dat", bn, pn);
 
 	fip->fp = my_fopen(fip->nm, "w");
@@ -55,6 +55,7 @@ static int init_rsip(struct rstat *rsip, struct d_info *dip)
 {
 	char *nm = dip ? dip->dip_name : "sys";
 
+	rsip->base_sec = -1;
 	rsip->ios = rsip->nblks = 0;
 	if (do_open(&rsip->files[0], nm, "iops_fp") ||
 			    do_open(&rsip->files[1], nm, "mbps_fp"))

Recent changes

[Jens Axboe]

The following changes since commit 6abaea7a340536c6afa5944e3fa63831729dfed3:

  Fixed incorrect sizeof instead of strlen in btt/rstats.c (2010-03-22 10:21:12 -0400)

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

Eric Sandeen (1):
      blkparse: exit with error if no tracefiles found

Jens Axboe (1):
      Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace

 blkparse.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 5a49d6b..9bd8023 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2518,6 +2518,12 @@ static int do_file(void)
 
 		for (cpu = 0; setup_file(pdi, cpu); cpu++)
 			;
+
+		if (!cpu) {
+			fprintf(stderr,"No input files found for %s\n",
+				pdi->name);
+			return 1;
+		}
 	}
 
 	/*

Recent changes

[Jens Axboe]

The following changes since commit 014b0ea19762341e217d463308710c3662d50e9c:

  Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace (2010-04-19 19:15:27 +0200)

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Edward Shishkin (5):
      blktrace: avoid device duplication
      blktrace: print correct usage
      blktrace: add back conversion
      blktrace: update blkiomon doc
      blktrace: disable kill option - take 2

 blkparse.c          |    2 +-
 blktrace.c          |   12 ++++++++++--
 btreplay/btreplay.c |   13 +++++++++++--
 btt/args.c          |    3 +--
 doc/blkiomon.8      |    2 ++
 doc/blktrace.8      |   24 ++++--------------------
 6 files changed, 29 insertions(+), 27 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 9bd8023..ffad9b6 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2702,7 +2702,7 @@ static char usage_str[] =    "\n\n" \
 
 static void usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, blkparse_version, usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 int main(int argc, char *argv[])
diff --git a/blktrace.c b/blktrace.c
index b4c919d..b9f9b68 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -442,7 +442,6 @@ static char usage_str[] = \
 	"\t-r Path to mounted debugfs, defaults to /sys/kernel/debug\n" \
 	"\t-o File(s) to send output to\n" \
 	"\t-D Directory to prepend to output file names\n" \
-	"\t-k Kill a running trace\n" \
 	"\t-w Stop after defined time, in seconds\n" \
 	"\t-a Only trace specified actions. See documentation\n" \
 	"\t-A Give trace mask as a single value. See documentation\n" \
@@ -493,7 +492,7 @@ static inline void pdc_nev_update(struct devpath *dpp, int cpu, int nevents)
 
 static void show_usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, blktrace_version, usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 /*
@@ -1200,8 +1199,17 @@ static int add_devpath(char *path)
 {
 	int fd;
 	struct devpath *dpp;
+	struct list_head *p;
 
 	/*
+	 * Verify device is not duplicated
+	 */
+	__list_for_each(p, &devpaths) {
+	       struct devpath *tmp = list_entry(p, struct devpath, head);
+	       if (!strcmp(tmp->path, path))
+		        return 0;
+	}
+	/*
 	 * Verify device is valid before going too far
 	 */
 	fd = my_open(path, O_RDONLY | O_NONBLOCK);
diff --git a/btreplay/btreplay.c b/btreplay/btreplay.c
index 2d122ca..cba099a 100644
--- a/btreplay/btreplay.c
+++ b/btreplay/btreplay.c
@@ -1314,6 +1314,8 @@ static void reset_input_file(struct thr_info *tip)
  */
 static void *replay_sub(void *arg)
 {
+        int i;
+	char *mdev;
 	char path[MAXPATHLEN];
 	struct io_bunch bunch;
 	struct thr_info *tip = arg;
@@ -1321,8 +1323,15 @@ static void *replay_sub(void *arg)
 
 	pin_to_cpu(tip);
 
-	sprintf(path, "/dev/%s", map_dev(tip->devnm));
-
+	mdev = map_dev(tip->devnm);
+	sprintf(path, "/dev/%s", mdev);
+	/*
+	 * convert underscores to slashes to
+	 * restore device names that have larger paths
+	 */
+	for (i = 0; i < strlen(mdev); i++)
+	        if (path[strlen("/dev/") + i] = '_')
+		        path[strlen("/dev/") + i] = '/';
 #ifdef O_NOATIME
 	oflags = O_NOATIME;
 #else
diff --git a/btt/args.c b/btt/args.c
index 137c2f5..5c5078a 100644
--- a/btt/args.c
+++ b/btt/args.c
@@ -244,8 +244,7 @@ static char usage_str[] = \
 
 static void usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, bt_timeline_version,
-		usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 static FILE *setup_ofile(char *fname)
diff --git a/doc/blkiomon.8 b/doc/blkiomon.8
index dbed0df..aa5ece2 100644
--- a/doc/blkiomon.8
+++ b/doc/blkiomon.8
@@ -17,6 +17,8 @@ blkiomon is a block device I/O monitor. It periodically generates per-device
 request size and request latency statistics from blktrace data. It provides
 histograms as well as data that can be used to calculate min, max, average
 and variance. For this purpose, it consumes D and C traces read from stdin.
+Note, that this doesn't work for logical volumes, as high-level drivers
+don't see the completion of the events (C).
 
 There are options for binary output and human-readable output to files and
 stdout. Output to a message queue is supported as well.
diff --git a/doc/blktrace.8 b/doc/blktrace.8
index 58e8f90..ab6a3f3 100644
--- a/doc/blktrace.8
+++ b/doc/blktrace.8
@@ -66,19 +66,10 @@ blktrace may also be run concurrently with blkparse to produce
 .TP 2
 \- 
 The default behaviour for blktrace is to run forever until explicitly
-killed by the user (via a control-C, or kill utility invocation).
-There are two ways to modify this:
-
-.TP 5
-  1. 
-You may utilise the blktrace utility itself to kill
-a running trace -- via the \fB\-k\fR option.
-
-.TP 5
-  2.
-You can specify a run-time duration for blktrace via the
-\fB\-w\fR option -- then blktrace will run for the specified number
-of seconds, and then halt.
+killed by the user (via a control-C, or sending SIGINT signal to the
+process via invocation the kill (1) utility). Also you can specify a
+run-time duration for blktrace via the \fB\-w\fR option -- then
+blktrace will run for the specified number of seconds, and then halt.
 
 
 .SH OPTIONS
@@ -119,13 +110,6 @@ Adds \fIdev\fR as a device to trace
 Adds the devices found in \fIfile\fR as devices to trace
 .RE
 
-\-k 
-.br
-\-\-kill 
-.RS
-Kill on-going trace  
-.RE
-
 \-n \fInum\-sub\fR 
 .br
 \-\-num\-sub=\fInum-sub\fR    

Recent changes

[Jens Axboe]

The following changes since commit fb7f86674a516ddff0d60bfab3bd284a4812075f:

  blktrace: disable kill option - take 2 (2010-04-20 15:41:14 +0200)

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

Alan D. Brunelle (1):
      blktrace: disallow -o when using multiple devices

 blktrace.c       |    6 ++++++
 doc/blktrace.8   |    3 +++
 doc/blktrace.tex |    5 ++++-
 3 files changed, 13 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/blktrace.c b/blktrace.c
index b9f9b68..4671a04 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -2626,6 +2626,12 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
+	if (ndevs > 1 && output_name && strcmp(output_name, "-") != 0) {
+		fprintf(stderr, "-o not supported with multiple devices\n");
+		ret = 1;
+		goto out;
+	}
+
 	signal(SIGINT, handle_sigint);
 	signal(SIGHUP, handle_sigint);
 	signal(SIGTERM, handle_sigint);
diff --git a/doc/blktrace.8 b/doc/blktrace.8
index ab6a3f3..50b3a62 100644
--- a/doc/blktrace.8
+++ b/doc/blktrace.8
@@ -122,6 +122,9 @@ Specifies number of buffers to use. blktrace defaults to 4 sub buffers.
 \-\-output=\fIfile\fR        
 .RS
 Prepend \fIfile\fR to output file name(s)  
+
+This only works when supplying a single device, or when piping the output
+via "-o -" with multiple devices.
 .RE
 
 \-r \fIrel-path\fR
diff --git a/doc/blktrace.tex b/doc/blktrace.tex
index 54fe451..4d8278e 100644
--- a/doc/blktrace.tex
+++ b/doc/blktrace.tex
@@ -389,7 +389,10 @@ Short              & Long                       & Description \\ \hline\hline
 -d \emph{dev}      & --dev=\emph{dev}           & Adds \emph{dev} as a device to trace \\ \hline
 -k                 & --kill                     & Kill on-going trace \\ \hline
 -n \emph{num-sub}  & --num-sub=\emph{num-sub}   & Specifies number of buffers to use \\ \hline
--o \emph{file}     & --output=\emph{file}       & Prepend \emph{file} to output file name(s) \\ \hline
+-o \emph{file}     & --output=\emph{file}       & Prepend \emph{file} to output file name(s) \\
+                   &                            & \textbf{This only works when using a single device} \\
+                   &                            & \textbf{or when piping the output via \texttt{-o -}} \\
+                   &                            & \textbf{with multiple devices.} \\ \hline
 -r \emph{rel-path} & --relay=\emph{rel-path}    & Specifies debugfs mount point \\ \hline
 -V                 & --version                  & Outputs version \\ \hline
 -w \emph{seconds}  & --stopwatch=\emph{seconds} & Sets run time to the number of seconds specified \\ \hline

Re: Recent changes

[Edward Shishkin]

Hello.
How about these ones:

http://marc.info/?l=linux-btrace&m\x128049870115477&w=2
http://marc.info/?l=linux-btrace&m\x128049870215491&w=2
http://marc.info/?l=linux-btrace&m\x128049871415498&w=2
http://marc.info/?l=linux-btrace&m\x128049873015527&w=2
http://marc.info/?l=linux-btrace&m\x128049874115543&w=2
http://marc.info/?l=linux-btrace&m\x128049875115566&w=2

any chances they will be pushed? All of them except the second
one (blkiomon fixups) are ack-ed by Alan D. Brunelle.

Thanks,
Edward.

Jens Axboe wrote:
> The following changes since commit fb7f86674a516ddff0d60bfab3bd284a4812075f:
>
>   blktrace: disable kill option - take 2 (2010-04-20 15:41:14 +0200)
>
> are available in the git repository at:
>   git://git.kernel.dk/blktrace.git master
>
> Alan D. Brunelle (1):
>       blktrace: disallow -o when using multiple devices
>
>  blktrace.c       |    6 ++++++
>  doc/blktrace.8   |    3 +++
>  doc/blktrace.tex |    5 ++++-
>  3 files changed, 13 insertions(+), 1 deletions(-)
>
> ---
>
> Diff of recent changes:
>
> diff --git a/blktrace.c b/blktrace.c
> index b9f9b68..4671a04 100644
> --- a/blktrace.c
> +++ b/blktrace.c
> @@ -2626,6 +2626,12 @@ int main(int argc, char *argv[])
>  		goto out;
>  	}
>  
> +	if (ndevs > 1 && output_name && strcmp(output_name, "-") != 0) {
> +		fprintf(stderr, "-o not supported with multiple devices\n");
> +		ret = 1;
> +		goto out;
> +	}
> +
>  	signal(SIGINT, handle_sigint);
>  	signal(SIGHUP, handle_sigint);
>  	signal(SIGTERM, handle_sigint);
> diff --git a/doc/blktrace.8 b/doc/blktrace.8
> index ab6a3f3..50b3a62 100644
> --- a/doc/blktrace.8
> +++ b/doc/blktrace.8
> @@ -122,6 +122,9 @@ Specifies number of buffers to use. blktrace defaults to 4 sub buffers.
>  \-\-output=\fIfile\fR        
>  .RS
>  Prepend \fIfile\fR to output file name(s)  
> +
> +This only works when supplying a single device, or when piping the output
> +via "-o -" with multiple devices.
>  .RE
>  
>  \-r \fIrel-path\fR
> diff --git a/doc/blktrace.tex b/doc/blktrace.tex
> index 54fe451..4d8278e 100644
> --- a/doc/blktrace.tex
> +++ b/doc/blktrace.tex
> @@ -389,7 +389,10 @@ Short              & Long                       & Description \\ \hline\hline
>  -d \emph{dev}      & --dev=\emph{dev}           & Adds \emph{dev} as a device to trace \\ \hline
>  -k                 & --kill                     & Kill on-going trace \\ \hline
>  -n \emph{num-sub}  & --num-sub=\emph{num-sub}   & Specifies number of buffers to use \\ \hline
> --o \emph{file}     & --output=\emph{file}       & Prepend \emph{file} to output file name(s) \\ \hline
> +-o \emph{file}     & --output=\emph{file}       & Prepend \emph{file} to output file name(s) \\
> +                   &                            & \textbf{This only works when using a single device} \\
> +                   &                            & \textbf{or when piping the output via \texttt{-o -}} \\
> +                   &                            & \textbf{with multiple devices.} \\ \hline
>  -r \emph{rel-path} & --relay=\emph{rel-path}    & Specifies debugfs mount point \\ \hline
>  -V                 & --version                  & Outputs version \\ \hline
>  -w \emph{seconds}  & --stopwatch=\emph{seconds} & Sets run time to the number of seconds specified \\ \hline
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrace" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>   


-- 
Edward O. Shishkin
Principal Software Engineer
Red Hat Czech

Re: Recent changes

[Jens Axboe]

On 2010-10-12 17:38, Edward Shishkin wrote:
> Hello.
> How about these ones:
> 
> http://marc.info/?l=linux-btrace&m\x128049870115477&w=2
> http://marc.info/?l=linux-btrace&m\x128049870215491&w=2
> http://marc.info/?l=linux-btrace&m\x128049871415498&w=2
> http://marc.info/?l=linux-btrace&m\x128049873015527&w=2
> http://marc.info/?l=linux-btrace&m\x128049874115543&w=2
> http://marc.info/?l=linux-btrace&m\x128049875115566&w=2
> 
> any chances they will be pushed? All of them except the second
> one (blkiomon fixups) are ack-ed by Alan D. Brunelle.

I was expecting Alan to commit them. But I can do it, will push
it later tonight.

-- 
Jens Axboe

Recent changes

[Jens Axboe]

The following changes since commit ce2151ebdca6f2741dbd903aa3845c56adcba8f4:

  blktrace: disallow -o when using multiple devices (2010-09-16 09:26:22 -0400)

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

Edward Shishkin (6):
      blktrace: btrecord man pages fixup
      blktrace: blkiomon documentation update
      blktrace: blkparse documentation update
      blktrace: blktrace documentation update
      blktrace: btreplay man pages update
      blktrace: btt documentation update

 blkiomon.c     |    1 +
 blkparse.c     |    2 +
 blktrace.c     |   22 ++++++++++++++++++--
 doc/blkiomon.8 |    9 +++++++-
 doc/blkparse.1 |   20 +++++++++++++++++++
 doc/blktrace.8 |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 doc/btrecord.8 |    2 +-
 doc/btreplay.8 |    7 ++++++
 doc/btt.1      |   21 ++++++++++++++++++++
 9 files changed, 131 insertions(+), 11 deletions(-)

---

Diff of recent changes:

diff --git a/blkiomon.c b/blkiomon.c
index 9fc4d75..a895f65 100644
--- a/blkiomon.c
+++ b/blkiomon.c
@@ -599,6 +599,7 @@ static char usage_str[] = "\n\nblkiomon " \
 	"-I <interval>       | --interval=<interval>\n" \
 	"[ -h <file>         | --human-readable=<file> ]\n" \
 	"[ -b <file>         | --binary=<file> ]\n" \
+	"[ -d <file>         | --dump-lldd=<file> ]\n" \
 	"[ -D <file>         | --debug=<file> ]\n" \
 	"[ -Q <path name>    | --msg-queue=<path name>]\n" \
 	"[ -q <msg queue id> | --msg-queue-id=<msg queue id>]\n" \
diff --git a/blkparse.c b/blkparse.c
index ffad9b6..da34c14 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2680,6 +2680,8 @@ static char usage_str[] =    "\n\n" \
 	"[ -M                | --no-msgs\n" \
 	"[ -v                | --verbose ]\n" \
 	"[ -V                | --version ]\n\n" \
+	"\t-a Only trace specified actions. See documentation\n" \
+	"\t-A Give trace mask as a single value. See documentation\n" \
 	"\t-b stdin read batching\n" \
 	"\t-d Output file. If specified, binary data is written to file\n" \
 	"\t-D Directory to prepend to input file names\n" \
diff --git a/blktrace.c b/blktrace.c
index 4671a04..4cccb7c 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -435,9 +435,24 @@ static struct option l_opts[] = {
 	}
 };
 
-static char usage_str[] = \
-	"-d <dev> [ -r debugfs path ] [ -o <output> ] [-k ] [ -w time ]\n" \
-	"[ -a action ] [ -A action mask ] [ -I  <devs file> ] [ -v ]\n\n" \
+static char usage_str[] = "\n\n" \
+	"-d <dev>             | --dev=<dev>\n" \
+        "[ -r <debugfs path>  | --relay=<debugfs path> ]\n" \
+        "[ -o <file>          | --output=<file>]\n" \
+        "[ -D <dir>           | --output-dir=<dir>\n" \
+        "[ -w <time>          | --stopwatch=<time>]\n" \
+        "[ -a <action field>  | --act-mask=<action field>]\n" \
+        "[ -A <action mask>   | --set-mask=<action mask>]\n" \
+        "[ -b <size>          | --buffer-size]\n" \
+        "[ -n <number>        | --num-sub-buffers=<number>]\n" \
+        "[ -l                 | --listen]\n" \
+        "[ -h <hostname>      | --host=<hostname>]\n" \
+        "[ -p <port number>   | --port=<port number>]\n" \
+        "[ -s                 | --no-sendfile]\n" \
+        "[ -I <devs file>     | --input-devs=<devs file>]\n" \
+        "[ -v <version>       | --version]\n" \
+        "[ -V <version>       | --version]\n" \
+
 	"\t-d Use specified device. May also be given last after options\n" \
 	"\t-r Path to mounted debugfs, defaults to /sys/kernel/debug\n" \
 	"\t-o File(s) to send output to\n" \
@@ -452,6 +467,7 @@ static char usage_str[] = \
 	"\t-p Network port to use (default 8462)\n" \
 	"\t-s Make the network client NOT use sendfile() to transfer data\n" \
 	"\t-I Add devices found in <devs file>\n" \
+	"\t-v Print program version info\n" \
 	"\t-V Print program version info\n\n";
 
 static void clear_events(struct pollfd *pfd)
diff --git a/doc/blkiomon.8 b/doc/blkiomon.8
index aa5ece2..34fbba8 100644
--- a/doc/blkiomon.8
+++ b/doc/blkiomon.8
@@ -7,7 +7,7 @@ blkiomon \- monitor block device I/O based o blktrace data
 
 .SH SYNOPSIS
 .B blkiomon \-I \fIinterval\fR [ \-h \fIfile\fR ] [ \-b \fIfile\fR ]
-[ \-D \fIfile\fR ] [ \-Q \fIpath_name\fR
+[ \-d \fIfile\fR ] [ \-D \fIfile\fR ] [ \-Q \fIpath_name\fR
 \-q \fImsg_queue_id\fR \-m \fImsg_id\fR ] [ \-V ]
 .br
 
@@ -50,6 +50,13 @@ Human-readable output file. Use '\-' for stdout.
 Binary output file. Use '\-' for stdout.
 .RE
 
+\-d \fIfile\fR
+.br
+\-\-dump-lldd=\fIfile\fR
+.RS
+Output file for data emitted by low level device driver.
+.RE
+
 \-D \fIfile\fR
 .br
 \-\-debug=\fIfile\fR
diff --git a/doc/blkparse.1 b/doc/blkparse.1
index 11dab65..9193dbe 100644
--- a/doc/blkparse.1
+++ b/doc/blkparse.1
@@ -58,6 +58,26 @@ option.
 
 
 .SH OPTIONS
+\-A \fIhex-mask\fR
+.br
+\-\-set-mask=\fIhex-mask\fR
+.RS
+Set filter mask to \fIhex-mask\fR, see blktrace (8) for masks
+.RE
+
+\-a \fImask\fR
+.br
+\-\-act-mask=\fImask\fR
+.RS
+Add \fImask\fR to current filter, see blktrace (8) for masks
+.RE
+
+\-D \fIdir\fR
+.br
+\-\-input-directory=\fIdir\fR
+.RS
+Prepend \fIdir\fR to input file names
+.RE
 
 \-b \fIbatch\fR
 .br
diff --git a/doc/blktrace.8 b/doc/blktrace.8
index 50b3a62..b5e69b7 100644
--- a/doc/blktrace.8
+++ b/doc/blktrace.8
@@ -105,23 +105,59 @@ Adds \fIdev\fR as a device to trace
 
 \-I \fIfile\fR
 .br
-\-\-input-devs=\fIfile\fR 
+\-\-input\-devs=\fIfile\fR
 .RS
 Adds the devices found in \fIfile\fR as devices to trace
 .RE
 
 \-n \fInum\-sub\fR 
 .br
-\-\-num\-sub=\fInum-sub\fR    
+\-\-num\-sub\-buffers=\fInum-sub\fR
 .RS
 Specifies number of buffers to use. blktrace defaults to 4 sub buffers.
 .RE
 
-\-o \fIfile\fR 
+\-l
 .br
-\-\-output=\fIfile\fR        
+\-\-listen
 .RS
-Prepend \fIfile\fR to output file name(s)  
+Run in network listen mode (blktrace server)
+.RE
+
+\-h \fIhostname\fR
+.br
+\-\-host=\fIhostname\fR
+.RS
+Run in network client mode, connecting to the given host
+.RE
+
+\-p \fInumber\fR
+.br
+\-\-port=\fInumber\fR
+.RS
+Network port to use (default 8462)
+.RE
+
+\-s
+.br
+\-\-no\-sendfile
+.RS
+Make the network client NOT use sendfile() to transfer data
+.RE
+
+\-o \fIbasename\fR
+.br
+\-\-output=\fIbasename\fR
+.RS
+Specifies base name for input files. Default is device.blktrace.cpu.
+Specifying -o - runs in live mode with blkparse (writing data to standard out).
+.RE
+
+\-D \fIdir\fR
+.br
+\-\-output\-dir=\fIdir\fR
+.RS
+Prepend \fIfile\fR to output file name(s)
 
 This only works when supplying a single device, or when piping the output
 via "-o -" with multiple devices.
@@ -134,9 +170,17 @@ via "-o -" with multiple devices.
 Specifies debugfs mount point  
 .RE
 
+\-v
+.br
+\-\-version
+.RS
+Outputs version
+.RE
+
 \-V               
 .br
-\-\-version                  
+\-\-version
+.RS
 Outputs version  
 .RE
 
@@ -175,6 +219,8 @@ line options.
 \fIwrite\fR: write traces
 .br
 \fInotify\fR: trace messages
+.br
+\fIdrv_data\fR: additional driver specific trace
 .RE
 
 
diff --git a/doc/btrecord.8 b/doc/btrecord.8
index c0655ab..dd92396 100644
--- a/doc/btrecord.8
+++ b/doc/btrecord.8
@@ -107,7 +107,7 @@ Show version number and exit.
 
 \-m <\fInanoseconds\fR>
 .br
-\-\-input\-base=<\fInanoseconds\fR>
+\-\-max\-bunch\-time=<\fInanoseconds\fR>
 .RS
 The \fI\-m\fR option requires a single parameter which specifies an
 amount of time (in nanoseconds) to include in any one bunch of IOs that
diff --git a/doc/btreplay.8 b/doc/btreplay.8
index 1efcd0d..118dc10 100644
--- a/doc/btreplay.8
+++ b/doc/btreplay.8
@@ -168,6 +168,13 @@ When specified on the command line, all pre-bunch stall indicators will be
 ignored. IOs will be replayed without inter-bunch delays.
 .RE
 
+\-x <\fIfactor\fR>
+.br
+\-\-acc\-factor=<\fIfactor\fR>
+.RS
+Specify acceleration factor. Default value is 1 (no acceleration).
+.RE
+
 \-v
 .br
 \-\-verbose
diff --git a/doc/btt.1 b/doc/btt.1
index 60d28ac..28cf912 100644
--- a/doc/btt.1
+++ b/doc/btt.1
@@ -30,6 +30,8 @@ btt \- analyse block i/o traces produces by blktrace
 .br
 [ \-L <\fIfreq\fR>        | \-\-periodic\-latencies=<\fIfreq\fR> ]
 .br
+[ \-m <\fIoutput name\fR> | \-\-seeks\-per\-second=<\fIoutput name\fR> ]
+.br
 [ \-M <\fIdev map\fR>     | \-\-dev\-maps=<\fIdev map\fR>
 .br
 [ \-o <\fIoutput name\fR> | \-\-output\-file=<\fIoutput name\fR> ]
@@ -58,6 +60,8 @@ btt \- analyse block i/o traces produces by blktrace
 .br
 [ \-V               | \-\-version ]
 .br
+[ \-X               | \-\-easy\-parse\-avgs ]
+.br
 [ \-z <\fIoutput name\fR> | \-\-q2d\-latencies=<\fIoutput name\fR> ]
 .br
 [ \-Z               | \-\-do\-active ]
@@ -201,6 +205,15 @@ Q2C and D2C latencies. The frequency specified will regulate how often
 an average latency is output -- a floating point value expressing seconds.
 .RE
 
+.B \-m <\fIoutput name\fR>
+.br
+.B \-\-seeks\-per\-second=<\fIoutput name\fR>
+.RS 4
+Trigger btt to output seeks-per-second information. The first column will
+contain a time value (seconds), and the second column  will indicate the
+number of seeks per second at that point.
+.RE
+
 .B \-M <\fIdev map\fR>
 .br
 .B \-\-dev\-maps=<\fIdev map\fR>
@@ -332,6 +345,14 @@ Shows the version of btt.
 Requests a more verbose output.
 .RE
 
+.B \-X
+.br
+.B \-\-easy\-parse\-avgs
+.RS 4
+Provide data in an easy-to-parse form and write it to a file
+with .avg exentsion
+.RE
+
 .B \-z <\fIoutput name\fR>
 .br
 .B \-\-q2d\-latencies=<\fIoutput name\fR>

Recent changes

[Jens Axboe]

The following changes since commit 5798ffb25496ab8dcb419a2bdc5418802d7f10fc:

  blktrace: btt documentation update (2010-10-22 20:54:11 +0200)

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

Alan D. Brunelle (1):
      Fixed build warning for btreplay

 btreplay/btreplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/btreplay/btreplay.c b/btreplay/btreplay.c
index cba099a..f4f5aa0 100644
--- a/btreplay/btreplay.c
+++ b/btreplay/btreplay.c
@@ -1314,7 +1314,7 @@ static void reset_input_file(struct thr_info *tip)
  */
 static void *replay_sub(void *arg)
 {
-        int i;
+        unsigned int i;
 	char *mdev;
 	char path[MAXPATHLEN];
 	struct io_bunch bunch;

Re: Recent changes

[Duy Le (Dan)]

Sorry for this newbie question!

I have a disk divided as follows:

=========Disk /dev/sdb: 56.9 GB, 56908316672 bytes
255 heads, 63 sectors/track, 6918 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Disk identifier: 0x00000000

   Device Boot      Start         End      Blocks   Id  System
/dev/sdb1               1        1167     9373896   83  Linux
/dev/sdb2            1168        6918    46194907+   5  Extended
/dev/sdb5            1168        2322     9373896   83  Linux
/dev/sdb6            2323        3477     9277506   83  Linux
....
=========
I used blktrace to capture I/Os on sdb5 when I was trying to mount
sdb5. This is a part of the output:

=========...
251,32   0       25     0.000919000  3529  A  RM 18752478 + 8 <- (251,37) 4560
251,32   0       26     0.000919657  3529  Q  RM 18752478 + 8 [mount]
251,32   0       27     0.000920810  3529  G  RM 18752478 + 8 [mount]
251,32   0       28     0.000922188  3529  P   N [mount]
251,32   0       29     0.000923025  3529  I   R 18752478 + 8 [mount]
251,32   0       30     0.000924439  3529  U   N [mount] 1
251,32   0       31     0.000925877  3529  D   R 18752478 + 8 [mount]
251,32   0       32     0.023385527     0  C   R 18752478 + 8 [0]
251,32   0       33     0.023465706  3529  A   R 27664918 + 8 <-
(251,37) 8917000
251,32   0       34     0.023466398  3529  Q   R 27664918 + 8 [mount]
251,32   0       35     0.023467922  3529  G   R 27664918 + 8 [mount]
....
=========
According to blktrace manual, such a number of 18752478 is known as a
"starting block", followed by the size of request. If I understand
correctly, sdb5 is in the range of blocks from 9373897 to
9373896+9373897-1\x18747792. However, blktrace's output shows that a R
request occurs on a block whose index is much larger than the range of
the partition.

How should I understand correctly the value of 18752478? Please help.

Thank you

-- Dan

Recent changes

[Jens Axboe]

The following changes since commit a788dfde86dfaff8f1c277a233f92c1822e06b76:

  Fixed build warning for btreplay (2010-11-29 10:34:30 -0500)

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

Jens Axboe (1):
      Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace

Tao Ma (1):
      blkparse: Fix blktrace output pipe broken in the new kernel

 blkparse.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

---

Diff of recent changes:

Too large to post

Recent changes

[Jens Axboe]

The following changes since commit 5480f591a58df0e873ab80ba21e7b81b9a6fa0c5:

  Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace (2011-01-11 08:36:21 +0100)

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Tao Ma (1):
      blkiomon: Fix an output error

 stats.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

---

Diff of recent changes:

diff --git a/stats.h b/stats.h
index fdedf27..5b9a313 100644
--- a/stats.h
+++ b/stats.h
@@ -75,6 +75,9 @@ static inline void minmax_to_be(struct minmax *mm)
 
 static inline double minmax_avg(struct minmax *mm)
 {
+	if (!mm->num)
+		return 0;
+
 	return (mm->sum / (double)mm->num);
 }
 
@@ -82,6 +85,9 @@ static inline double minmax_var(struct minmax *mm)
 {
 	double num = (double)mm->num;
 
+	if (!mm->num)
+		return 0;
+
 	return ((mm->sos - ((mm->sum * mm->sum) / num)) / num);
 }
 

Recent changes

[Jens Axboe]

The following changes since commit b7e74b0087fe5d687c6a43a01a2e02d60b618ae0:

  blkiomon: Fix an output error (2011-01-14 09:06:03 +0100)

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

Tao Ma (3):
      blktrace: break mlock in case of is_done.
      blktrace: remove unused idx from devpath.
      gitignore: add blkiomon to .gitignore.

 .gitignore |    3 +++
 blktrace.c |   25 +++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

---

Diff of recent changes:

diff --git a/.gitignore b/.gitignore
index 9038778..2436e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 blkparse
 blktrace
 blkrawverify
+blkiomon
+btreplay/btrecord
+btreplay/btreplay
 doc/.depend
 verify_blkparse
 btt/btt
diff --git a/blktrace.c b/blktrace.c
index 4cccb7c..18c5157 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -93,7 +93,7 @@ struct devpath {
 	char *path;			/* path to device special file */
 	char *buts_name;		/* name returned from bt kernel code */
 	struct pdc_stats *stats;
-	int fd, idx, ncpus;
+	int fd, ncpus;
 	unsigned long long drops;
 
 	/*
@@ -721,18 +721,24 @@ static void *my_mmap(void *addr, size_t length, int prot, int flags, int fd,
 	return new;
 }
 
-static int my_mlock(const void *addr, size_t len)
+static int my_mlock(struct tracer *tp,
+		    const void *addr, size_t len)
 {
-	int ret;
+	int ret, retry = 0;
 
 	do {
 		ret = mlock(addr, len);
+		if ((retry >= 10) && tp && tp->is_done)
+			break;
+		retry++;
 	} while (ret < 0 && handle_mem_failure(len));
 
 	return ret;
 }
 
-static int setup_mmap(int fd, unsigned int maxlen, struct mmap_info *mip)
+static int setup_mmap(int fd, unsigned int maxlen,
+		      struct mmap_info *mip,
+		      struct tracer *tp)
 {
 	if (mip->fs_off + maxlen > mip->fs_buf_len) {
 		unsigned long nr = max(16, mip->buf_nr);
@@ -759,7 +765,10 @@ static int setup_mmap(int fd, unsigned int maxlen, struct mmap_info *mip)
 			perror("setup_mmap: mmap");
 			return 1;
 		}
-		my_mlock(mip->fs_buf, mip->fs_buf_len);
+		if (my_mlock(tp, mip->fs_buf, mip->fs_buf_len) < 0) {
+			perror("setup_mlock: mlock");
+			return 1;
+		}
 	}
 
 	return 0;
@@ -1239,7 +1248,7 @@ static int add_devpath(char *path)
 	memset(dpp, 0, sizeof(*dpp));
 	dpp->path = strdup(path);
 	dpp->fd = fd;
-	dpp->idx = ndevs++;
+	ndevs++;
 	list_add_tail(&dpp->head, &devpaths);
 
 	return 0;
@@ -1683,7 +1692,7 @@ static int handle_pfds_file(struct tracer *tp, int nevs, int force_read)
 		if (pfd->revents & POLLIN || force_read) {
 			mip = &iop->mmap_info;
 
-			ret = setup_mmap(iop->ofd, buf_size, mip);
+			ret = setup_mmap(iop->ofd, buf_size, mip, tp);
 			if (ret < 0) {
 				pfd->events = 0;
 				break;
@@ -2381,7 +2390,7 @@ static void net_client_read_data(struct cl_conn *nc, struct devpath *dpp,
 	struct io_info *iop = &dpp->ios[bnh->cpu];
 	struct mmap_info *mip = &iop->mmap_info;
 
-	if (setup_mmap(iop->ofd, bnh->len, &iop->mmap_info)) {
+	if (setup_mmap(iop->ofd, bnh->len, &iop->mmap_info, NULL)) {
 		fprintf(stderr, "ncd(%s:%d): mmap failed\n",
 			nc->ch->hostname, nc->fd);
 		exit(1);

Recent changes

[Jens Axboe]

The following changes since commit 8fe5cc8d646d2fccbf82d0021d3c323ef6738a28:

  gitignore: add blkiomon to .gitignore. (2011-02-09 10:22:39 +0100)

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

Jens Axboe (1):
      blktrace 1.0.2

Justin TerAvest (1):
      blktrace: Document default values for -b and -n

 blkparse.c |    2 +-
 blktrace.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index c911185..7ee9f9d 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -36,7 +36,7 @@
 #include "rbtree.h"
 #include "jhash.h"
 
-static char blkparse_version[] = "1.0.1";
+static char blkparse_version[] = "1.0.2";
 
 struct skip_info {
 	unsigned long start, end;
diff --git a/blktrace.c b/blktrace.c
index 18c5157..72866e2 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -460,8 +460,8 @@ static char usage_str[] = "\n\n" \
 	"\t-w Stop after defined time, in seconds\n" \
 	"\t-a Only trace specified actions. See documentation\n" \
 	"\t-A Give trace mask as a single value. See documentation\n" \
-	"\t-b Sub buffer size in KiB\n" \
-	"\t-n Number of sub buffers\n" \
+	"\t-b Sub buffer size in KiB (default 512)\n" \
+	"\t-n Number of sub buffers (default 4)\n" \
 	"\t-l Run in network listen mode (blktrace server)\n" \
 	"\t-h Run in network client mode, connecting to the given host\n" \
 	"\t-p Network port to use (default 8462)\n" \

Recent changes

[Jens Axboe]

The following changes since commit e3d388e310fb9ae8aad89cfc728f8d19c6fb6579:

  blktrace 1.0.2 (2011-03-16 09:06:30 +0100)

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

Tao Ma (2):
      blkparse: Avoid segfault for wrong cpu number.
      blktrace: Use be32_to_cpu for blk_io_trace->cpu.

 blkparse.c |    6 ++++++
 blktrace.h |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 7ee9f9d..817cb31 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2354,6 +2354,12 @@ static int ms_prime(struct ms_stream *msp)
 		if (verify_trace(bit))
 			goto err;
 
+		if (bit->cpu != pci->cpu) {
+			fprintf(stderr, "cpu %d trace info has error cpu %d\n",
+				pci->cpu, bit->cpu);
+			continue;
+		}
+
 		if (bit->action & BLK_TC_ACT(BLK_TC_NOTIFY) && bit->action != BLK_TN_MESSAGE) {
 			handle_notify(bit);
 			output_binary(bit, sizeof(*bit) + bit->pdu_len);
diff --git a/blktrace.h b/blktrace.h
index 816ce61..8b3e031 100644
--- a/blktrace.h
+++ b/blktrace.h
@@ -110,7 +110,7 @@ static inline void trace_to_cpu(struct blk_io_trace *t)
 	t->action	= be32_to_cpu(t->action);
 	t->pid		= be32_to_cpu(t->pid);
 	t->device	= be32_to_cpu(t->device);
-	t->cpu		= be16_to_cpu(t->cpu);
+	t->cpu		= be32_to_cpu(t->cpu);
 	t->error	= be16_to_cpu(t->error);
 	t->pdu_len	= be16_to_cpu(t->pdu_len);
 }

Recent changes

[Jens Axboe]

The following changes since commit 8e8bb835e375bd8cf0f01debff61f6bf467bb1ed:

  blktrace: Use be32_to_cpu for blk_io_trace->cpu. (2011-05-26 21:11:09 +0200)

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

Jeff Moyer (1):
      blkparse: fix up incorrect pc write completion count

Jens Axboe (1):
      Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace

 blkparse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 817cb31..12c7aae 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -1675,7 +1675,7 @@ static void dump_io_stats(struct per_dev_info *pdi, struct io_stats *ios,
 		fprintf(ofp, " PC Reads Req.:   %s\t\t", size_cnv(x, ios->rrqueue_pc, 0));
 		fprintf(ofp, " PC Writes Req.:   %s\n", size_cnv(x, ios->wrqueue_pc, 0));
 		fprintf(ofp, " PC Reads Compl.: %s\t\t", size_cnv(x, ios->creads_pc, 0));
-		fprintf(ofp, " PC Writes Compl.: %s\n", size_cnv(x, ios->cwrites, 0));
+		fprintf(ofp, " PC Writes Compl.: %s\n", size_cnv(x, ios->cwrites_pc, 0));
 	}
 	fprintf(ofp, " IO unplugs:      %'8lu%8c\t", ios->io_unplugs, ' ');
 	fprintf(ofp, " Timer unplugs:    %'8lu\n", ios->timer_unplugs);

Re: Recent changes

[Edward Shishkin]

Hello.

How about those bits:
http://marc.info/?l=linux-btrace&m\x130978262022784&w=2
http://marc.info/?l=linux-btrace&m\x130978263222799&w=2

any chances it will be applied?

Thanks in advance,
Edward.


On 08/04/2011 06:00 AM, Jens Axboe wrote:
> The following changes since commit 8e8bb835e375bd8cf0f01debff61f6bf467bb1ed:
>
>    blktrace: Use be32_to_cpu for blk_io_trace->cpu. (2011-05-26 21:11:09 +0200)
>
> are available in the git repository at:
>    git://git.kernel.dk/blktrace.git master
>
> Jeff Moyer (1):
>        blkparse: fix up incorrect pc write completion count
>
> Jens Axboe (1):
>        Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace
>
>   blkparse.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> ---
>
> Diff of recent changes:
>
> diff --git a/blkparse.c b/blkparse.c
> index 817cb31..12c7aae 100644
> --- a/blkparse.c
> +++ b/blkparse.c
> @@ -1675,7 +1675,7 @@ static void dump_io_stats(struct per_dev_info *pdi, struct io_stats *ios,
>   		fprintf(ofp, " PC Reads Req.:   %s\t\t", size_cnv(x, ios->rrqueue_pc, 0));
>   		fprintf(ofp, " PC Writes Req.:   %s\n", size_cnv(x, ios->wrqueue_pc, 0));
>   		fprintf(ofp, " PC Reads Compl.: %s\t\t", size_cnv(x, ios->creads_pc, 0));
> -		fprintf(ofp, " PC Writes Compl.: %s\n", size_cnv(x, ios->cwrites, 0));
> +		fprintf(ofp, " PC Writes Compl.: %s\n", size_cnv(x, ios->cwrites_pc, 0));
>   	}
>   	fprintf(ofp, " IO unplugs:      %'8lu%8c\t", ios->io_unplugs, ' ');
>   	fprintf(ofp, " Timer unplugs:    %'8lu\n", ios->timer_unplugs);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrace" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Recent changes

[Jens Axboe]

On 2011-08-04 13:50, Edward Shishkin wrote:
> Hello.
> 
> How about those bits:
> http://marc.info/?l=linux-btrace&m\x130978262022784&w=2
> http://marc.info/?l=linux-btrace&m\x130978263222799&w=2
> 
> any chances it will be applied?

-k isn't meant to kill blktrace, it's meant to fixup broken state if
blktrace is already gone yet the device trace state is still running (or
hosed).

-- 
Jens Axboe

Recent changes

[Jens Axboe]

The following changes since commit bc5f9ff87cb38ffa3b64ba607e535043eef06d14:

  Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace (2011-08-03 15:06:18 +0200)

are available in the git repository at:

  git://git.kernel.dk/blktrace.git master

Jens Axboe (1):
      blktrace 1.0.3

Namhyung Kim (1):
      Add FLUSH/FUA support

 act_mask.c     |    3 ++-
 blkparse.c     |    2 +-
 blkparse_fmt.c |   17 +++++++++++------
 blkrawverify.c |    3 ++-
 blktrace_api.h |    5 +++--
 5 files changed, 19 insertions(+), 11 deletions(-)

---

Diff of recent changes:

diff --git a/act_mask.c b/act_mask.c
index 6d5c193..8f1b8d7 100644
--- a/act_mask.c
+++ b/act_mask.c
@@ -15,7 +15,7 @@ struct mask_map {
 static struct mask_map mask_maps[] = {
 	DECLARE_MASK_MAP(READ),
 	DECLARE_MASK_MAP(WRITE),
-	DECLARE_MASK_MAP(BARRIER),
+	DECLARE_MASK_MAP(FLUSH),
 	DECLARE_MASK_MAP(SYNC),
 	DECLARE_MASK_MAP(QUEUE),
 	DECLARE_MASK_MAP(REQUEUE),
@@ -28,6 +28,7 @@ static struct mask_map mask_maps[] = {
 	DECLARE_MASK_MAP(META),
 	DECLARE_MASK_MAP(DISCARD),
 	DECLARE_MASK_MAP(DRV_DATA),
+	DECLARE_MASK_MAP(FUA),
 };
 
 int find_mask_map(char *string)
diff --git a/blkparse.c b/blkparse.c
index 12c7aae..169d491 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -36,7 +36,7 @@
 #include "rbtree.h"
 #include "jhash.h"
 
-static char blkparse_version[] = "1.0.2";
+static char blkparse_version[] = "1.0.3";
 
 struct skip_info {
 	unsigned long start, end;
diff --git a/blkparse_fmt.c b/blkparse_fmt.c
index ed6cd5c..c42e6d7 100644
--- a/blkparse_fmt.c
+++ b/blkparse_fmt.c
@@ -54,12 +54,16 @@ static inline void fill_rwbs(char *rwbs, struct blk_io_trace *t)
 {
 	int w = t->action & BLK_TC_ACT(BLK_TC_WRITE);
 	int a = t->action & BLK_TC_ACT(BLK_TC_AHEAD);
-	int b = t->action & BLK_TC_ACT(BLK_TC_BARRIER);
 	int s = t->action & BLK_TC_ACT(BLK_TC_SYNC);
 	int m = t->action & BLK_TC_ACT(BLK_TC_META);
 	int d = t->action & BLK_TC_ACT(BLK_TC_DISCARD);
+	int f = t->action & BLK_TC_ACT(BLK_TC_FLUSH);
+	int u = t->action & BLK_TC_ACT(BLK_TC_FUA);
 	int i = 0;
 
+	if (f)
+		rwbs[i++] = 'F'; /* flush */
+
 	if (d)
 		rwbs[i++] = 'D';
 	else if (w)
@@ -68,10 +72,11 @@ static inline void fill_rwbs(char *rwbs, struct blk_io_trace *t)
 		rwbs[i++] = 'R';
 	else
 		rwbs[i++] = 'N';
+
+	if (u)
+		rwbs[i++] = 'F'; /* fua */
 	if (a)
 		rwbs[i++] = 'A';
-	if (b)
-		rwbs[i++] = 'B';
 	if (s)
 		rwbs[i++] = 'S';
 	if (m)
@@ -188,7 +193,7 @@ static void print_field(char *act, struct per_cpu_info *pci,
 		break;
 	}
 	case 'd': {
-		char rwbs[6];
+		char rwbs[8];
 
 		fill_rwbs(rwbs, t);
 		fprintf(ofp, strcat(format, "s"), rwbs);
@@ -285,7 +290,7 @@ static void process_default(char *act, struct per_cpu_info *pci,
 			    int pdu_len, unsigned char *pdu_buf)
 {
 	struct blk_io_trace_remap r = { .device_from = 0, };
-	char rwbs[6];
+	char rwbs[8];
 	char *name;
 
 	fill_rwbs(rwbs, t);
@@ -445,7 +450,7 @@ void process_fmt(char *act, struct per_cpu_info *pci, struct blk_io_trace *t,
 			case 'r': fprintf(ofp, "\r"); break;
 			case 't': fprintf(ofp, "\t"); break;
 			default:
-				fprintf(stderr,	
+				fprintf(stderr,
 					"Invalid escape char in format %c\n",
 					p[1]);
 				exit(1);
diff --git a/blkrawverify.c b/blkrawverify.c
index e669179..b6ceb9d 100644
--- a/blkrawverify.c
+++ b/blkrawverify.c
@@ -39,7 +39,7 @@ int data_is_native = -1;
 static struct trace_info traces[] = {
 	TRACE_TO_STRING( BLK_TC_READ ),
 	TRACE_TO_STRING( BLK_TC_WRITE ),
-	TRACE_TO_STRING( BLK_TC_BARRIER ),
+	TRACE_TO_STRING( BLK_TC_FLUSH ),
 	TRACE_TO_STRING( BLK_TC_SYNC ),
 	TRACE_TO_STRING( BLK_TC_QUEUE ),
 	TRACE_TO_STRING( BLK_TC_REQUEUE ),
@@ -50,6 +50,7 @@ static struct trace_info traces[] = {
 	TRACE_TO_STRING( BLK_TC_AHEAD ),
 	TRACE_TO_STRING( BLK_TC_META ),
 	TRACE_TO_STRING( BLK_TC_DISCARD ),
+	TRACE_TO_STRING( BLK_TC_FUA ),
 };
 #define N_TRACES (sizeof(traces) / sizeof(struct trace_info))
 
diff --git a/blktrace_api.h b/blktrace_api.h
index ba9ee60..b222218 100644
--- a/blktrace_api.h
+++ b/blktrace_api.h
@@ -9,7 +9,7 @@
 enum {
 	BLK_TC_READ	= 1 << 0,	/* reads */
 	BLK_TC_WRITE	= 1 << 1,	/* writes */
-	BLK_TC_BARRIER	= 1 << 2,	/* barrier */
+	BLK_TC_FLUSH	= 1 << 2,	/* flush */
 	BLK_TC_SYNC	= 1 << 3,	/* sync */
 	BLK_TC_QUEUE	= 1 << 4,	/* queueing/merging */
 	BLK_TC_REQUEUE	= 1 << 5,	/* requeueing */
@@ -22,8 +22,9 @@ enum {
 	BLK_TC_META	= 1 << 12,	/* metadata */
 	BLK_TC_DISCARD	= 1 << 13,	/* discard requests */
 	BLK_TC_DRV_DATA	= 1 << 14,	/* binary driver data */
+	BLK_TC_FUA	= 1 << 15,	/* fua requests */
 
-	BLK_TC_END	= 1 << 15,	/* only 16-bits, reminder */
+	BLK_TC_END	= 1 << 15,	/* we've run out of bits! */
 };
 
 #define BLK_TC_SHIFT		(16)

Recent changes

[Jens Axboe]

The following changes since commit 0abccbcb5d1a538028ffcb3869d646d29bf5812b:

  blktrace 1.0.3 (2011-08-11 12:49:08 +0200)

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

Jens Axboe (2):
      Merge branch 'master' of ssh://brick.kernel.dk/data/git/blktrace
      blktrace 1.0.4

Mikulas Patocka (1):
      Fix for realloc bug and wrong error logging

 blkparse.c |    2 +-
 blktrace.c |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 169d491..0f8d135 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -36,7 +36,7 @@
 #include "rbtree.h"
 #include "jhash.h"
 
-static char blkparse_version[] = "1.0.3";
+static char blkparse_version[] = "1.0.4";
 
 struct skip_info {
 	unsigned long start, end;
diff --git a/blktrace.c b/blktrace.c
index 72866e2..b14daf2 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -1330,7 +1330,7 @@ static struct trace_buf *tb_combine(struct trace_buf *prev,
 		 * the whole structures, as the other fields
 		 * are "static".
 		 */
-		prev = realloc(prev->buf, sizeof(*prev) + tot_len);
+		prev = realloc(prev, sizeof(*prev) + tot_len);
 		prev->buf = (void *)(prev + 1);
 	}
 
@@ -2155,12 +2155,17 @@ static int handle_args(int argc, char *argv[])
 		return 1;
 	}
 
-	if (statfs(debugfs_path, &st) < 0 || st.f_type != (long)DEBUGFS_TYPE) {
+	if (statfs(debugfs_path, &st) < 0) {
 		fprintf(stderr, "Invalid debug path %s: %d/%s\n",
 			debugfs_path, errno, strerror(errno));
 		return 1;
 	}
 
+	if (st.f_type != (long)DEBUGFS_TYPE) {
+		fprintf(stderr, "Debugfs is not mounted at %s\n", debugfs_path);
+		return 1;
+	}
+
 	if (act_mask_tmp != 0)
 		act_mask = act_mask_tmp;
 

Recent changes

[Jens Axboe]

The following changes since commit 7f0062f7b893a80afbe0e43f5db157c7bc1a01f9:

  blktrace 1.0.4 (2012-01-31 10:53:21 +0100)

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

Eric Sandeen (10):
      Check setvbuf return value
      Fix potential array overrun in act_to_str
      Free pdu_buff on bad pdu path in process()
      Close stream in 'I' switch handling
      Remove extraneous malloc in find_input routines
      Fix several leaks on error paths
      btt: close devmap file after processing
      blkparse: initialize cpu_map
      blktrace: remove unused variable
      avoid string overflows

Jens Axboe (1):
      Fix compiler warnings

 blkparse.c          |    5 ++++-
 blkrawverify.c      |    3 ++-
 blktrace.c          |   27 +++++++++++++++++++--------
 btreplay/btrecord.c |    2 +-
 btreplay/btreplay.c |    2 +-
 btt/aqd.c           |    2 ++
 btt/bno_dump.c      |    5 +++--
 btt/devmap.c        |    1 +
 btt/plat.c          |    2 ++
 btt/proc.c          |    3 +--
 btt/seek.c          |   20 +++++++++-----------
 btt/trace_queue.c   |    2 +-
 12 files changed, 46 insertions(+), 28 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index 0f8d135..b0b88c3 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -562,7 +562,9 @@ static struct process_pid_map *add_ppm_hash(pid_t pid, const char *name)
 		ppm = malloc(sizeof(*ppm));
 		memset(ppm, 0, sizeof(*ppm));
 		ppm->pid = pid;
-		strcpy(ppm->comm, name);
+		memset(ppm->comm, 0, sizeof(ppm->comm));
+		strncpy(ppm->comm, name, sizeof(ppm->comm));
+		ppm->comm[sizeof(ppm->comm) - 1] = '\0';
 		ppm->hash_next = ppm_hash_table[hash_idx];
 		ppm_hash_table[hash_idx] = ppm;
 	}
@@ -1962,6 +1964,7 @@ static int check_cpu_map(struct per_dev_info *pdi)
 	 * create a map of the cpus we have traces for
 	 */
 	cpu_map = malloc(pdi->cpu_map_max / sizeof(long));
+	memset(cpu_map, 0, sizeof(*cpu_map));
 	n = rb_first(&rb_sort_root);
 	while (n) {
 		__t = rb_entry(n, struct trace, rb_node);
diff --git a/blkrawverify.c b/blkrawverify.c
index b6ceb9d..ed5d258 100644
--- a/blkrawverify.c
+++ b/blkrawverify.c
@@ -87,7 +87,7 @@ static char *act_to_str(__u32 action)
 	unsigned int act = action & 0xffff;
 	unsigned int trace = (action >> BLK_TC_SHIFT) & 0xffff;
 
-	if (act <= N_ACTS) {
+	if (act < N_ACTS) {
 		sprintf(buf, "%s ", acts[act].string);
 		for (i = 0; i < N_TRACES; i++)
 			if (trace & (1 << i)) {
@@ -201,6 +201,7 @@ static int process(FILE **fp, char *devname, char *file, unsigned int cpu)
 			if (n = 0) {
 				INC_BAD("bad pdu");
 				nbad_seq++;
+				free(pdu_buf);
 				break;
 			}
 			free(pdu_buf);
diff --git a/blktrace.c b/blktrace.c
index b14daf2..89aaaac 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -872,8 +872,9 @@ static int net_send_header(int fd, int cpu, char *buts_name, int len)
 	memset(&hdr, 0, sizeof(hdr));
 
 	hdr.magic = BLK_IO_TRACE_MAGIC;
+	memset(hdr.buts_name, 0, sizeof(hdr.buts_name));
 	strncpy(hdr.buts_name, buts_name, sizeof(hdr.buts_name));
-	hdr.buts_name[sizeof(hdr.buts_name)-1] = '\0';
+	hdr.buts_name[sizeof(hdr.buts_name) - 1] = '\0';
 	hdr.cpu = cpu;
 	hdr.max_cpus = ncpus;
 	hdr.len = len;
@@ -981,7 +982,9 @@ retry:
 		}
 
 		memcpy(&addr->sin_addr, hent->h_addr, 4);
-		strcpy(hostname, hent->h_name);
+		memset(hostname, 0, sizeof(hostname));
+		strncpy(hostname, hent->h_name, sizeof(hostname));
+		hostname[sizeof(hostname) - 1] = '\0';
 	}
 
 	return 0;
@@ -1728,11 +1731,10 @@ static int handle_pfds_netclient(struct tracer *tp, int nevs, int force_read)
 {
 	struct stat sb;
 	int i, nentries = 0;
-	struct pdc_stats *sp;
 	struct pollfd *pfd = tp->pfds;
 	struct io_info *iop = tp->ios;
 
-	for (i = 0; i < ndevs; i++, pfd++, iop++, sp++) {
+	for (i = 0; i < ndevs; i++, pfd++, iop++) {
 		if (pfd->revents & POLLIN || force_read) {
 			if (fstat(iop->ifd, &sb) < 0) {
 				perror(iop->ifn);
@@ -2076,9 +2078,13 @@ static int handle_args(int argc, char *argv[])
 				return 1;
 			}
 
-			while (fscanf(ifp, "%s\n", dev_line) = 1)
-				if (add_devpath(dev_line) != 0)
+			while (fscanf(ifp, "%s\n", dev_line) = 1) {
+				if (add_devpath(dev_line) != 0) {
+					fclose(ifp);
 					return 1;
+				}
+			}
+			fclose(ifp);
 			break;
 		}
 
@@ -2128,7 +2134,9 @@ static int handle_args(int argc, char *argv[])
 			break;
 		case 'h':
 			net_mode = Net_client;
-			strcpy(hostname, optarg);
+			memset(hostname, 0, sizeof(hostname));
+			strncpy(hostname, optarg, sizeof(hostname));
+			hostname[sizeof(hostname) - 1] = '\0';
 			break;
 		case 'l':
 			net_mode = Net_server;
@@ -2183,7 +2191,10 @@ static int handle_args(int argc, char *argv[])
 		piped_output = 1;
 		handle_pfds = handle_pfds_entries;
 		pfp = stdout;
-		setvbuf(pfp, NULL, _IONBF, 0);
+		if (setvbuf(pfp, NULL, _IONBF, 0)) {
+			perror("setvbuf stdout");
+			return 1;
+		}
 	} else
 		handle_pfds = handle_pfds_file;
 	return 0;
diff --git a/btreplay/btrecord.c b/btreplay/btrecord.c
index 88ab806..3646257 100644
--- a/btreplay/btrecord.c
+++ b/btreplay/btrecord.c
@@ -365,7 +365,7 @@ static void find_input_files(char *idir)
 	}
 
 	while ((ent = readdir(dir)) != NULL) {
-		char *p, *dsf = malloc(256);
+		char *p, *dsf;
 
 		if (strstr(ent->d_name, ".blktrace.") = NULL)
 			continue;
diff --git a/btreplay/btreplay.c b/btreplay/btreplay.c
index f4f5aa0..20494e0 100644
--- a/btreplay/btreplay.c
+++ b/btreplay/btreplay.c
@@ -596,7 +596,7 @@ static void find_input_devs(char *idir)
 	}
 
 	while ((ent = readdir(dir)) != NULL) {
-		char *p, *dsf = malloc(256);
+		char *p, *dsf;
 
 		if (strstr(ent->d_name, ".replay.") = NULL)
 			continue;
diff --git a/btt/aqd.c b/btt/aqd.c
index 3bb6f85..17ab15b 100644
--- a/btt/aqd.c
+++ b/btt/aqd.c
@@ -43,6 +43,8 @@ void *aqd_alloc(struct d_info *dip)
 	sprintf(oname, "%s_%s_aqd.dat", aqd_name, dip->dip_name);
 	if ((ap->fp = my_fopen(oname, "w")) = NULL) {
 		perror(oname);
+		free(oname);
+		free(ap);
 		return NULL;
 	}
 	add_file(ap->fp, oname);
diff --git a/btt/bno_dump.c b/btt/bno_dump.c
index 02f3811..00c9ac2 100644
--- a/btt/bno_dump.c
+++ b/btt/bno_dump.c
@@ -31,9 +31,10 @@ static FILE *bno_dump_open(struct d_info *dip, char rwc)
 
 	oname = malloc(strlen(bno_dump_name) + strlen(dip->dip_name) + 32);
 	sprintf(oname, "%s_%s_%c.dat", bno_dump_name, dip->dip_name, rwc);
-	if ((fp = my_fopen(oname, "w")) = NULL)
+	if ((fp = my_fopen(oname, "w")) = NULL) {
 		perror(oname);
-	else
+		free(oname);
+	} else
 		add_file(fp, oname);
 	return fp;
 }
diff --git a/btt/devmap.c b/btt/devmap.c
index 9c0348b..0553a9e 100644
--- a/btt/devmap.c
+++ b/btt/devmap.c
@@ -76,6 +76,7 @@ int dev_map_read(char *fname)
 			break;
 	}
 
+	fclose(fp);
 	return 0;
 }
 
diff --git a/btt/plat.c b/btt/plat.c
index e7b7dde..dff7115 100644
--- a/btt/plat.c
+++ b/btt/plat.c
@@ -42,6 +42,8 @@ void *plat_alloc(struct d_info *dip, char *post)
 	sprintf(oname, "%s%s_plat.dat", dip->dip_name, post);
 	if ((pp->fp = my_fopen(oname, "w")) = NULL) {
 		perror(oname);
+		free(oname);
+		free(pp);
 		return NULL;
 	}
 	add_file(pp->fp, oname);
diff --git a/btt/proc.c b/btt/proc.c
index aac49cb..eb44c3d 100644
--- a/btt/proc.c
+++ b/btt/proc.c
@@ -238,9 +238,8 @@ void pip_foreach_out(void (*f)(struct p_info *, void *), void *arg)
 		__foreach(root_name.rb_node, f, arg);
 	else {
 		struct p_info *pip;
-		char *exe, *p, *next, *exes_save = strdup(exes);
+		char *exe, *next, *exes_save = strdup(exes);
 
-		p = exes_save;
 		while (exes_save != NULL) {
 			exe = exes_save;
 			if ((next = strchr(exes_save, ',')) != NULL) {
diff --git a/btt/seek.c b/btt/seek.c
index abdb0ee..52f6a21 100644
--- a/btt/seek.c
+++ b/btt/seek.c
@@ -51,9 +51,10 @@ static FILE *seek_open(char *str, char rw)
 
 	oname = malloc(strlen(seek_name) + strlen(str) + 32);
 	sprintf(oname, "%s_%s_%c.dat", seek_name, str, rw);
-	if ((fp = my_fopen(oname, "w")) = NULL)
+	if ((fp = my_fopen(oname, "w")) = NULL) {
 		perror(oname);
-	else
+		free(oname);
+	} else
 		add_file(fp, oname);
 
 	return fp;
@@ -99,18 +100,14 @@ static void __destroy(struct rb_node *n)
 
 static void sps_emit(struct seeki *sip)
 {
-	double tstamp, s_p_s;
+	double s_p_s;
 	struct sps_bkt *sps = &sip->sps;
 	double delta = sps->t_last - sps->t_start;
 
-	if ((sps->nseeks = 1) || (delta < DBL_EPSILON)) {
+	if ((sps->nseeks = 1) || (delta < DBL_EPSILON))
 		s_p_s = (double)(sps->nseeks);
-		tstamp = sps->t_start;
-	} else {
-
+	else
 		s_p_s = (double)(sps->nseeks) / delta;
-		tstamp = sps->t_start + (delta / 2);
-	}
 
 	fprintf(sip->sps_fp, "%15.9lf %.2lf\n", sps->t_start, s_p_s);
 
@@ -226,9 +223,10 @@ void *seeki_alloc(struct d_info *dip, char *post)
 
 		oname = malloc(strlen(sps_name) + strlen(dip->dip_name) + 32);
 		sprintf(oname, "%s_%s.dat", sps_name, dip->dip_name);
-		if ((sip->sps_fp = my_fopen(oname, "w")) = NULL)
+		if ((sip->sps_fp = my_fopen(oname, "w")) = NULL) {
 			perror(oname);
-		else
+			free(oname);
+		} else
 			add_file(sip->sps_fp, oname);
 	} else
 		sip->sps_fp = NULL;
diff --git a/btt/trace_queue.c b/btt/trace_queue.c
index 82c5760..8edcd90 100644
--- a/btt/trace_queue.c
+++ b/btt/trace_queue.c
@@ -33,7 +33,7 @@ static void handle_queue(struct io *q_iop)
 		update_lq(&last_q, &all_avgs.q2q, q_iop->t.time);
 	}
 
-	q_iop->i_time = q_iop->g_time = q_iop->i_time = q_iop->m_time +	q_iop->i_time = q_iop->g_time = q_iop->c_time = q_iop->m_time  						q_iop->d_time = (__u64)-1;
 	q_iop->dip->n_qs++;
 

Recent changes

[Jens Axboe]

The following changes since commit f6d38abde41a7b18808dcdab393f05d6300d16c3:

  Fix compiler warnings (2012-02-01 13:17:57 +0100)

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

Jens Axboe (1):
      blktrace 1.0.5

Vasily Tarasov (1):
      Too small arrays for file names

 blkparse.c |    4 ++--
 blktrace.h |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/blkparse.c b/blkparse.c
index b0b88c3..a7ff0f7 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -36,7 +36,7 @@
 #include "rbtree.h"
 #include "jhash.h"
 
-static char blkparse_version[] = "1.0.4";
+static char blkparse_version[] = "1.0.5";
 
 struct skip_info {
 	unsigned long start, end;
@@ -2839,7 +2839,7 @@ int main(int argc, char *argv[])
 			ofp = fdopen(STDOUT_FILENO, "w");
 			mode = _IOLBF;
 		} else {
-			char ofname[128];
+			char ofname[PATH_MAX];
 
 			snprintf(ofname, sizeof(ofname) - 1, "%s", output_name);
 			ofp = fopen(ofname, "w");
diff --git a/blktrace.h b/blktrace.h
index 8b3e031..5da6dbc 100644
--- a/blktrace.h
+++ b/blktrace.h
@@ -2,6 +2,7 @@
 #define BLKTRACE_H
 
 #include <stdio.h>
+#include <limits.h>
 #include <byteswap.h>
 #include <endian.h>
 
@@ -44,7 +45,7 @@ struct per_cpu_info {
 
 	int fd;
 	int fdblock;
-	char fname[128];
+	char fname[PATH_MAX];
 
 	struct io_stats io_stats;