From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Cc: "Masami Hiramatsu" <mhiramat@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Chuck Lever" <chuck.lever@oracle.com>
Subject: [PATCH v2 3/4] tracing: Use ? : shortcut in trace macros
Date: Thu, 22 Feb 2024 16:14:18 -0500 [thread overview]
Message-ID: <20240222211442.949327725@goodmis.org> (raw)
In-Reply-To: 20240222211415.255659509@goodmis.org
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Instead of having:
#define __assign_str(dst, src) \
memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \
__data_offsets.dst##_ptr_ : "(null)", \
__get_dynamic_array_len(dst))
Use the ? : shortcut and compact it down to:
#define __assign_str(dst, src) \
memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \
__get_dynamic_array_len(dst))
Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
include/trace/stages/stage5_get_offsets.h | 4 ++--
include/trace/stages/stage6_event_callback.h | 14 ++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/trace/stages/stage5_get_offsets.h b/include/trace/stages/stage5_get_offsets.h
index 45f8151cf622..20b801ed3fd4 100644
--- a/include/trace/stages/stage5_get_offsets.h
+++ b/include/trace/stages/stage5_get_offsets.h
@@ -47,7 +47,7 @@
#undef __string
#define __string(item, src) __dynamic_array(char, item, \
- strlen((src) ? (const char *)(src) : "(null)") + 1) \
+ strlen((const char *)(src) ? : "(null)") + 1) \
__data_offsets->item##_ptr_ = src;
#undef __string_len
@@ -70,7 +70,7 @@
#undef __rel_string
#define __rel_string(item, src) __rel_dynamic_array(char, item, \
- strlen((src) ? (const char *)(src) : "(null)") + 1) \
+ strlen((const char *)(src) ? : "(null)") + 1) \
__data_offsets->item##_ptr_ = src;
#undef __rel_string_len
diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/stages/stage6_event_callback.h
index c0e5d097324e..38732855eadb 100644
--- a/include/trace/stages/stage6_event_callback.h
+++ b/include/trace/stages/stage6_event_callback.h
@@ -32,15 +32,14 @@
#undef __assign_str
#define __assign_str(dst, src) \
- memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \
- __data_offsets.dst##_ptr_ : "(null)", \
+ memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \
__get_dynamic_array_len(dst))
#undef __assign_str_len
#define __assign_str_len(dst, src, len) \
do { \
- memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \
- __data_offsets.dst##_ptr_ : "(null)", len); \
+ memcpy(__get_str(dst), \
+ __data_offsets.dst##_ptr_ ? : "(null)", len); \
__get_str(dst)[len] = '\0'; \
} while(0)
@@ -95,15 +94,14 @@
#undef __assign_rel_str
#define __assign_rel_str(dst, src) \
- memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \
- __data_offsets.dst##_ptr_ : "(null)", \
+ memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \
__get_rel_dynamic_array_len(dst))
#undef __assign_rel_str_len
#define __assign_rel_str_len(dst, src, len) \
do { \
- memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \
- __data_offsets.dst##_ptr_ : "(null)", len); \
+ memcpy(__get_rel_str(dst), \
+ __data_offsets.dst##_ptr_ ? : "(null)", len); \
__get_rel_str(dst)[len] = '\0'; \
} while (0)
--
2.43.0
next prev parent reply other threads:[~2024-02-22 21:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 21:14 [PATCH v2 0/4] tracing: Optimize __string()/__assign_str() processing Steven Rostedt
2024-02-22 21:14 ` [PATCH v2 1/4] tracing: Rework __assign_str() and __string() to not duplicate getting the string Steven Rostedt
2024-02-22 21:14 ` [PATCH v2 2/4] tracing: Do not calculate strlen() twice for __string() fields Steven Rostedt
2024-02-22 21:14 ` Steven Rostedt [this message]
2024-02-22 21:14 ` [PATCH v2 4/4] tracing: Use EVENT_NULL_STR macro instead of open coding "(null)" Steven Rostedt
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=20240222211442.949327725@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=chuck.lever@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=ville.syrjala@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.