#include <assert.h>
#include <sys/mman.h>
#include <sys/wait.h>
-#include <lttng/lttng.h>
+
+#define LTTNG_SYMBOL_NAME_LEN 256
+
#ifdef LTTNGTOP_MMAP_LIVE
#include <lttng/lttngtop-helper.h>
#include <babeltrace/lttngtopmmappacketseek.h>
const char *hostname, *procname;
struct cputime *cpu;
char *from_syscall = NULL;
+ int syscall_exit = 0;
timestamp = bt_ctf_get_timestamp(call_data);
}
}
- if (last_syscall && (strncmp(bt_ctf_event_name(call_data),
- "exit_syscall", 12)) != 0) {
+ 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) {
+ 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->cpu_id = cpu_id;
last_syscall = cpu->current_syscall;
current_syscall = 1;
- } else if ((strncmp(bt_ctf_event_name(call_data), "exit_syscall", 12)) == 0) {
+ } else if (syscall_exit) {
struct tm start_ts;
/* Return code of a syscall if it was the last displayed event. */
ret = create_local_session();
exit(ret);
case OPT_CREATE_LIVE_SESSION:
- ret = create_live_local_session();
+ ret = create_live_local_session(NULL, NULL, 1);
exit(ret);
case OPT_TEXTDUMP:
opt_textdump = 1;
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,
textdump,
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("syscall_entry_read"),
+ NULL, 0, handle_sys_read, NULL, NULL, NULL);
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("syscall_exit_read"),
+ NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
/* for kprobes */
if (lttngtop.kprobes_table) {
{
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 (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;
}