This commit fixes three UX problems with lttng's list command
output.
1) The list command currently repeats the session's output location
twice, e.g.
auto-
20190326-192630 (/home/jgalar/lttng-traces/auto-
20190326-192630) [inactive]
Trace path: /home/jgalar/lttng-traces/auto-
20190326-192630
2) In the case of a snapshot session, the parentheses are empty
and the "Trace path:" line is empty, e.g.
auto-
20190326-192613 () [inactive snapshot]
Trace path:
3) The term "path" is used even though the output may be a
network location, e.g.
auto-
20190326-194856 (tcp4://127.0.0.1:5342/ [data: 5343]) [inactive]
Trace path: tcp4://127.0.0.1:5342/ [data: 5343]
The new output omits the output location in parentheses, doesn't
print the "Trace path" line if no output is specified, and
uses the generic "output" terminology rather than "path".
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
#include <assert.h>
#include <common/mi-lttng.h>
#include <assert.h>
#include <common/mi-lttng.h>
+#include <common/time.h>
#include <lttng/constant.h>
#include "../command.h"
#include <lttng/constant.h>
#include "../command.h"
MSG("Available tracing sessions:");
}
MSG("Available tracing sessions:");
}
for (i = 0; i < count; i++) {
if (session_name != NULL) {
if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) {
for (i = 0; i < count; i++) {
if (session_name != NULL) {
if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) {
MSG("Tracing session %s: [%s%s]", session_name,
active_string(sessions[i].enabled),
snapshot_string(sessions[i].snapshot_mode));
MSG("Tracing session %s: [%s%s]", session_name,
active_string(sessions[i].enabled),
snapshot_string(sessions[i].snapshot_mode));
- MSG("%sTrace path: %s\n", indent4, sessions[i].path);
+ if (*sessions[i].path) {
+ MSG("%sTrace output: %s\n", indent4, sessions[i].path);
+ }
memcpy(&listed_session, &sessions[i],
sizeof(listed_session));
break;
}
} else {
memcpy(&listed_session, &sessions[i],
sizeof(listed_session));
break;
}
} else {
- MSG(" %d) %s (%s) [%s%s]", i + 1,
- sessions[i].name, sessions[i].path,
+ MSG(" %d) %s [%s%s]", i + 1,
+ sessions[i].name,
active_string(sessions[i].enabled),
snapshot_string(sessions[i].snapshot_mode));
active_string(sessions[i].enabled),
snapshot_string(sessions[i].snapshot_mode));
- MSG("%sTrace path: %s", indent4, sessions[i].path);
+ if (*sessions[i].path) {
+ MSG("%sTrace output: %s", indent4, sessions[i].path);
+ }
if (sessions[i].live_timer_interval != 0) {
if (sessions[i].live_timer_interval != 0) {
- MSG("%sLive timer interval: %u µs", indent4,
- sessions[i].live_timer_interval);
+ MSG("%sLive timer interval: %u %s", indent4,
+ sessions[i].live_timer_interval,
+ USEC_UNIT);