projects
/
lttng-ust.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89be535
)
Add ctf_sequence_hex() macro
author
Philippe Proulx
<eeppeliteloop@gmail.com>
Tue, 30 Jun 2015 23:39:36 +0000
(19:39 -0400)
committer
Mathieu Desnoyers
<mathieu.desnoyers@efficios.com>
Wed, 1 Jul 2015 14:09:39 +0000
(10:09 -0400)
This patch adds the `_elem_type_base` parameter to
the internal _ctf_sequence_encoded() macro to
specify the sequence's element type's base.
ctf_sequence_hex() sets the `_elem_type_base`
parameter to 16.
This is convenient for recording byte buffers and
viewing them in hexadecimal.
Suggested-by: Antoine Busque <abusque@efficios.com>
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
include/lttng/ust-tracepoint-event-nowrite.h
patch
|
blob
|
blame
|
history
include/lttng/ust-tracepoint-event-reset.h
patch
|
blob
|
blame
|
history
include/lttng/ust-tracepoint-event-write.h
patch
|
blob
|
blame
|
history
include/lttng/ust-tracepoint-event.h
patch
|
blob
|
blame
|
history
diff --git
a/include/lttng/ust-tracepoint-event-nowrite.h
b/include/lttng/ust-tracepoint-event-nowrite.h
index 98d97919a2f69efd47f49dd67446a399dae69f1f..e87f31e31cb33011ebd047ac7c7c81151541676c 100644
(file)
--- a/
include/lttng/ust-tracepoint-event-nowrite.h
+++ b/
include/lttng/ust-tracepoint-event-nowrite.h
@@
-39,12
+39,17
@@
#undef ctf_sequence_nowrite
#define ctf_sequence_nowrite(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
#undef ctf_sequence_nowrite
#define ctf_sequence_nowrite(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, none, 1)
+ _length_type, _src_length, none, 1, 10)
+
+#undef ctf_sequence_nowrite_hex
+#define ctf_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) \
+ _ctf_sequence_encoded(_type, _item, _src, \
+ _length_type, _src_length, none, 1, 16)
#undef ctf_sequence_text_nowrite
#define ctf_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
#undef ctf_sequence_text_nowrite
#define ctf_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, UTF8, 1)
+ _length_type, _src_length, UTF8, 1
, 10
)
#undef ctf_string_nowrite
#define ctf_string_nowrite(_item, _src) \
#undef ctf_string_nowrite
#define ctf_string_nowrite(_item, _src) \
diff --git
a/include/lttng/ust-tracepoint-event-reset.h
b/include/lttng/ust-tracepoint-event-reset.h
index 412883d9b90c12846e042105a01b8c21c73f1e06..f5981f84468656bbea9bc8a5bf3855eb78c7a592 100644
(file)
--- a/
include/lttng/ust-tracepoint-event-reset.h
+++ b/
include/lttng/ust-tracepoint-event-reset.h
@@
-56,7
+56,7
@@
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
- _src_length, _encoding, _nowrite)
+ _src_length, _encoding, _nowrite
, _elem_type_base
)
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite)
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite)
diff --git
a/include/lttng/ust-tracepoint-event-write.h
b/include/lttng/ust-tracepoint-event-write.h
index 44218d2168f682f531ac9ec150dd063d31322668..86c6adc6cea208233686ad1bf4f97a5d702ab037 100644
(file)
--- a/
include/lttng/ust-tracepoint-event-write.h
+++ b/
include/lttng/ust-tracepoint-event-write.h
@@
-51,12
+51,17
@@
#undef ctf_sequence
#define ctf_sequence(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
#undef ctf_sequence
#define ctf_sequence(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, none, 0)
+ _length_type, _src_length, none, 0, 10)
+
+#undef ctf_sequence_hex
+#define ctf_sequence_hex(_type, _item, _src, _length_type, _src_length) \
+ _ctf_sequence_encoded(_type, _item, _src, \
+ _length_type, _src_length, none, 0, 16)
#undef ctf_sequence_text
#define ctf_sequence_text(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
#undef ctf_sequence_text
#define ctf_sequence_text(_type, _item, _src, _length_type, _src_length) \
_ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, UTF8, 0)
+ _length_type, _src_length, UTF8, 0
, 10
)
#undef ctf_string
#define ctf_string(_item, _src) \
#undef ctf_string
#define ctf_string(_item, _src) \
diff --git
a/include/lttng/ust-tracepoint-event.h
b/include/lttng/ust-tracepoint-event.h
index 6632f67a3c8bb8c5e29d21efcb21c082ac407da2..d9aa6ce6bdb8f8496b7b7a1dc41facf20ca6a169 100644
(file)
--- a/
include/lttng/ust-tracepoint-event.h
+++ b/
include/lttng/ust-tracepoint-event.h
@@
-165,8
+165,9
@@
static const char \
},
#undef _ctf_sequence_encoded
},
#undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, _encoding, _nowrite) \
+#define _ctf_sequence_encoded(_type, _item, _src, \
+ _length_type, _src_length, _encoding, _nowrite, \
+ _elem_type_base) \
{ \
.name = #_item, \
.type = \
{ \
.name = #_item, \
.type = \
@@
-177,7
+178,7
@@
static const char \
.sequence = \
{ \
.length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
.sequence = \
{ \
.length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
- .elem_type = __type_integer(_type, BYTE_ORDER,
10
, _encoding), \
+ .elem_type = __type_integer(_type, BYTE_ORDER,
_elem_type_base
, _encoding), \
}, \
}, \
}, \
}, \
}, \
}, \
@@
-254,8
+255,8
@@
static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
__event_len += sizeof(_type) * (_length);
#undef _ctf_sequence_encoded
__event_len += sizeof(_type) * (_length);
#undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
- _src_length, _encoding, _nowrite) \
+#define _ctf_sequence_encoded(_type, _item, _src, _length_type,
\
+ _src_length, _encoding, _nowrite
, _elem_type_base
) \
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type)); \
__event_len += sizeof(_length_type); \
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type)); \
__event_len += sizeof(_length_type); \
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
@@
-391,7
+392,7
@@
size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
- _src_length, _encoding, _nowrite
)
\
+ _src_length, _encoding, _nowrite
, _elem_type_base)
\
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
const void *__ctf_tmp_ptr = (_src); \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
const void *__ctf_tmp_ptr = (_src); \
@@
-451,8
+452,8
@@
void __event_prepare_filter_stack__##_provider##___##_name(char *__stack_data,\
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_sequence_encoded
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
- _src_length, _encoding, _nowrite
)
\
+#define _ctf_sequence_encoded(_type, _item, _src, _length_type,
\
+ _src_length, _encoding, _nowrite
, _elem_type_base)
\
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_length_type)); \
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_length_type)); \
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
@@
-514,7
+515,7
@@
size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \
- _src_length, _encoding, _nowrite
)
\
+ _src_length, _encoding, _nowrite
, _elem_type_base)
\
{ \
_length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\
{ \
_length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\
This page took
0.027106 seconds
and
4
git commands to generate.