Skip to contentSkip to conversation

Fix: list command: revert merge error made when adding mi on pretty printing

PATCH New David Goulet 2 participants 2 messages Aug 16, 2014 3 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]

#1 lore raw
Quoted 13 lines · Jonathan Rajotte Julien
---
 src/bin/lttng/commands/list.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
src/bin/lttng/commands/list.c +0 -0
index e3ff4f1..ccffdc7 100644
@@ -1271,14 +1271,10 @@ static int list_sessions(const char *session_name)
 					break;
 				}
 			} else {

src/bin/lttng/commands/list.c static int list_sessions(const char *session_name) · line 1281

Quoted 10 lines
src/bin/lttng/commands/list.c +2 -6
-				MSG("  %d) %s (%s) [%s%s]", i + 1,
-						sessions[i].name, sessions[i].path,
+				MSG("  %d) %s (%s) [%s%s]", i + 1, sessions[i].name,
+						sessions[i].path,
 						active_string(sessions[i].enabled),
 						snapshot_string(sessions[i].snapshot_mode));
-				MSG("%sTrace path: %s", indent4, sessions[i].path);
-				MSG("%sLive timer interval (usec): %u\n", indent4,
-						sessions[i].live_timer_interval);
-				break;

Not sure removing that is wanted here. The "trace path" and "live timer interval" lines are in stable-2.5 thus removing them here, you need a real good reason ;)

David

Quoted 11 lines
src/bin/lttng/commands/list.c +0 -0
 			}
 		}
 
Signature · 7 lines
2.0.4


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

_______________________________________________
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): 20140816144546.GG7634@thessa

A message that is not in the archive (sent off-list or not yet received): CAF4oYfEnxpEMTJhYgHjPH6rP57S+nod1x6th_rtOSZ1-AeCiAA@mail.gmail.com

#4 lore raw

PATCH 1/1 Fix: list command: revert merge error made when adding mi on pretty printing

Actually if you want to preserve the original behaviour from 2.5 you want to remove them.

This code path is for listing all the sessions. Not for the individual listing.

Here the code from the "all listing" path in 2.5

MSG(" %d) %s (%s) [%s%s]", i + 1, sessions[i].name, sessions[i].path, active_string(sessions[i].enabled), snapshot_string(sessions[i].snapshot_mode));

I don't mind you telling me that we can add the trace path and the live timer now that we have mi.
But as long as we talk about this patch, it revert to the original behaviour from 2.5 and fix my incompetence. Notice the removal of the break statement too... if you are on master and do a lttng list with multiple sessions only the first one show up.

Or am I missing something ?

Quoted 48 lines · David Goulet
Quoted 30 lines · Jonathan Rajotte Julien
Quoted 13 lines
---
 src/bin/lttng/commands/list.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
src/bin/lttng/commands/list.c +0 -0
index e3ff4f1..ccffdc7 100644
@@ -1271,14 +1271,10 @@ static int list_sessions(const char *session_name)
                                      break;
                              }
                      } else {

src/bin/lttng/commands/list.c static int list_sessions(const char *session_name) · line 1281

Quoted 10 lines
src/bin/lttng/commands/list.c +2 -6
-                             MSG("  %d) %s (%s) [%s%s]", i + 1,
-                                             sessions[i].name, sessions[i].path,
+                             MSG("  %d) %s (%s) [%s%s]", i + 1, sessions[i].name,
+                                             sessions[i].path,
                                              active_string(sessions[i].enabled),
                                              snapshot_string(sessions[i].snapshot_mode));
-                             MSG("%sTrace path: %s", indent4, sessions[i].path);
-                             MSG("%sLive timer interval (usec): %u\n", indent4,
-                                             sessions[i].live_timer_interval);
-                             break;

Not sure removing that is wanted here. The "trace path" and "live timer interval" lines are in stable-2.5 thus removing them here, you need a real good reason ;)

Quoted 13 lines

David

Quoted 11 lines
src/bin/lttng/commands/list.c +0 -1
                      }
              }
 
--

2.0.4

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

Quoted 4 lines

--
Jonathan Rajotte Julien
Chargé de laboratoire, INF1995
Polytechnique Montréal

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