From patchwork Thu Jun 9 16:58:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 9167733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3903960467 for ; Thu, 9 Jun 2016 18:39:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F8F92834F for ; Thu, 9 Jun 2016 18:39:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23C002835A; Thu, 9 Jun 2016 18:39:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6268D2834F for ; Thu, 9 Jun 2016 18:39:34 +0000 (UTC) Received: from localhost ([::1]:36426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB4rT-0007x6-6w for patchwork-qemu-devel@patchwork.kernel.org; Thu, 09 Jun 2016 14:39:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3Il-0006II-19 for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bB3Ik-00056V-2H for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3Ij-00055z-Pj for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D9FEC05B1DE; Thu, 9 Jun 2016 16:59:25 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-5-191.ams2.redhat.com [10.36.5.191]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u59Gwbj2021940; Thu, 9 Jun 2016 12:59:24 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2016 17:58:28 +0100 Message-Id: <1465491514-7365-35-git-send-email-berrange@redhat.com> In-Reply-To: <1465491514-7365-1-git-send-email-berrange@redhat.com> References: <1465491514-7365-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 09 Jun 2016 16:59:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 34/40] trace: split out trace events for audio/ directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move all trace-events for files in the audio/ directory to their own file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 1 + audio/trace-events | 42 ++++++++++++++++++++++++++++++++++++++++++ trace-events | 16 ---------------- 3 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 audio/trace-events diff --git a/Makefile.objs b/Makefile.objs index 32b5265..562acfa 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -151,3 +151,4 @@ trace-events-y += hw/acpi/trace-events trace-events-y += hw/arm/trace-events trace-events-y += hw/alpha/trace-events trace-events-y += ui/trace-events +trace-events-y += audio/trace-events diff --git a/audio/trace-events b/audio/trace-events new file mode 100644 index 0000000..5cc8e16 --- /dev/null +++ b/audio/trace-events @@ -0,0 +1,42 @@ +# Trace events for debugging and performance instrumentation +# +# This file is processed by the tracetool script during the build. +# +# To add a new trace event: +# +# 1. Choose a name for the trace event. Declare its arguments and format +# string. +# +# 2. Call the trace event from code using trace_##name, e.g. multiwrite_cb() -> +# trace_multiwrite_cb(). The source file must #include "trace.h". +# +# Format of a trace event: +# +# [disable] ( [, ] ...) "" +# +# Example: g_malloc(size_t size) "size %zu" +# +# The "disable" keyword will build without the trace event. +# +# The must be a valid as a C function name. +# +# Types should be standard C types. Use void * for pointers because the trace +# system may not have the necessary headers included. +# +# The should be a sprintf()-compatible format string. + +# audio/alsaaudio.c +alsa_revents(int revents) "revents = %d" +alsa_pollout(int i, int fd) "i = %d fd = %d" +alsa_set_handler(int events, int index, int fd, int err) "events=%#x index=%d fd=%d err=%d" +alsa_wrote_zero(int len) "Failed to write %d frames (wrote zero)" +alsa_read_zero(long len) "Failed to read %ld frames (read zero)" +alsa_xrun_out(void) "Recovering from playback xrun" +alsa_xrun_in(void) "Recovering from capture xrun" +alsa_resume_out(void) "Resuming suspended output stream" +alsa_resume_in(void) "Resuming suspended input stream" +alsa_no_frames(int state) "No frames available and ALSA state is %d" + +# audio/ossaudio.c +oss_version(int version) "OSS version = %#x" +oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d" diff --git a/trace-events b/trace-events index 9e0c103..3386c16 100644 --- a/trace-events +++ b/trace-events @@ -192,22 +192,6 @@ cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8 cpu_halt(int cpu_index) "halting cpu %d" cpu_unhalt(int cpu_index) "unhalting cpu %d" -# audio/alsaaudio.c -alsa_revents(int revents) "revents = %d" -alsa_pollout(int i, int fd) "i = %d fd = %d" -alsa_set_handler(int events, int index, int fd, int err) "events=%#x index=%d fd=%d err=%d" -alsa_wrote_zero(int len) "Failed to write %d frames (wrote zero)" -alsa_read_zero(long len) "Failed to read %ld frames (read zero)" -alsa_xrun_out(void) "Recovering from playback xrun" -alsa_xrun_in(void) "Recovering from capture xrun" -alsa_resume_out(void) "Resuming suspended output stream" -alsa_resume_in(void) "Resuming suspended input stream" -alsa_no_frames(int state) "No frames available and ALSA state is %d" - -# audio/ossaudio.c -oss_version(int version) "OSS version = %#x" -oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d" - # net/vhost-user.c vhost_user_event(const char *chr, int event) "chr: %s got event: %d"