[Qemu-devel] [PULL 0/5] Tracing patches

[Qemu-devel] [PULL 0/5] Tracing patches

[Stefan Hajnoczi]

The latest fixes and updates to QEMU tracing.

Lluís Vilanova (1):
  trace: Update docs to use example events that exist

Stefan Hajnoczi (4):
  trace: allow trace events with string arguments
  MAINTAINERS: add tracing subsystem
  trace: portable simple trace backend using glib
  trace: use binary file open mode in simpletrace

 MAINTAINERS      |    6 ++++
 docs/tracing.txt |   24 ++++++++--------
 trace/simple.c   |   76 ++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 67 insertions(+), 39 deletions(-)

-- 
1.7.5.4

[Qemu-devel] [PATCH 1/5] trace: allow trace events with string arguments

[Stefan Hajnoczi]

String arguments are useful for producing human-readable traces without
post-processing (e.g. stderr backend).  Although the simple backend
cannot handles strings all others can.  Strings should be allowed and
the simple backend can be extended to support them.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 docs/tracing.txt |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/tracing.txt b/docs/tracing.txt
index d0171aa..2c33a62 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -70,11 +70,6 @@ Trace events should use types as follows:
    cannot include all user-defined struct declarations and it is therefore
    necessary to use void * for pointers to structs.
 
-   Pointers (including char *) cannot be dereferenced easily (or at all) in
-   some trace backends.  If pointers are used, ensure they are meaningful by
-   themselves and do not assume the data they point to will be traced.  Do
-   not pass in string arguments.
-
  * For everything else, use primitive scalar types (char, int, long) with the
    appropriate signedness.
 
@@ -182,6 +177,9 @@ source tree.  It may not be as powerful as platform-specific or third-party
 trace backends but it is portable.  This is the recommended trace backend
 unless you have specific needs for more advanced backends.
 
+The "simple" backend currently does not capture string arguments, it simply
+records the char* pointer value instead of the string that is pointed to.
+
 ==== Monitor commands ====
 
 * info trace
-- 
1.7.5.4

[Qemu-devel] [PATCH 2/5] MAINTAINERS: add tracing subsystem

[Stefan Hajnoczi]

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 72b2099..7c5ea87 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -459,6 +459,12 @@ S: Maintained
 F: slirp/
 T: git://git.kiszka.org/qemu.git queues/slirp
 
+Tracing
+M: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+S: Maintained
+F: trace/
+T: git://repo.or.cz/qemu/stefanha.git tracing
+
 Usermode Emulation
 ------------------
 BSD user
-- 
1.7.5.4

[Qemu-devel] [PATCH 3/5] trace: portable simple trace backend using glib

[Stefan Hajnoczi]

Convert the simple trace backend to glib so that it works under Windows.
We cannot use pthread directly but glib provides portable abstractions.
Also use glib atomics instead of newish gcc builtins which may not be
supported on Windows toolchains.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 trace/simple.c |   74 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/trace/simple.c b/trace/simple.c
index a609368..885764a 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -12,8 +12,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <time.h>
+#ifndef _WIN32
 #include <signal.h>
 #include <pthread.h>
+#endif
 #include "qemu-timer.h"
 #include "trace.h"
 #include "trace/control.h"
@@ -54,9 +56,9 @@ enum {
  * Trace records are written out by a dedicated thread.  The thread waits for
  * records to become available, writes them out, and then waits again.
  */
-static pthread_mutex_t trace_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t trace_available_cond = PTHREAD_COND_INITIALIZER;
-static pthread_cond_t trace_empty_cond = PTHREAD_COND_INITIALIZER;
+static GStaticMutex trace_lock = G_STATIC_MUTEX_INIT;
+static GCond *trace_available_cond;
+static GCond *trace_empty_cond;
 static bool trace_available;
 static bool trace_writeout_enabled;
 
@@ -93,29 +95,30 @@ static bool get_trace_record(unsigned int idx, TraceRecord *record)
  */
 static void flush_trace_file(bool wait)
 {
-    pthread_mutex_lock(&trace_lock);
+    g_static_mutex_lock(&trace_lock);
     trace_available = true;
-    pthread_cond_signal(&trace_available_cond);
+    g_cond_signal(trace_available_cond);
 
     if (wait) {
-        pthread_cond_wait(&trace_empty_cond, &trace_lock);
+        g_cond_wait(trace_empty_cond, g_static_mutex_get_mutex(&trace_lock));
     }
 
-    pthread_mutex_unlock(&trace_lock);
+    g_static_mutex_unlock(&trace_lock);
 }
 
 static void wait_for_trace_records_available(void)
 {
-    pthread_mutex_lock(&trace_lock);
+    g_static_mutex_lock(&trace_lock);
     while (!(trace_available && trace_writeout_enabled)) {
-        pthread_cond_signal(&trace_empty_cond);
-        pthread_cond_wait(&trace_available_cond, &trace_lock);
+        g_cond_signal(trace_empty_cond);
+        g_cond_wait(trace_available_cond,
+                    g_static_mutex_get_mutex(&trace_lock));
     }
     trace_available = false;
-    pthread_mutex_unlock(&trace_lock);
+    g_static_mutex_unlock(&trace_lock);
 }
 
-static void *writeout_thread(void *opaque)
+static gpointer writeout_thread(gpointer opaque)
 {
     TraceRecord record;
     unsigned int writeout_idx = 0;
@@ -159,7 +162,7 @@ static void trace(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3,
 
     timestamp = get_clock();
 
-    idx = __sync_fetch_and_add(&trace_idx, 1) % TRACE_BUF_LEN;
+    idx = g_atomic_int_exchange_and_add((gint *)&trace_idx, 1) % TRACE_BUF_LEN;
     trace_buf[idx] = (TraceRecord){
         .event = event,
         .timestamp_ns = timestamp,
@@ -331,28 +334,47 @@ bool trace_event_set_state(const char *name, bool state)
     return false;
 }
 
-bool trace_backend_init(const char *events, const char *file)
+/* Helper function to create a thread with signals blocked.  Use glib's
+ * portable threads since QEMU abstractions cannot be used due to reentrancy in
+ * the tracer.  Also note the signal masking on POSIX hosts so that the thread
+ * does not steal signals when the rest of the program wants them blocked.
+ */
+static GThread *trace_thread_create(GThreadFunc fn)
 {
-    pthread_t thread;
-    pthread_attr_t attr;
+    GThread *thread;
+#ifndef _WIN32
     sigset_t set, oldset;
-    int ret;
-
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
     sigfillset(&set);
     pthread_sigmask(SIG_SETMASK, &set, &oldset);
-    ret = pthread_create(&thread, &attr, writeout_thread, NULL);
+#endif
+    thread = g_thread_create(writeout_thread, NULL, FALSE, NULL);
+#ifndef _WIN32
     pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+#endif
 
-    if (ret != 0) {
+    return thread;
+}
+
+bool trace_backend_init(const char *events, const char *file)
+{
+    GThread *thread;
+
+    if (!g_thread_supported()) {
+        g_thread_init(NULL);
+    }
+
+    trace_available_cond = g_cond_new();
+    trace_empty_cond = g_cond_new();
+
+    thread = trace_thread_create(writeout_thread);
+    if (!thread) {
         fprintf(stderr, "warning: unable to initialize simple trace backend\n");
-    } else {
-        atexit(st_flush_trace_buffer);
-        trace_backend_init_events(events);
-        st_set_trace_file(file);
+        return false;
     }
 
+    atexit(st_flush_trace_buffer);
+    trace_backend_init_events(events);
+    st_set_trace_file(file);
     return true;
 }
-- 
1.7.5.4

[Qemu-devel] [PATCH 4/5] trace: use binary file open mode in simpletrace

[Stefan Hajnoczi]

For Windows portability the simple trace backend must use the 'b' file
open mode.  This prevents the stdio library from mangling 0x0a/0x0d
newline characters.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 trace/simple.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/trace/simple.c b/trace/simple.c
index 885764a..b639dda 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -234,7 +234,7 @@ void st_set_trace_file_enabled(bool enable)
             .x1 = HEADER_VERSION,
         };
 
-        trace_fp = fopen(trace_file_name, "w");
+        trace_fp = fopen(trace_file_name, "wb");
         if (!trace_fp) {
             return;
         }
-- 
1.7.5.4

[Qemu-devel] [PATCH 5/5] trace: Update docs to use example events that exist

[Stefan Hajnoczi]

From: Lluís Vilanova <vilanova@ac.upc.edu>

The events 'qemu_malloc' and 'qemu_free' used in the examples no longer exist,
so use 'qemu_vmalloc' and 'qemu_vfree' instead.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 docs/tracing.txt |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/tracing.txt b/docs/tracing.txt
index 2c33a62..95ca16c 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -31,8 +31,8 @@ There is a set of static trace events declared in the "trace-events" source
 file.  Each trace event declaration names the event, its arguments, and the
 format string which can be used for pretty-printing:
 
-    qemu_malloc(size_t size, void *ptr) "size %zu ptr %p"
-    qemu_free(void *ptr) "ptr %p"
+    qemu_vmalloc(size_t size, void *ptr) "size %zu ptr %p"
+    qemu_vfree(void *ptr) "ptr %p"
 
 The "trace-events" file is processed by the "tracetool" script during build to
 generate code for the trace events.  Trace events are invoked directly from
@@ -40,14 +40,16 @@ source code like this:
 
     #include "trace.h"  /* needed for trace event prototype */
     
-    void *qemu_malloc(size_t size)
+    void *qemu_vmalloc(size_t size)
     {
         void *ptr;
-        if (!size && !allow_zero_malloc()) {
-            abort();
+        size_t align = QEMU_VMALLOC_ALIGN;
+     
+        if (size < align) {
+            align = getpagesize();
         }
-        ptr = oom_check(malloc(size ? size : 1));
-        trace_qemu_malloc(size, ptr);  /* <-- trace event */
+        ptr = qemu_memalign(align, size);
+        trace_qemu_vmalloc(size, ptr);
         return ptr;
     }
 
-- 
1.7.5.4

Re: [Qemu-devel] [PULL 0/5] Tracing patches

[Anthony Liguori]

On 09/21/2011 05:36 AM, Stefan Hajnoczi wrote:
> The latest fixes and updates to QEMU tracing.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Lluís Vilanova (1):
>    trace: Update docs to use example events that exist
>
> Stefan Hajnoczi (4):
>    trace: allow trace events with string arguments
>    MAINTAINERS: add tracing subsystem
>    trace: portable simple trace backend using glib
>    trace: use binary file open mode in simpletrace
>
>   MAINTAINERS      |    6 ++++
>   docs/tracing.txt |   24 ++++++++--------
>   trace/simple.c   |   76 ++++++++++++++++++++++++++++++++++-------------------
>   3 files changed, 67 insertions(+), 39 deletions(-)
>

Re: [Qemu-devel] [PULL 0/5] Tracing patches

[Peter Maydell]

On 12 March 2018 at 16:00, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit e4ae62b802cec437f877f2cadc4ef059cc0eca76:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2018-03-09 17:28:16 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 73ff061032efa0b260bcd1a177ac89b57a1642d3:
>
>   trace: only permit standard C types and fixed size integer types (2018-03-12 11:10:20 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Daniel P. Berrangé (3):
>   trace: include filename when printing parser error messages
>   trace: remove use of QEMU specific types from trace probes
>   trace: only permit standard C types and fixed size integer types
>
> Peter Maydell (1):
>   log-for-trace.h: Split out parts of log.h used by trace.h
>
> Stefan Hajnoczi (1):
>   simpletrace: fix timestamp argument type
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Tracing patches

[Stefan Hajnoczi]

The following changes since commit e4ae62b802cec437f877f2cadc4ef059cc0eca76:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2018-03-09 17:28:16 +0000)

are available in the Git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 73ff061032efa0b260bcd1a177ac89b57a1642d3:

  trace: only permit standard C types and fixed size integer types (2018-03-12 11:10:20 +0000)

----------------------------------------------------------------

----------------------------------------------------------------

Daniel P. Berrangé (3):
  trace: include filename when printing parser error messages
  trace: remove use of QEMU specific types from trace probes
  trace: only permit standard C types and fixed size integer types

Peter Maydell (1):
  log-for-trace.h: Split out parts of log.h used by trace.h

Stefan Hajnoczi (1):
  simpletrace: fix timestamp argument type

 include/qemu/log-for-trace.h     | 35 +++++++++++++++++++++++++++
 include/qemu/log.h               | 18 ++++----------
 scripts/simpletrace.py           |  6 ++---
 scripts/tracetool.py             |  2 +-
 scripts/tracetool/__init__.py    | 52 ++++++++++++++++++++++++++++++++++++++--
 scripts/tracetool/backend/log.py | 13 +++++-----
 trace-events                     |  6 ++---
 7 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 include/qemu/log-for-trace.h

-- 
2.14.3

Re: [Qemu-devel] [PULL 0/5] Tracing patches

[Stefan Hajnoczi]

On Mon, Jun 9, 2014 at 3:45 PM, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 959e41473f2179850578482052fb73b913bc4e42:

Please ignore.  This pull request email thread also includes patch
emails from the last tracing pull request.

I will resend the 5 patches from this week's pull request properly.

Stefan

[Qemu-devel] [PULL 0/5] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 959e41473f2179850578482052fb73b913bc4e42:

  slirp/arp: do not special-case bogus IP addresses (2014-06-09 01:49:28 +0200)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to a35d9be622a85d9ad6be5448e78c8a3f95ee5f00:

  trace: Replace fprintf with error_report and print location (2014-06-09 15:43:40 +0200)

----------------------------------------------------------------
Tracing pull request

----------------------------------------------------------------
Alexey Kardashevskiy (2):
      trace: Replace error with warning if event is not defined
      trace: Replace fprintf with error_report and print location

Lluís Vilanova (1):
      trace: Multi-backend tracing

Stefan Hajnoczi (2):
      trace: add pid field to simpletrace record
      simpletrace: add support for trace record pid field

 .travis.yml                           |  8 ++--
 Makefile                              |  4 +-
 Makefile.target                       |  4 +-
 configure                             | 47 ++++++++++---------
 docs/tracing.txt                      |  4 +-
 qemu-io.c                             |  2 +-
 scripts/simpletrace.py                | 26 ++++++-----
 scripts/tracetool.py                  | 43 +++++++++---------
 scripts/tracetool/__init__.py         | 24 +++++-----
 scripts/tracetool/backend/__init__.py | 15 +++---
 trace/Makefile.objs                   | 32 ++++++-------
 trace/control-internal.h              |  4 +-
 trace/control.c                       | 86 +++++++++++++++++++++++++++--------
 trace/control.h                       | 27 ++---------
 trace/default.c                       | 40 ----------------
 trace/ftrace.c                        | 25 +---------
 trace/ftrace.h                        |  5 ++
 trace/simple.c                        | 27 +++--------
 trace/simple.h                        |  1 +
 trace/stderr.c                        | 30 ------------
 vl.c                                  |  4 +-
 21 files changed, 195 insertions(+), 263 deletions(-)
 delete mode 100644 trace/default.c
 delete mode 100644 trace/stderr.c

-- 
1.9.3

[Qemu-devel] [PULL 0/5] Tracing patches

[Stefan Hajnoczi]

The following changes since commit 6453a3a69488196f26d12654c6b148446abdf3d6:

  Merge remote-tracking branch 'quintela/migration.next' into staging (2013-07-15 14:49:16 -0500)

are available in the git repository at:


  git://github.com/stefanha/qemu.git tracing

for you to fetch changes up to 3ba00637d024b9d43b26106060a23a85411d0757:

  trace-events: Fix up source file comments (2013-07-18 11:44:42 +0800)

----------------------------------------------------------------
Markus Armbruster (5):
      cleanup-trace-events.pl: New
      slavio_misc: Fix slavio_led_mem_readw/_writew tracepoints
      milkymist-minimac2: Fix minimac2_read/_write tracepoints
      trace-events: Drop unused events
      trace-events: Fix up source file comments

 hw/misc/slavio_misc.c           |   2 +-
 hw/net/milkymist-minimac2.c     |   2 +-
 scripts/cleanup-trace-events.pl |  51 ++++++++++++
 trace-events                    | 176 ++++++++++++++++++++--------------------
 4 files changed, 140 insertions(+), 91 deletions(-)
 create mode 100755 scripts/cleanup-trace-events.pl

-- 
1.8.1.4