#include <fts.h>
#include <assert.h>
#include <sys/mman.h>
-#include <lttng/lttng.h>
+#include <sys/wait.h>
+
+#define LTTNG_SYMBOL_NAME_LEN 256
+
#ifdef LTTNGTOP_MMAP_LIVE
#include <lttng/lttngtop-helper.h>
#include <babeltrace/lttngtopmmappacketseek.h>
#include "lttngtoptypes.h"
#include "cputop.h"
#include "iostreamtop.h"
-#include "cursesdisplay.h"
#include "common.h"
#include "network-live.h"
+#include "lttng-session.h"
+
+#ifdef HAVE_LIBNCURSES
+#include "cursesdisplay.h"
+#endif
#define NET_URL_PREFIX "net://"
#define NET4_URL_PREFIX "net4://"
int opt_textdump;
int opt_child;
int opt_begin;
+int opt_all;
int quit = 0;
+/* We need at least one valid trace to start processing. */
+int valid_trace = 0;
struct lttngtop *copy;
pthread_t display_thread;
unsigned long refresh_display = 1 * NSEC_PER_SEC;
unsigned long last_display_update = 0;
unsigned long last_event_ts = 0;
+struct syscall *last_syscall;
/* list of FDs available for being read with snapshots */
struct bt_mmap_stream_list mmap_list;
OPT_TEXTDUMP,
OPT_PID,
OPT_CHILD,
- OPT_HOSTNAME,
+ OPT_PROCNAME,
OPT_RELAY_HOSTNAME,
OPT_KPROBES,
OPT_BEGIN,
+ OPT_ALL,
+ OPT_OUTPUT_FILE,
+ OPT_VERBOSE,
+ OPT_GUI_TEST,
+ OPT_CREATE_LOCAL_SESSION,
+ OPT_CREATE_LIVE_SESSION,
};
static struct poptOption long_options[] = {
{ "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL },
{ "begin", 'b', POPT_ARG_NONE, NULL, OPT_BEGIN, NULL, NULL },
{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
- { "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
+ { "procname", 'n', POPT_ARG_STRING, &opt_procname, OPT_PROCNAME, NULL, NULL },
{ "relay-hostname", 'r', POPT_ARG_STRING, &opt_relay_hostname,
OPT_RELAY_HOSTNAME, NULL, NULL },
{ "kprobes", 'k', POPT_ARG_STRING, &opt_kprobes, OPT_KPROBES, NULL, NULL },
+ { "all", 'a', POPT_ARG_NONE, NULL, OPT_ALL, NULL, NULL },
+ { "output", 'o', POPT_ARG_STRING, &opt_output, OPT_OUTPUT_FILE, NULL, NULL },
+ { "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
+ { "gui-test", 'g', POPT_ARG_NONE, NULL, OPT_GUI_TEST, NULL, NULL },
+ { "create-local-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LOCAL_SESSION, NULL, NULL },
+ { "create-live-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LIVE_SESSION, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
}
}
+#ifdef HAVE_LIBNCURSES
void *ncurses_display(void *p)
{
unsigned int current_display_index = 0;
sem_post(&pause_sem);
}
}
+#endif /* HAVE_LIBNCURSES */
-void print_fields(struct bt_ctf_event *event)
+void print_fields(struct bt_ctf_event *event, const char *procname,
+ int pid)
{
unsigned int cnt, i;
const struct bt_definition *const * list;
const struct bt_definition *scope;
enum ctf_type_id type;
const char *str;
+ struct processtop *current_proc;
+ struct files *current_file;
+ int fd, fd_value = -1;
scope = bt_ctf_get_top_level_scope(event, BT_EVENT_FIELDS);
bt_ctf_get_field_list(event, scope, &list, &cnt);
for (i = 0; i < cnt; i++) {
if (i != 0)
- printf(", ");
- printf("%s = ", bt_ctf_field_name(list[i]));
+ fprintf(output, ", ");
+ fprintf(output, "%s = ", bt_ctf_field_name(list[i]));
l = bt_ctf_get_decl_from_def(list[i]);
+ if (strncmp(bt_ctf_field_name(list[i]), "fd", 2) == 0)
+ fd = 1;
+ else
+ fd = 0;
type = bt_ctf_field_type(l);
if (type == CTF_TYPE_INTEGER) {
- if (bt_ctf_get_int_signedness(l) == 0)
- printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
- else
- printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
+ if (bt_ctf_get_int_signedness(l) == 0) {
+ fd_value = bt_ctf_get_uint64(list[i]);
+ fprintf(output, "%" PRIu64, bt_ctf_get_uint64(list[i]));
+ } else {
+ fd_value = bt_ctf_get_int64(list[i]);
+ fprintf(output, "%" PRId64, bt_ctf_get_int64(list[i]));
+ }
} else if (type == CTF_TYPE_STRING) {
- printf("%s", bt_ctf_get_string(list[i]));
+ fprintf(output, "%s", bt_ctf_get_string(list[i]));
} else if (type == CTF_TYPE_ARRAY) {
str = bt_ctf_get_char_array(list[i]);
if (!bt_ctf_field_get_error() && str)
- printf("%s", str);
+ fprintf(output, "%s", str);
+ }
+ if (fd) {
+ current_proc = find_process_tid(<tngtop, pid, procname);
+ if (!current_proc)
+ continue;
+ current_file = get_file(current_proc, fd_value);
+ if (!current_file || !current_file->name)
+ continue;
+ fprintf(output, "<%s>", current_file->name);
}
}
}
* hook on each event to check the timestamp and refresh the display if
* necessary
*/
-enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data)
+enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data)
{
unsigned long timestamp;
uint64_t delta;
struct tm start;
uint64_t ts_nsec_start;
- int pid, cpu_id, tid;
+ int pid, cpu_id, tid, ret, lookup, current_syscall = 0;
const struct bt_definition *scope;
const char *hostname, *procname;
+ struct cputime *cpu;
+ char *from_syscall = NULL;
+ int syscall_exit = 0;
timestamp = bt_ctf_get_timestamp(call_data);
tid = get_context_tid(call_data);
hostname = get_context_hostname(call_data);
- if (opt_tid || opt_hostname) {
- if (!lookup_filter_tid_list(pid)) {
+ if (opt_child)
+ lookup = pid;
+ else
+ lookup = tid;
+ if (opt_tid || opt_procname || opt_exec_name) {
+ if (!lookup_filter_tid_list(lookup)) {
/* To display when a process of ours in getting scheduled in */
if (strcmp(bt_ctf_event_name(call_data), "sched_switch") == 0) {
int next_tid;
goto error;
}
if (!lookup_filter_tid_list(next_tid)) {
- goto end;
+ if (!opt_all)
+ goto end;
+ } else {
+ if (opt_all)
+ fprintf(output, "%c[1m", 27);
}
- } else {
+ } else if (!opt_all) {
goto end;
}
+ } else {
+ if (opt_all)
+ fprintf(output, "%c[1m", 27);
}
}
+ if (((strncmp(bt_ctf_event_name(call_data),
+ "exit_syscall", 12)) == 0) ||
+ ((strncmp(bt_ctf_event_name(call_data),
+ "syscall_exit", 12)) == 0)) {
+ syscall_exit = 1;
+ }
+
+ if (last_syscall && !syscall_exit) {
+ last_syscall = NULL;
+ fprintf(output, " ...interrupted...\n");
+ }
+
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
+ if ((strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) ||
+ (strncmp(bt_ctf_event_name(call_data), "syscall_entry", 13) == 0)){
+ cpu = get_cpu(cpu_id);
+ cpu->current_syscall = g_new0(struct syscall, 1);
+ cpu->current_syscall->name = strdup(bt_ctf_event_name(call_data));
+ cpu->current_syscall->ts_start = timestamp;
+ cpu->current_syscall->cpu_id = cpu_id;
+ last_syscall = cpu->current_syscall;
+ current_syscall = 1;
+ } else if (syscall_exit) {
+ struct tm start_ts;
+
+ /* Return code of a syscall if it was the last displayed event. */
+ if (last_syscall && last_syscall->ts_start == prev_ts) {
+ if (last_syscall->cpu_id == cpu_id) {
+ int64_t syscall_ret;
+
+ delta = timestamp - last_syscall->ts_start;
+ scope = bt_ctf_get_top_level_scope(call_data,
+ BT_EVENT_FIELDS);
+ syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+ scope, "_ret"));
+
+ fprintf(output, "= %" PRId64 " (%" PRIu64 ".%09" PRIu64 "s)\n",
+ syscall_ret, delta / NSEC_PER_SEC,
+ delta % NSEC_PER_SEC);
+ last_syscall = NULL;
+ goto end;
+ } else {
+ last_syscall = NULL;
+ fprintf(output, " ...interrupted...\n");
+ }
+ }
+
+ cpu = get_cpu(cpu_id);
+ if (cpu->current_syscall) {
+ delta = timestamp - cpu->current_syscall->ts_start;
+ start_ts = format_timestamp(cpu->current_syscall->ts_start);
+ ret = asprintf(&from_syscall, " [from %02d:%02d:%02d.%09" PRIu64
+ " (+%" PRIu64 ".%09" PRIu64 ") (cpu %d) %s]",
+ start_ts.tm_hour, start_ts.tm_min, start_ts.tm_sec,
+ cpu->current_syscall->ts_start % NSEC_PER_SEC,
+ delta / NSEC_PER_SEC, delta % NSEC_PER_SEC,
+ cpu_id, cpu->current_syscall->name);
+ if (ret < 0) {
+ goto error;
+ }
+ free(cpu->current_syscall->name);
+ g_free(cpu->current_syscall);
+ cpu->current_syscall = NULL;
+ last_syscall = NULL;
+ }
+ }
+
if (prev_ts == 0)
prev_ts = timestamp;
delta = timestamp - prev_ts;
prev_ts = timestamp;
- if (hostname) {
- printf("%02d:%02d:%02d.%09" PRIu64 " (+%" PRIu64 ".%09" PRIu64 ") (%s) "
- "(cpu %d) [%s (%d/%d)] %s (",
- start.tm_hour, start.tm_min, start.tm_sec,
- ts_nsec_start, delta / NSEC_PER_SEC,
- delta % NSEC_PER_SEC, hostname, cpu_id,
- procname, pid, tid,
- bt_ctf_event_name(call_data));
- } else {
- printf("%02d:%02d:%02d.%09" PRIu64 " (+%" PRIu64 ".%09" PRIu64 ") "
- "(cpu %d) [%s (%d/%d)] %s (",
- start.tm_hour, start.tm_min, start.tm_sec,
- ts_nsec_start, delta / NSEC_PER_SEC,
- delta % NSEC_PER_SEC, cpu_id, procname, pid,
- tid, bt_ctf_event_name(call_data));
- }
- print_fields(call_data);
- printf(")\n");
+ fprintf(output, "%02d:%02d:%02d.%09" PRIu64 " (+%" PRIu64 ".%09" PRIu64 ") %s%s"
+ "(cpu %d) [%s (%d/%d)] %s (",
+ start.tm_hour, start.tm_min, start.tm_sec,
+ ts_nsec_start, delta / NSEC_PER_SEC,
+ delta % NSEC_PER_SEC, (hostname) ? hostname : "",
+ (hostname) ? " ": "", cpu_id, procname, pid, tid,
+ bt_ctf_event_name(call_data));
+ print_fields(call_data, procname, pid);
+ fprintf(output, ")%s%c", (from_syscall) ? from_syscall : "",
+ (!current_syscall) ? '\n' : ' ');
+
+ free(from_syscall);
+ if (opt_all && (opt_tid || opt_procname || opt_exec_name))
+ fprintf(output, "%c[0m", 27);
end:
return BT_CB_OK;
}
ppid = get_context_ppid(call_data);
if (ppid == -1ULL) {
- goto error;
+ goto end;
}
vpid = get_context_vpid(call_data);
if (pid == -1ULL) {
goto end;
update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
+ if (opt_procname && lookup_procname(comm) &&
+ !lookup_filter_tid_list(tid)) {
+ int *tmp_tid;
+
+ tmp_tid = malloc(sizeof(int));
+ *tmp_tid = tid;
+ printf("ADDING %s %d\n", comm, tid);
+ g_hash_table_insert(global_filter_list,
+ (gpointer) tmp_tid, tmp_tid);
+ }
+
if (pid != tid) {
/* find or create the parent */
parent = find_process_tid(<tngtop, pid, comm);
global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
global_filter_list = g_hash_table_new(g_str_hash, g_str_equal);
global_host_list = g_hash_table_new(g_str_hash, g_str_equal);
+ global_procname_list = g_hash_table_new(g_str_hash, g_str_equal);
+ tid_filter_list = g_hash_table_new(g_str_hash,
+ g_str_equal);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
fprintf(fp, " -t, --textdump Display live events in text-only\n");
fprintf(fp, " -p, --pid Comma-separated list of PIDs to display\n");
fprintf(fp, " -f, --child Follow threads associated with selected PIDs\n");
- fprintf(fp, " -n, --hostname Comma-separated list of hostnames to display (require hostname context in trace)\n");
+ fprintf(fp, " -n, --procname Comma-separated list of procnames to display (require procname context in trace)\n");
+ fprintf(fp, " -a, --all In textdump mode, display all events but write in bold the processes we are interested in (-f, -p and -n)\n");
fprintf(fp, " -k, --kprobes Comma-separated list of kprobes to insert (same format as lttng enable-event)\n");
fprintf(fp, " -r, --relay-hostname Network live streaming : hostname of the lttng-relayd (default port)\n");
fprintf(fp, " -b, --begin Network live streaming : read the trace for the beginning of the recording\n");
+ fprintf(fp, " -o, --output <filename> In textdump, output the log in <filename>\n");
+ fprintf(fp, " -g, --gui-test Test if the ncurses support is compiled in (return 0 if it is)\n");
+ fprintf(fp, " --create-local-session Setup a LTTng local session with all the right parameters\n");
+ fprintf(fp, " --create-live-session Setup a LTTng live session on localhost with all the right parameters\n");
}
/*
int opt, ret = 0;
char *tmp_str;
int *tid;
+ int i;
remote_live = 0;
usage(stdout);
ret = 1; /* exit cleanly */
goto end;
+ case OPT_GUI_TEST:
+#ifdef HAVE_LIBNCURSES
+ exit(EXIT_SUCCESS);
+#else
+ exit(EXIT_FAILURE);
+#endif
+ goto end;
+ case OPT_CREATE_LOCAL_SESSION:
+ ret = create_local_session();
+ exit(ret);
+ case OPT_CREATE_LIVE_SESSION:
+ ret = create_live_local_session(NULL, NULL, 1);
+ exit(ret);
case OPT_TEXTDUMP:
opt_textdump = 1;
break;
+ case OPT_ALL:
+ opt_all = 1;
+ break;
case OPT_CHILD:
opt_child = 1;
break;
case OPT_PID:
toggle_filter = 1;
- tid_filter_list = g_hash_table_new(g_str_hash,
- g_str_equal);
tmp_str = strtok(opt_tid, ",");
while (tmp_str) {
tid = malloc(sizeof(int));
/* start reading the live trace from the beginning */
opt_begin = 1;
break;
- case OPT_HOSTNAME:
+ case OPT_PROCNAME:
toggle_filter = 1;
- tmp_str = strtok(opt_hostname, ",");
+ tmp_str = strtok(opt_procname, ",");
while (tmp_str) {
- add_hostname_list(tmp_str, 1);
+ add_procname_list(tmp_str, 1);
tmp_str = strtok(NULL, ",");
}
break;
tmp_str = strtok(NULL, ",");
}
break;
+ case OPT_OUTPUT_FILE:
+ break;
+ case OPT_VERBOSE:
+ babeltrace_verbose = 1;
+ break;
default:
ret = -EINVAL;
goto end;
}
}
- opt_input_path = poptGetArg(pc);
+ opt_exec_name = NULL;
+ opt_exec_argv = NULL;
+ for (i = 0; i < argc; i++) {
+ if (argv[i][0] == '-' && argv[i][1] == '-') {
+ opt_exec_name = argv[i + 1];
+ opt_exec_argv = &argv[i + 1];
+ break;
+ }
+ }
+ if (!opt_exec_name) {
+ opt_input_path = poptGetArg(pc);
+ }
+ if (!opt_output) {
+ opt_output = strdup("/dev/stdout");
+ }
+ output = fopen(opt_output, "w");
+ if (!output) {
+ perror("Error opening output file");
+ ret = -1;
+ goto end;
+ }
end:
if (pc) {
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sched_process_fork"),
NULL, 0, handle_sched_process_fork, NULL, NULL, NULL);
+ /* to clean up the process table */
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("sched_process_free"),
+ NULL, 0, handle_sched_process_free, NULL, NULL, NULL);
+ /* to get all the process from the statedumps */
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string(
+ "lttng_statedump_process_state"),
+ NULL, 0, handle_statedump_process_state,
+ NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string(
+ "lttng_statedump_file_descriptor"),
+ NULL, 0, handle_statedump_file_descriptor,
+ NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("sys_open"),
+ NULL, 0, handle_sys_open, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_entry_open"),
+ NULL, 0, handle_sys_open, NULL, NULL, NULL);
+
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("sys_socket"),
+ NULL, 0, handle_sys_socket, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_entry_socket"),
+ NULL, 0, handle_sys_socket, NULL, NULL, NULL);
+
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("sys_close"),
+ NULL, 0, handle_sys_close, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_entry_close"),
+ NULL, 0, handle_sys_close, NULL, NULL, NULL);
+
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("exit_syscall"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_exit_open"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_exit_socket"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_exit_close"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
if (opt_textdump) {
bt_ctf_iter_add_callback(iter, 0, NULL, 0,
- print_timestamp,
+ textdump,
NULL, NULL, NULL);
} else {
/* at each event check if we need to refresh */
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sched_switch"),
NULL, 0, handle_sched_switch, NULL, NULL, NULL);
- /* to clean up the process table */
- bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string("sched_process_free"),
- NULL, 0, handle_sched_process_free, NULL, NULL, NULL);
- /* to get all the process from the statedumps */
- bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string(
- "lttng_statedump_process_state"),
- NULL, 0, handle_statedump_process_state,
- NULL, NULL, NULL);
-
/* for IO top */
- bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string("exit_syscall"),
- NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_write"),
NULL, 0, handle_sys_write, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_entry_write"),
+ NULL, 0, handle_sys_write, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_exit_write"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_read"),
NULL, 0, handle_sys_read, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string("sys_open"),
- NULL, 0, handle_sys_open, NULL, NULL, NULL);
- bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string("sys_close"),
- NULL, 0, handle_sys_close, NULL, NULL, NULL);
+ g_quark_from_static_string("syscall_entry_read"),
+ NULL, 0, handle_sys_read, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
- g_quark_from_static_string(
- "lttng_statedump_file_descriptor"),
- NULL, 0, handle_statedump_file_descriptor,
- NULL, NULL, NULL);
+ g_quark_from_static_string("syscall_exit_read"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
/* for kprobes */
if (lttngtop.kprobes_table) {
}
}
+ if (opt_exec_name) {
+ pid_t pid;
+
+ pid = fork();
+ if (pid == 0) {
+ execvpe(opt_exec_name, opt_exec_argv, opt_exec_env);
+ exit(EXIT_SUCCESS);
+ } else if (pid > 0) {
+ opt_exec_pid = pid;
+ g_hash_table_insert(tid_filter_list,
+ (gpointer) &pid,
+ &pid);
+ } else {
+ perror("fork");
+ exit(EXIT_FAILURE);
+ }
+ }
+
while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
if (quit || reload_trace)
goto end_iter;
ret = -1;
fprintf(stderr, "[error] missing procname context information\n");
}
+ if (ret == 0) {
+ valid_trace = 1;
+ }
end:
return ret;
}
-int main(int argc, char **argv)
+static void handle_sigchild(int signal)
+{
+ int status;
+
+ waitpid(opt_exec_pid, &status, 0);
+}
+
+int main(int argc, char **argv, char **envp)
{
int ret;
struct bt_context *bt_ctx = NULL;
+ char *live_session_name = NULL;
init_lttngtop();
ret = parse_options(argc, argv);
exit(EXIT_SUCCESS);
}
- if (!opt_input_path && !remote_live) {
- /* mmap live */
-#ifdef LTTNGTOP_MMAP_LIVE
- if (opt_textdump) {
- signal(SIGTERM, handle_textdump_sigterm);
- signal(SIGINT, handle_textdump_sigterm);
- }
- mmap_live_loop(bt_ctx);
- pthread_join(timer_thread, NULL);
- quit = 1;
- pthread_join(display_thread, NULL);
-
- lttng_stop_tracing("test");
- lttng_destroy_session("test");
-
- goto end;
-#else
- fprintf(stderr, "[ERROR] Mmap live support not compiled, specify a "
- "trace directory or -r <relayd hostname/IP>\n");
- usage(stdout);
- ret = -1;
- goto end;
-#endif /* LTTNGTOP_MMAP_LIVE */
- } else if (!opt_input_path && remote_live) {
- /* network live */
-#if 0
- ret = setup_network_live(opt_relay_hostname, opt_begin);
- if (ret < 0) {
- goto end;
- }
+ if (opt_exec_name) {
+ opt_exec_env = envp;
+ signal(SIGCHLD, handle_sigchild);
+ }
- ret = open_trace(&bt_ctx);
- if (ret < 0) {
+ if (!opt_input_path && !remote_live && !opt_exec_name) {
+ /* mmap live */
+ ret = create_live_local_session(&opt_relay_hostname,
+ &live_session_name, 0);
+ if (ret < 0)
goto end;
- }
-#endif
-
+ remote_live = 1;
+ }
+ if (!opt_input_path && remote_live) {
+ /* network live */
bt_ctx = bt_context_create();
ret = bt_context_add_traces_recursive(bt_ctx, opt_relay_hostname,
"lttng-live", NULL);
goto end;
}
} else {
- //init_lttngtop();
-
bt_ctx = bt_context_create();
ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
if (ret < 0) {
}
ret = check_requirements(bt_ctx);
- if (ret < 0) {
+ if (ret < 0 && !valid_trace) {
fprintf(stderr, "[error] some mandatory contexts "
"were missing, exiting.\n");
- goto end;
+ //goto end;
}
if (!opt_textdump) {
+#ifdef HAVE_LIBNCURSES
pthread_create(&display_thread, NULL, ncurses_display,
(void *) NULL);
pthread_create(&timer_thread, NULL, refresh_thread,
(void *) NULL);
+#else
+ printf("Ncurses support not compiled, please install "
+ "the missing dependencies and recompile\n");
+ goto end;
+#endif
}
iter_trace(bt_ctx);
if (bt_ctx)
bt_context_put(bt_ctx);
+ if (live_session_name) {
+ ret = destroy_live_local_session(live_session_name);
+ if (ret < 0) {
+ fprintf(stderr, "Error destroying %s\n", live_session_name);
+ }
+ }
+
return ret;
}
projects / lttngtop.git / blobdiff