From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658Ab1IZPzY (ORCPT ); Mon, 26 Sep 2011 11:55:24 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:37931 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347Ab1IZPzW (ORCPT ); Mon, 26 Sep 2011 11:55:22 -0400 From: Andrew Vagin To: linux-kernel@vger.kernel.org Cc: Steven Rostedt , Frederic Weisbecker , Ingo Molnar , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , avagin@openvz.org Subject: [PATCH 1/4] perf: fix counter of ftrace events Date: Mon, 26 Sep 2011 19:55:32 +0400 Message-Id: <1317052535-1765247-2-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1317052535-1765247-1-git-send-email-avagin@openvz.org> References: <1317052535-1765247-1-git-send-email-avagin@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Each event adds some points to its counters. By default it adds 1, and a number of points may be transmited in event's parameters. E.g. sched:sched_stat_runtime adds how long process has been running. But this functionality was broken by v2.6.31-rc5-392-gf413cdb and now the event's parameters doesn't affect on a number of points. TP_perf_assign isn't defined, so __perf_count(c) isn't executed and __count is always equal to 1. Signed-off-by: Andrew Vagin --- include/trace/ftrace.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 533c49f..7697249 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -711,6 +711,9 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call #undef __perf_count #define __perf_count(c) __count = (c) +#undef TP_perf_assign +#define TP_perf_assign(args...) args + #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ static notrace void \ -- 1.7.1