fix: timer/trace: Improve timer tracing (v5.2)

[lttng-modules.git] / instrumentation / events / lttng-module / net.h

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index e48c4db1ea3557d975f38e31f1ca0bd513b6122d..bfa14fc64ef6562b20f5212ddf94b6711d8e654e 100644 (file)
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM net
 
@@ -133,6 +134,30 @@ static inline enum transport_header_types __get_transport_header_type(struct sk_
        return TH_NONE;
 }
 
+static struct lttng_enum_entry proto_transport_enum_entries[] = {
+       [0] = {
+               .start = { .value = 0, .signedness = 0, },
+               .end = { .value = IPPROTO_TCP - 1, .signedness = 0, },
+               .string = "_unknown",
+       },
+       [1] = {
+               .start = { .value = IPPROTO_TCP, .signedness = 0, },
+               .end = { .value = IPPROTO_TCP, .signedness = 0, },
+               .string = "_tcp",
+       },
+       [2] = {
+               .start = { .value = IPPROTO_TCP + 1, .signedness = 0, },
+               .end = { .value = 255, .signedness = 0, },
+               .string = "_unknown",
+       },
+};
+
+static const struct lttng_enum_desc proto_transport_header_type = {
+       .name = "proto_transport_header_type",
+       .entries = proto_transport_enum_entries,
+       .nr_entries = ARRAY_SIZE(proto_transport_enum_entries),
+};
+
 static struct lttng_enum_entry transport_enum_entries[] = {
        [0] = {
                .start = { .value = TH_NONE, .signedness = 0, },
@@ -194,7 +219,8 @@ static struct lttng_event_field ipv4fields[] = {
                .name = "protocol",
                .type = {
                        .atype = atype_enum,
-                       .u.basic.enumeration.desc = &transport_header_type,
+                       .u.basic.enumeration.desc =
+                               &proto_transport_header_type,
                        .u.basic.enumeration.container_type = {
                                .size = 8,
                                .alignment = 8,
@@ -290,7 +316,8 @@ static struct lttng_event_field ipv6fields[] = {
                .name = "nexthdr",
                .type = {
                        .atype = atype_enum,
-                       .u.basic.enumeration.desc = &transport_header_type,
+                       .u.basic.enumeration.desc =
+                               &proto_transport_header_type,
                        .u.basic.enumeration.container_type = {
                                .size = 8,
                                .alignment = 8,
@@ -412,30 +439,18 @@ LTTNG_TRACEPOINT_ENUM(net_network_header,
 
 LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
        TP_PROTO(struct sk_buff *skb,
                 int rc,
                 struct net_device *dev,
                 unsigned int skb_len),
 
        TP_ARGS(skb, rc, dev, skb_len),
-#else
-       TP_PROTO(struct sk_buff *skb,
-                int rc),
-
-       TP_ARGS(skb, rc),
-#endif
 
        TP_FIELDS(
                ctf_integer_hex(void *, skbaddr, skb)
                ctf_integer(int, rc, rc)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
                ctf_integer(unsigned int, len, skb_len)
                ctf_string(name, dev->name)
-#else
-               ctf_integer(unsigned int, len, skb->len)
-               ctf_string(name, skb->dev->name)
-#endif
        )
 )