From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org,
josh@joshtriplett.org, andi@firstfloor.org,
mathieu.desnoyers@efficios.com, peterz@infradead.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v15 01/23] tracing: Update some tracing_map constants and comments
Date: Fri, 26 Feb 2016 10:01:04 -0600 [thread overview]
Message-ID: <fb81a9c771dc75cffa90688627e1d216b59c3add.1456501855.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1456501855.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1456501855.git.tom.zanussi@linux.intel.com>
Make it clear exactly how many keys and values are supported through
better defines, and add 1 to the vals count, since normally clients
want support for at least a hitcount and two other values.
Also, note the error return value for tracing_map_add_key/val_field()
in the comments.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
kernel/trace/tracing_map.c | 4 ++--
kernel/trace/tracing_map.h | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index dd6401d..e0f1729 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -163,7 +163,7 @@ static int tracing_map_add_field(struct tracing_map *map,
* tracing_map_update_sum() or reading it via tracing_map_read_sum().
*
* Return: The index identifying the field in the map and associated
- * tracing_map_elts.
+ * tracing_map_elts, or -EINVAL on error.
*/
int tracing_map_add_sum_field(struct tracing_map *map)
{
@@ -184,7 +184,7 @@ int tracing_map_add_sum_field(struct tracing_map *map)
* the key referenced by this key field resides.
*
* Return: The index identifying the field in the map and associated
- * tracing_map_elts.
+ * tracing_map_elts, or -EINVAL on error.
*/
int tracing_map_add_key_field(struct tracing_map *map,
unsigned int offset,
diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
index 7571825..b575d0b 100644
--- a/kernel/trace/tracing_map.h
+++ b/kernel/trace/tracing_map.h
@@ -5,9 +5,10 @@
#define TRACING_MAP_BITS_MAX 17
#define TRACING_MAP_BITS_MIN 7
-#define TRACING_MAP_FIELDS_MAX 4
#define TRACING_MAP_KEYS_MAX 2
-
+#define TRACING_MAP_VALS_MAX 3
+#define TRACING_MAP_FIELDS_MAX (TRACING_MAP_KEYS_MAX + \
+ TRACING_MAP_VALS_MAX)
#define TRACING_MAP_SORT_KEYS_MAX 2
typedef int (*tracing_map_cmp_fn_t) (void *val_a, void *val_b);
--
1.9.3
next prev parent reply other threads:[~2016-02-26 16:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 16:01 [PATCH 00/23] tracing: 'hist' triggers Tom Zanussi
2016-02-26 16:01 ` Tom Zanussi [this message]
2016-02-26 16:01 ` [PATCH v15 02/23] tracing: Add 'hist' event trigger command Tom Zanussi
2016-03-02 14:33 ` Steven Rostedt
2016-02-26 16:01 ` [PATCH v15 03/23] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2016-03-02 14:38 ` Steven Rostedt
2016-02-26 16:01 ` [PATCH v15 04/23] tracing: Add hist trigger support for compound keys Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 05/23] tracing: Add hist trigger support for user-defined sorting ('sort=' param) Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 06/23] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 07/23] tracing: Add hist trigger support for clearing " Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 08/23] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 09/23] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 10/23] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2016-03-02 17:39 ` Steven Rostedt
2016-03-02 19:51 ` Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 11/23] tracing: Add hist trigger 'syscall' modifier Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 12/23] tracing: Add hist trigger support for stacktraces as keys Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 13/23] tracing: Support string type key properly Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 14/23] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 15/23] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 16/23] tracing: Add 'hist' trigger Documentation Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 17/23] tracing: Add support for multiple hist triggers per event Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 18/23] tracing: Add support for named triggers Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 19/23] tracing: Add support for named hist triggers Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 20/23] kselftests/ftrace : Add event trigger testcases Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 21/23] kselftests/ftrace: Add hist " Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 22/23] tracing: Add hist trigger 'log2' modifier Tom Zanussi
2016-02-26 16:01 ` [PATCH v15 23/23] kselftests/ftrace: Add a test for log2 modifier of hist trigger Tom Zanussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fb81a9c771dc75cffa90688627e1d216b59c3add.1456501855.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®