tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tracing: Use ? : shortcut in trace macros

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))

Link: https://lore.kernel.org/linux-trace-kernel/20240222211442.949327725@goodmis.org

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Steven Rostedt (Google) 91684986 e8b737bf

+8 -10
+2 -2
include/trace/stages/stage5_get_offsets.h
··· 47 47 48 48 #undef __string 49 49 #define __string(item, src) __dynamic_array(char, item, \ 50 - strlen((src) ? (const char *)(src) : "(null)") + 1) \ 50 + strlen((const char *)(src) ? : "(null)") + 1) \ 51 51 __data_offsets->item##_ptr_ = src; 52 52 53 53 #undef __string_len ··· 70 70 71 71 #undef __rel_string 72 72 #define __rel_string(item, src) __rel_dynamic_array(char, item, \ 73 - strlen((src) ? (const char *)(src) : "(null)") + 1) \ 73 + strlen((const char *)(src) ? : "(null)") + 1) \ 74 74 __data_offsets->item##_ptr_ = src; 75 75 76 76 #undef __rel_string_len
+6 -8
include/trace/stages/stage6_event_callback.h
··· 32 32 33 33 #undef __assign_str 34 34 #define __assign_str(dst, src) \ 35 - memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ 36 - __data_offsets.dst##_ptr_ : "(null)", \ 35 + memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ 37 36 __get_dynamic_array_len(dst)) 38 37 39 38 #undef __assign_str_len 40 39 #define __assign_str_len(dst, src, len) \ 41 40 do { \ 42 - memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ 43 - __data_offsets.dst##_ptr_ : "(null)", len); \ 41 + memcpy(__get_str(dst), \ 42 + __data_offsets.dst##_ptr_ ? : "(null)", len); \ 44 43 __get_str(dst)[len] = '\0'; \ 45 44 } while(0) 46 45 ··· 94 95 95 96 #undef __assign_rel_str 96 97 #define __assign_rel_str(dst, src) \ 97 - memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ 98 - __data_offsets.dst##_ptr_ : "(null)", \ 98 + memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ 99 99 __get_rel_dynamic_array_len(dst)) 100 100 101 101 #undef __assign_rel_str_len 102 102 #define __assign_rel_str_len(dst, src, len) \ 103 103 do { \ 104 - memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ 105 - __data_offsets.dst##_ptr_ : "(null)", len); \ 104 + memcpy(__get_rel_str(dst), \ 105 + __data_offsets.dst##_ptr_ ? : "(null)", len); \ 106 106 __get_rel_str(dst)[len] = '\0'; \ 107 107 } while (0) 108 108