qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 232144: trace: [ust] Fix format string comput

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 232144: trace: [ust] Fix format string computation in tcg-...
Date: Fri, 26 Sep 2014 06:30:09 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2321442920ab67a1c196d4a53dd564726370946d
      
https://github.com/qemu/qemu/commit/2321442920ab67a1c196d4a53dd564726370946d
  Author: Lluís Vilanova <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M scripts/tracetool/__init__.py
    M scripts/tracetool/format/ust_events_h.py

  Log Message:
  -----------
  trace: [ust] Fix format string computation in tcg-enabled events

TCG-enabled events start with two format strings. Delay per-argument format
computation until requested ('Event.formats').

Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 60e17d28224bf87c36358d2418348461975bdd16
      
https://github.com/qemu/qemu/commit/60e17d28224bf87c36358d2418348461975bdd16
  Author: Chen Fan <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M docs/tracing.txt

  Log Message:
  -----------
  trace: docs: add trace file description

When user used the trace print command from docs/tracing.txt:
  ./scripts/simpletrace.py trace-events trace-*

the user maybe be misled by the "trace-*", because if user
directly copy the comand line to run, there alway print the
bored message:
"usage: ./scripts/simpletrace.py <trace-events> <trace-file>"

then we should describe that the "trace-*" represented.

Signed-off-by: Chen Fan <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1dde0f48d53ad39401ec5064a61162d6784aad44
      
https://github.com/qemu/qemu/commit/1dde0f48d53ad39401ec5064a61162d6784aad44
  Author: Lluís Vilanova <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M qapi-schema.json
    A qapi/trace.json
    M qmp-commands.hx
    M trace/Makefile.objs
    A trace/qmp.c

  Log Message:
  -----------
  trace: [qmp] Add commands to query and control event tracing state

Signed-off-by: Lluís Vilanova <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 14101d028d9ebe9facfbab0cd6c7cf92b77e755d
      
https://github.com/qemu/qemu/commit/14101d028d9ebe9facfbab0cd6c7cf92b77e755d
  Author: Lluís Vilanova <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M monitor.c
    M trace/control.c
    M trace/control.h

  Log Message:
  -----------
  trace: [hmp] Reimplement "trace-event" and "info trace-events" using QMP

Signed-off-by: Lluís Vilanova <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0bc375eb5178bdfea7e8cd44f6b16bb55c773f4b
      
https://github.com/qemu/qemu/commit/0bc375eb5178bdfea7e8cd44f6b16bb55c773f4b
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  trace-events: drop orphan virtio_blk_data_plane_complete_request

This trace event has not been in use since commit
b002254dbd4c19a01f29790f840f983803e26893 ("virtio-blk: Unify
{non-,}dataplane's request handlings").

Cc: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden


  Commit: f4026f269adf72e8b7f1f7479986e63ac3d42546
      
https://github.com/qemu/qemu/commit/f4026f269adf72e8b7f1f7479986e63ac3d42546
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  trace-events: drop orphan usb_mtp_data_out

This trace event was added in commit
840a178c94dbd3f5b5550fb8621620cb761de72d ("usb: mtp filesharing") but
never used.

Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden


  Commit: 44e7ebb8bba5fd391b96c5011c17ae28e0a9c6ea
      
https://github.com/qemu/qemu/commit/44e7ebb8bba5fd391b96c5011c17ae28e0a9c6ea
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M block/iscsi.c
    M trace-events

  Log Message:
  -----------
  trace-events: drop orphan iscsi trace events

iscsi_aio_write16_cb, iscsi_aio_writev, iscsi_aio_read16_cb, and
iscsi_aio_readv have not not been in use since commit
063c3378a9e3c25cc0afac3c72e4823d0621e352 ("block/iscsi: introduce
bdrv_co_{readv, writev, flush_to_disk}").

These were the only trace events in block/iscsi.c so drop the the
trace.h include.

Cc: Peter Lieven <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden


  Commit: f9bbba95691a2b4c14079e32c652b950bd474a33
      
https://github.com/qemu/qemu/commit/f9bbba95691a2b4c14079e32c652b950bd474a33
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M scripts/tracetool/__init__.py

  Log Message:
  -----------
  trace: tighten up trace-events regex to fix bad parse

Use \w for properties and trace event names since they are both drawn
from [a-zA-Z0-9_] character sets.

The .* for matching properties was too aggressive and caused the
following failure with foo(int rc) "(this is a test)":

  Traceback (most recent call last):
    File "scripts/tracetool.py", line 139, in <module>
      main(sys.argv)
    File "scripts/tracetool.py", line 134, in main
      binary=binary, probe_prefix=probe_prefix)
    File "scripts/tracetool/__init__.py", line 334, in generate
      events = _read_events(fevents)
    File "scripts/tracetool/__init__.py", line 262, in _read_events
      res.append(Event.build(line))
    File "scripts/tracetool/__init__.py", line 225, in build
      return Event(name, props, fmt, args, arg_fmts)
    File "scripts/tracetool/__init__.py", line 185, in __init__
      % ", ".join(unknown_props))
  ValueError: Unknown properties: foo(int, rc)

Cc: Lluís Vilanova <address@hidden>
Reported-by: Eric Auger <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: 88ed34ff5ed6f94ebe597b320f130e150dc91557
      
https://github.com/qemu/qemu/commit/88ed34ff5ed6f94ebe597b320f130e150dc91557
  Author: Markus Armbruster <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M scripts/cleanup-trace-events.pl

  Log Message:
  -----------
  cleanup-trace-events.pl: Tighten search for trace event call

The script can get fooled too easily.  For instance, it finds
trace_megasas_io_read_start when looking for trace_megasas_io_read,
and incorrectly concludes that event megasas_io_read is used.

Supply -w to git-grep to tighten the search.

Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8a55acb1e0400206f092e8ac50987df3698e1ea5
      
https://github.com/qemu/qemu/commit/8a55acb1e0400206f092e8ac50987df3698e1ea5
  Author: Markus Armbruster <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  trace-events: Drop unused megasas trace event

Event megasas_io_read was added in commit e8f943c, but never used.
Drop it.

Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4d249a2074a94ac47bb80d9cde35b8329844504c
      
https://github.com/qemu/qemu/commit/4d249a2074a94ac47bb80d9cde35b8329844504c
  Author: Markus Armbruster <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  trace-events: Drop orphaned monitor trace event

Event monitor_protocol_event is unused since commit 7517517.  Drop it.

Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 40893768df4d4c207f000caf809f30c3d0145b1f
      
https://github.com/qemu/qemu/commit/40893768df4d4c207f000caf809f30c3d0145b1f
  Author: Markus Armbruster <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  trace-events: Fix comments pointing to source files

A few files have been renamed without updating their comment here.  A
few events have been added in the wrong place.  Clean that up.

Comments with no space after the '#' look ugly and confuse
cleanup-trace-events.pl.  Insert a space.

scripts/cleanup-trace-events.pl is now happy again.

Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 89ae5831a53e2d30a370e9a30fdb35da5a8f89aa
      
https://github.com/qemu/qemu/commit/89ae5831a53e2d30a370e9a30fdb35da5a8f89aa
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  trace: install trace-events file

Install the ./trace-events file into the data directory.  This file
contains the list of trace events that were built into QEMU at
compile-time.

The file is a handy reference for the set of trace events that the QEMU
binary was built with.  It is also needed by the simpletrace.py tool
that parses binary trace data either emitted from QEMU when built with
--enable-trace-backend=simple or by the SystemTap simpletrace script
that QEMU provides.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: 931f53e18448487cbc118b1adafba52c3a359894
      
https://github.com/qemu/qemu/commit/931f53e18448487cbc118b1adafba52c3a359894
  Author: Alex Bennée <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M scripts/tracetool/__init__.py

  Log Message:
  -----------
  scripts/tracetool: don't barf on formats with precision

This only affects lttng user space tracing at the moment.

Signed-off-by: Alex Bennée <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3af8f177faec822e8d616d03e73747fa3fd39228
      
https://github.com/qemu/qemu/commit/3af8f177faec822e8d616d03e73747fa3fd39228
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c
    M trace-events

  Log Message:
  -----------
  ohci: Split long traces to smaller ones

Recent traces rework introduced 2 tracepoints with 13 and 20
arguments. When dtrace backend is selected
(--enable-trace-backend=dtrace), compile fails as
sys/sdt.h defines DTRACE_PROBE up to DTRACE_PROBE12 only.

This splits long tracepoints.

Signed-off-by: Alexey Kardashevskiy <address@hidden>

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bc0d104c6a3dc685e3adf92d89a017b2adc9878a
      
https://github.com/qemu/qemu/commit/bc0d104c6a3dc685e3adf92d89a017b2adc9878a
  Author: Alex Bennée <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c
    M trace-events

  Log Message:
  -----------
  ohci: drop computed flags from trace events

This exceeded the trace argument limit for LTTNG UST and wasn't really
needed as the flags value is stored anyway. Dropping this fixes the
compile failure for UST. It can probably be merged with the previous
trace shortening patch.

Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: da1c4ec88ad50c2b73d5fe960c373693f7337cc9
      
https://github.com/qemu/qemu/commit/da1c4ec88ad50c2b73d5fe960c373693f7337cc9
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M Makefile
    M block/iscsi.c
    M docs/tracing.txt
    M hw/usb/hcd-ohci.c
    M monitor.c
    M qapi-schema.json
    A qapi/trace.json
    M qmp-commands.hx
    M scripts/cleanup-trace-events.pl
    M scripts/tracetool/__init__.py
    M scripts/tracetool/format/ust_events_h.py
    M trace-events
    M trace/Makefile.objs
    M trace/control.c
    M trace/control.h
    A trace/qmp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging

# gpg: Signature made Fri 26 Sep 2014 11:59:34 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/tracing-pull-request:
  ohci: drop computed flags from trace events
  ohci: Split long traces to smaller ones
  scripts/tracetool: don't barf on formats with precision
  trace: install trace-events file
  trace-events: Fix comments pointing to source files
  trace-events: Drop orphaned monitor trace event
  trace-events: Drop unused megasas trace event
  cleanup-trace-events.pl: Tighten search for trace event call
  trace: tighten up trace-events regex to fix bad parse
  trace-events: drop orphan iscsi trace events
  trace-events: drop orphan usb_mtp_data_out
  trace-events: drop orphan virtio_blk_data_plane_complete_request
  trace: [hmp] Reimplement "trace-event" and "info trace-events" using QMP
  trace: [qmp] Add commands to query and control event tracing state
  trace: docs: add trace file description
  trace: [ust] Fix format string computation in tcg-enabled events

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/15124e142034...da1c4ec88ad5
reply via email to
[Prev in Thread] Current Thread [Next in Thread]