#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://"
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, const char *procname,
int pid)
lookup = pid;
else
lookup = tid;
- if (opt_tid || opt_hostname || opt_exec_name) {
+ 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) {
(!current_syscall) ? '\n' : ' ');
free(from_syscall);
- if (opt_all && (opt_tid || opt_hostname || opt_exec_name))
+ if (opt_all && (opt_tid || opt_procname || opt_exec_name))
fprintf(output, "%c[0m", 27);
end:
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);
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");
}
/*
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;
/* 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;
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_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);
{
int ret;
struct bt_context *bt_ctx = NULL;
+ char *live_session_name = NULL;
init_lttngtop();
ret = parse_options(argc, argv);
if (!opt_input_path && !remote_live && !opt_exec_name) {
/* 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) {
+ ret = create_live_local_session(&opt_relay_hostname,
+ &live_session_name, 0);
+ if (ret < 0)
+ goto end;
+ 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,
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) {
}
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