Skip to contentSkip to conversation

Hide the packet_seq_num field

PATCH Mathieu Desnoyers 4 participants 5 messages Aug 3, 2015 – Aug 7, 2015 4 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Acked-by
#1 lore raw

Could we backport it to current babeltrace stable releases too ?

Thanks,

Mathieu

Quoted 46 lines · ----- On Aug 3, 2015, at 11:35 AM, Julien Desfossez [email protected]…

The packet_seq_num is a new field in LTTng 2.8 that should be hidden from the ctf-text output as it is not really relevant for the users of the text output.

---
formats/ctf-text/ctf-text.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)
formats/ctf-text/ctf-text.c +2 -1
index 9d5123a..2ba0823 100644
@@ -115,7 +115,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
 	Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
 	Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
 	Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+	Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 

static
void __attribute__((constructor)) init_quarks(void)

formats/ctf-text/ctf-text.c +1 -0
@@ -125,6 +126,7 @@ void __attribute__((constructor)) init_quarks(void)
 	Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED =
 	g_quark_from_static_string("stream.packet.context.events_discarded");
 	Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE =
 	g_quark_from_static_string("stream.packet.context.content_size");
 	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE =
 	g_quark_from_static_string("stream.packet.context.packet_size");
+	Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM =

g_quark_from_static_string("stream.packet.context.packet_seq_num"); }

static

formats/ctf-text/ctf-text.c +2 -1
@@ -152,6 +154,8 @@ int print_field(struct bt_definition *definition)
 		return 0;
 	if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
 		return 0;
+	if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+		return 0;
 
 	return 1;
 }
--

1.9.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 3 lines · Mathieu Desnoyers

Could we backport it to current babeltrace stable releases too ?

This patch is already meant for babeltrace stable-1.2 branch and it should apply nicely on master as well.

I think we should merge it soon since the new field is already produced by lttng-modules master and will probably start confusing the users who automatically parse the ctf-text output (we have all done it ;-) ).

Thanks,

Julien

Quoted 54 lines

Thanks,

Mathieu

Quoted 46 lines · ----- On Aug 3, 2015, at 11:35 AM, Julien Desfossez [email protected]…

The packet_seq_num is a new field in LTTng 2.8 that should be hidden from the ctf-text output as it is not really relevant for the users of the text output.

---
formats/ctf-text/ctf-text.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)
formats/ctf-text/ctf-text.c +2 -1
index 9d5123a..2ba0823 100644
@@ -115,7 +115,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
 	Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
 	Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
 	Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+	Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 

static
void __attribute__((constructor)) init_quarks(void)

formats/ctf-text/ctf-text.c +1 -0
@@ -125,6 +126,7 @@ void __attribute__((constructor)) init_quarks(void)
 	Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED =
 	g_quark_from_static_string("stream.packet.context.events_discarded");
 	Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE =
 	g_quark_from_static_string("stream.packet.context.content_size");
 	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE =
 	g_quark_from_static_string("stream.packet.context.packet_size");
+	Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM =

g_quark_from_static_string("stream.packet.context.packet_seq_num"); }

static

formats/ctf-text/ctf-text.c +2 -1
@@ -152,6 +154,8 @@ int print_field(struct bt_definition *definition)
 		return 0;
 	if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
 		return 0;
+	if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+		return 0;
 
 	return 1;
 }
--

1.9.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 11 lines · Julien Desfossez
Quoted 3 lines · Mathieu Desnoyers

Could we backport it to current babeltrace stable releases too ?

This patch is already meant for babeltrace stable-1.2 branch and it should apply nicely on master as well.

I think we should merge it soon since the new field is already produced by lttng-modules master and will probably start confusing the users who automatically parse the ctf-text output (we have all done it ;-) ).

It's a sin.

Quoted 64 lines

Thanks,

Julien

Quoted 49 lines

Thanks,

Mathieu

Quoted 42 lines · ----- On Aug 3, 2015, at 11:35 AM, Julien Desfossez [email protected]…

The packet_seq_num is a new field in LTTng 2.8 that should be hidden from the ctf-text output as it is not really relevant for the users of the text output.

---
formats/ctf-text/ctf-text.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)
formats/ctf-text/ctf-text.c +2 -1
index 9d5123a..2ba0823 100644
@@ -115,7 +115,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
     Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
     Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
     Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-    Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+    Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+    Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 

static
void __attribute__((constructor)) init_quarks(void)

formats/ctf-text/ctf-text.c +1 -0
@@ -125,6 +126,7 @@ void __attribute__((constructor)) init_quarks(void)
     Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED =
     g_quark_from_static_string("stream.packet.context.events_discarded");
     Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE =
     g_quark_from_static_string("stream.packet.context.content_size");
     Q_STREAM_PACKET_CONTEXT_PACKET_SIZE =
     g_quark_from_static_string("stream.packet.context.packet_size");
+    Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM =

g_quark_from_static_string("stream.packet.context.packet_seq_num"); }

static

formats/ctf-text/ctf-text.c +2 -0
@@ -152,6 +154,8 @@ int print_field(struct bt_definition *definition)
             return 0;
     if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
             return 0;
+    if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+            return 0;
 
Quoted 5 lines
Quoted 4 lines
formats/ctf-text/ctf-text.c +0 -1
     return 1;
 }
--

1.9.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): CAB4xu_3bYxJSJpEFvbgkoJEwg-zK-TMYTfRobaom1CrsG2uVsg@mail.gmail.com

#7 lore raw
Quoted 7 lines · ----- On Aug 6, 2015, at 11:26 PM, Philippe Proulx [email protected]…
Quoted 5 lines · Julien Desfossez
Quoted 3 lines · Mathieu Desnoyers

Could we backport it to current babeltrace stable releases too ?

Quoted 8 lines
Quoted 6 lines

This patch is already meant for babeltrace stable-1.2 branch and it should apply nicely on master as well.

I think we should merge it soon since the new field is already produced by lttng-modules master and will probably start confusing the users who automatically parse the ctf-text output (we have all done it ;-) ).

It's a sin.

It does show the need for CTF 2.0 with hidden field attributes, but meanwhile we need to make progress.

Thanks,

Mathieu

Quoted 66 lines
Quoted 66 lines

Thanks,

Julien

Quoted 50 lines

Thanks,

Mathieu

----- On Aug 3, 2015, at 11:35 AM, Julien Desfossez [email protected]

Quoted 42 lines · wrote:

The packet_seq_num is a new field in LTTng 2.8 that should be hidden from the ctf-text output as it is not really relevant for the users of the text output.

---
formats/ctf-text/ctf-text.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)
formats/ctf-text/ctf-text.c +2 -1
index 9d5123a..2ba0823 100644
@@ -115,7 +115,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
     Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
     Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
     Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-    Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+    Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+    Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 

static
void __attribute__((constructor)) init_quarks(void)

formats/ctf-text/ctf-text.c +1 -0
@@ -125,6 +126,7 @@ void __attribute__((constructor)) init_quarks(void)
     Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED =
     g_quark_from_static_string("stream.packet.context.events_discarded");
     Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE =
     g_quark_from_static_string("stream.packet.context.content_size");
     Q_STREAM_PACKET_CONTEXT_PACKET_SIZE =
     g_quark_from_static_string("stream.packet.context.packet_size");
+    Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM =

g_quark_from_static_string("stream.packet.context.packet_seq_num"); }

static

formats/ctf-text/ctf-text.c +2 -0
@@ -152,6 +154,8 @@ int print_field(struct bt_definition *definition)
             return 0;
     if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
             return 0;
+    if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+            return 0;
 
Quoted 5 lines
Quoted 4 lines
formats/ctf-text/ctf-text.c +0 -1
     return 1;
 }
--

1.9.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
#8 lore raw
In reply to a message not in the archive

Merged in master and stable-1.2.

Thanks,
J/r/mie ;-)

Quoted 48 lines · Julien Desfossez

The packet_seq_num is a new field in LTTng 2.8 that should be hidden from the ctf-text output as it is not really relevant for the users of the text output.

---
 formats/ctf-text/ctf-text.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
formats/ctf-text/ctf-text.c +3 -1
index 9d5123a..2ba0823 100644
@@ -115,7 +115,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
        Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
        Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
        Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+       Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 
 static
 void __attribute__((constructor)) init_quarks(void)
@@ -125,6 +126,7 @@ void __attribute__((constructor)) init_quarks(void)
        Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED =
 g_quark_from_static_string("stream.packet.context.events_discarded");
        Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE =
 g_quark_from_static_string("stream.packet.context.content_size");
        Q_STREAM_PACKET_CONTEXT_PACKET_SIZE =
 g_quark_from_static_string("stream.packet.context.packet_size");
+       Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM =

g_quark_from_static_string("stream.packet.context.packet_seq_num");
}

static

formats/ctf-text/ctf-text.c +2 -1
@@ -152,6 +154,8 @@ int print_field(struct bt_definition *definition)
                return 0;
        if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
                return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+               return 0;
 
        return 1;
 }
--

1.9.1

Signature · 3 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev