From: Mathieu Desnoyers Date: Tue, 11 Nov 2014 21:29:06 +0000 (-0500) Subject: Fix length type and text sequence base X-Git-Tag: v2.7.0-rc1~69 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=5e6f60b2e8cddb042391b38d8dd4cb183266dcef Fix length type and text sequence base Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h index f656b3a6..af519cd6 100644 --- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h +++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h @@ -9,7 +9,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect, uint16_t dport; uint32_t v4addr; uint16_t v6addr[8]; - int v4addr_len, v6addr_len; + unsigned int v4addr_len, v6addr_len; ), TP_code( sc_in( @@ -46,8 +46,8 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect, sc_in(ctf_integer_hex(int, addrlen, addrlen)) sc_in(ctf_integer(int, family, tp_locvar->sa_family)) sc_in(ctf_integer_network(uint16_t, dport, tp_locvar->dport)) - sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len)) - sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len)) + sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len)) + sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len)) ) ) @@ -101,8 +101,8 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept, sc_inout(ctf_integer(int, upeer_addrlen, tp_locvar->uaddr_len)) sc_out(ctf_integer(int, family, tp_locvar->sa_family)) sc_out(ctf_integer_network(uint16_t, sport, tp_locvar->sport)) - sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len)) - sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len)) + sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len)) + sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len)) ) ) diff --git a/probes/lttng-events-nowrite.h b/probes/lttng-events-nowrite.h index 39cd424a..69453ae6 100644 --- a/probes/lttng-events-nowrite.h +++ b/probes/lttng-events-nowrite.h @@ -54,7 +54,7 @@ #undef ctf_sequence_text_nowrite #define ctf_sequence_text_nowrite(_type, _item, _user_src, _length_type, _user_src_length) \ _ctf_sequence_encoded(_type, _item, _user_src, \ - _length_type, _user_src_length, UTF8, __BYTE_ORDER, 0, 0, 1) + _length_type, _user_src_length, UTF8, __BYTE_ORDER, 10, 0, 1) #undef ctf_string_nowrite #define ctf_string_nowrite(_item, _user_src) \ @@ -93,7 +93,7 @@ #undef ctf_user_sequence_text_nowrite #define ctf_user_sequence_text_nowrite(_type, _item, _user_src, _length_type, _user_src_length) \ _ctf_sequence_encoded(_type, _item, _user_src, \ - _length_type, _user_src_length, UTF8, __BYTE_ORDER, 0, 1, 1) + _length_type, _user_src_length, UTF8, __BYTE_ORDER, 10, 1, 1) #undef ctf_user_string_nowrite #define ctf_user_string_nowrite(_item, _user_src) \ diff --git a/probes/lttng-events-write.h b/probes/lttng-events-write.h index aed0814b..dde883ea 100644 --- a/probes/lttng-events-write.h +++ b/probes/lttng-events-write.h @@ -64,7 +64,7 @@ #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, __BYTE_ORDER, 0, 0, 0) + _length_type, _src_length, UTF8, __BYTE_ORDER, 10, 0, 0) #undef ctf_string #define ctf_string(_item, _src) \ @@ -108,7 +108,7 @@ #undef ctf_user_sequence_text #define ctf_user_sequence_text(_type, _item, _src, _length_type, _src_length) \ _ctf_sequence_encoded(_type, _item, _src, \ - _length_type, _src_length, UTF8, __BYTE_ORDER, 0, 1, 0) + _length_type, _src_length, UTF8, __BYTE_ORDER, 10, 1, 0) #undef ctf_user_string #define ctf_user_string(_item, _src) \