/*
- * Copyright (C) 2011-2012 Julien Desfossez
+ * Copyright (C) 2013 Julien Desfossez
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License Version 2 as
#include <assert.h>
#include <sys/mman.h>
#include <lttng/lttng.h>
+#ifdef LTTNGTOP_MMAP_LIVE
#include <lttng/lttngtop-helper.h>
#include <babeltrace/lttngtopmmappacketseek.h>
+#include "mmap-live.h"
+#endif /* LTTNGTOP_MMAP_LIVE */
#include "lttngtoptypes.h"
#include "cputop.h"
#include "iostreamtop.h"
#include "cursesdisplay.h"
#include "common.h"
+#include "network-live.h"
+
+#define NET_URL_PREFIX "net://"
+#define NET4_URL_PREFIX "net4://"
+#define NET6_URL_PREFIX "net6://"
#define DEFAULT_FILE_ARRAY_SIZE 1
const char *opt_input_path;
-static int opt_textdump;
-static int opt_child;
+int opt_textdump;
+int opt_child;
+int opt_begin;
int quit = 0;
unsigned long refresh_display = 1 * NSEC_PER_SEC;
unsigned long last_display_update = 0;
+unsigned long last_event_ts = 0;
/* list of FDs available for being read with snapshots */
-struct mmap_stream_list mmap_list;
+struct bt_mmap_stream_list mmap_list;
GPtrArray *lttng_consumer_stream_array;
int sessiond_metadata, consumerd_metadata;
struct lttng_consumer_local_data *ctx = NULL;
OPT_PID,
OPT_CHILD,
OPT_HOSTNAME,
+ OPT_RELAY_HOSTNAME,
OPT_KPROBES,
+ OPT_BEGIN,
};
static struct poptOption long_options[] = {
{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
{ "textdump", 't', POPT_ARG_NONE, NULL, OPT_TEXTDUMP, NULL, NULL },
{ "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 },
+ { "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 },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
+#ifdef LTTNGTOP_MMAP_LIVE
static void handle_textdump_sigterm(int signal)
{
quit = 1;
lttng_destroy_session("test");
}
+#endif
void *refresh_thread(void *p)
{
- struct mmap_stream *mmap_info;
-
while (1) {
if (quit) {
sem_post(&pause_sem);
pthread_exit(0);
}
if (!opt_input_path) {
- bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
- helper_kernctl_buffer_flush(mmap_info->fd);
+#ifdef LTTNGTOP_MMAP_LIVE
+ mmap_live_flush(mmap_list);
+#endif
}
sem_wait(&pause_sem);
sem_post(&pause_sem);
void print_fields(struct bt_ctf_event *event)
{
unsigned int cnt, i;
- const struct definition *const * list;
- const struct definition *scope;
+ const struct bt_definition *const * list;
+ const struct bt_declaration *l;
+ const struct bt_definition *scope;
enum ctf_type_id type;
const char *str;
if (i != 0)
printf(", ");
printf("%s = ", bt_ctf_field_name(list[i]));
- type = bt_ctf_field_type(list[i]);
+ l = bt_ctf_get_decl_from_def(list[i]);
+ type = bt_ctf_field_type(l);
if (type == CTF_TYPE_INTEGER) {
- if (bt_ctf_get_int_signedness(list[i]) == 0)
+ 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]));
uint64_t ts_nsec_start;
int pid, cpu_id;
int64_t syscall_ret;
- const struct definition *scope;
+ const struct bt_definition *scope;
const char *hostname, *procname;
timestamp = bt_ctf_get_timestamp(call_data);
+ /* can happen in network live when tracing is idle */
+ if (timestamp < last_event_ts)
+ goto end_stop;
+
+ last_event_ts = timestamp;
+
start = format_timestamp(timestamp);
ts_nsec_start = timestamp % NSEC_PER_SEC;
if (!lookup_filter_tid_list(pid))
goto end;
- /*
- if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname)))
- goto end;
- if (!opt_hostname && (opt_tid && !lookup_tid_list(pid)))
- goto end;
- if ((opt_tid && !lookup_tid_list(pid)) &&
- (opt_hostname && !lookup_hostname_list(hostname)))
- goto end;
- */
-
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
* print the newline in this case */
if (last_textdump_print_newline == 0)
printf("\n");
- printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (",
- start.tm_hour, start.tm_min, start.tm_sec,
- ts_nsec_start, hostname, cpu_id, procname, pid,
- bt_ctf_event_name(call_data));
+ if (hostname) {
+ printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (",
+ start.tm_hour, start.tm_min, start.tm_sec,
+ ts_nsec_start, hostname, cpu_id, procname, pid,
+ bt_ctf_event_name(call_data));
+ } else {
+ printf("%02d:%02d:%02d.%09" PRIu64 " (cpu %d) [%s (%d)] %s (",
+ start.tm_hour, start.tm_min, start.tm_sec,
+ ts_nsec_start, cpu_id, procname, pid,
+ bt_ctf_event_name(call_data));
+ }
print_fields(call_data);
printf(") ");
if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
return BT_CB_OK;
error:
return BT_CB_ERROR_STOP;
+end_stop:
+ return BT_CB_OK_STOP;
}
enum bt_cb_ret handle_kprobes(struct bt_ctf_event *call_data, void *private_data)
if (timestamp == -1ULL)
goto error;
+ /* can happen in network live when tracing is idle */
+ if (timestamp < last_event_ts)
+ goto end_stop;
+
+ last_event_ts = timestamp;
+
if (last_display_update == 0)
last_display_update = timestamp;
error:
fprintf(stderr, "check_timestamp callback error\n");
return BT_CB_ERROR_STOP;
+
+end_stop:
+ return BT_CB_OK_STOP;
}
/*
copies = g_ptr_array_new();
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);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
void usage(FILE *fp)
{
fprintf(fp, "LTTngTop %s\n\n", VERSION);
- fprintf(fp, "Usage : lttngtop [OPTIONS] [TRACE]\n");
- fprintf(fp, " TRACE Path to the trace to analyse (no trace path for live tracing)\n");
+ fprintf(fp, "Usage : lttngtop [OPTIONS] TRACE\n");
+ fprintf(fp, " TRACE Path to the trace to analyse (-r for network live tracing, nothing for mmap live streaming)\n");
fprintf(fp, " -h, --help This help message\n");
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, " -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");
}
/*
/* Check for symbol+offset */
ret = sscanf(opt, "%[^'+']+%s", name, s_hex);
if (ret == 2) {
- asprintf(&kprobe->probe_name, "probe_%s", name);
- asprintf(&kprobe->symbol_name, "%s", name);
+ ret = asprintf(&kprobe->probe_name, "probe_%s", name);
+ ret = asprintf(&kprobe->symbol_name, "%s", name);
if (strlen(s_hex) == 0) {
fprintf(stderr, "Invalid probe offset %s", s_hex);
if (isalpha(name[0])) {
ret = sscanf(opt, "%s", name);
if (ret == 1) {
- asprintf(&kprobe->probe_name, "probe_%s", name);
- asprintf(&kprobe->symbol_name, "%s", name);
+ ret = asprintf(&kprobe->probe_name, "probe_%s", name);
+ ret = asprintf(&kprobe->symbol_name, "%s", name);
kprobe->probe_offset = 0;
kprobe->probe_addr = 0;
goto end;
ret = -1;
goto end;
}
- asprintf(&kprobe->probe_name, "probe_%s", s_hex);
+ ret = asprintf(&kprobe->probe_name, "probe_%s", s_hex);
kprobe->probe_offset = 0;
kprobe->probe_addr = strtoul(s_hex, NULL, 0);
goto end;
char *tmp_str;
int *tid;
+ remote_live = 0;
+
pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
break;
case OPT_PID:
toggle_filter = 1;
- tid_list = g_hash_table_new(g_str_hash,
+ 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));
*tid = atoi(tmp_str);
- g_hash_table_insert(tid_list,
+ g_hash_table_insert(tid_filter_list,
(gpointer) tid, tid);
tmp_str = strtok(NULL, ",");
}
break;
+ case OPT_BEGIN:
+ /* start reading the live trace from the beginning */
+ opt_begin = 1;
+ break;
case OPT_HOSTNAME:
toggle_filter = 1;
- hostname_list = g_hash_table_new(g_str_hash,
- g_str_equal);
tmp_str = strtok(opt_hostname, ",");
while (tmp_str) {
- char *new_str = strdup(tmp_str);
- g_hash_table_insert(hostname_list,
- (gpointer) new_str,
- (gpointer) new_str);
+ add_hostname_list(tmp_str, 1);
tmp_str = strtok(NULL, ",");
}
break;
+ case OPT_RELAY_HOSTNAME:
+ remote_live = 1;
+ break;
case OPT_KPROBES:
lttngtop.kprobes_table = g_ptr_array_new();
tmp_str = strtok(opt_kprobes, ",");
char * const paths[2] = { lpath, NULL };
int ret = -1;
+ if ((strncmp(path, NET4_URL_PREFIX, sizeof(NET4_URL_PREFIX) - 1)) == 0 ||
+ (strncmp(path, NET6_URL_PREFIX, sizeof(NET6_URL_PREFIX) - 1)) == 0 ||
+ (strncmp(path, NET_URL_PREFIX, sizeof(NET_URL_PREFIX) - 1)) == 0) {
+ ret = bt_context_add_trace(ctx,
+ path, format_str, packet_seek, NULL, NULL);
+ if (ret < 0) {
+ fprintf(stderr, "[warning] [Context] cannot open trace \"%s\" "
+ "for reading.\n", path);
+ /* Allow to skip erroneous traces. */
+ ret = 1; /* partial error */
+ }
+ return ret;
+ }
/*
* Need to copy path, because fts_open can change it.
* It is the pointer array, not the strings, that are constant.
metafd = openat(dirfd, "metadata", O_RDONLY);
if (metafd < 0) {
close(dirfd);
- ret = -1;
continue;
} else {
int trace_id;
int ppid_check = 0;
int ret = 0;
- bt_ctf_get_event_decl_list(0, ctx, &evt_list, &evt_cnt);
+ ret = bt_ctf_get_event_decl_list(0, ctx, &evt_list, &evt_cnt);
+ if (ret < 0) {
+ goto end;
+ }
+
for (i = 0; i < evt_cnt; i++) {
bt_ctf_get_decl_fields(evt_list[i], BT_STREAM_EVENT_CONTEXT,
&field_list, &field_cnt);
fprintf(stderr, "[error] missing procname context information\n");
}
- return ret;
-}
-
-ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
- struct lttng_consumer_local_data *ctx)
-{
- unsigned long len;
- int err;
- long ret = 0;
- int infd = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
-
- if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_SPLICE) {
- /* Get the next subbuffer */
- err = helper_kernctl_get_next_subbuf(infd);
- if (err != 0) {
- ret = errno;
- perror("Reserving sub buffer failed (everything is normal, "
- "it is due to concurrency)");
- goto end;
- }
- /* read the whole subbuffer */
- err = helper_kernctl_get_padded_subbuf_size(infd, &len);
- if (err != 0) {
- ret = errno;
- perror("Getting sub-buffer len failed.");
- goto end;
- }
-
- /* splice the subbuffer to the tracefile */
- ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
- if (ret < 0) {
- /*
- * display the error but continue processing to try
- * to release the subbuffer
- */
- fprintf(stderr,"Error splicing to tracefile\n");
- }
- err = helper_kernctl_put_next_subbuf(infd);
- if (err != 0) {
- ret = errno;
- perror("Reserving sub buffer failed (everything is normal, "
- "it is due to concurrency)");
- goto end;
- }
- sem_post(&metadata_available);
- }
-
-end:
- return 0;
-}
-
-int on_update_fd(int key, uint32_t state)
-{
- /* let the lib handle the metadata FD */
- if (key == sessiond_metadata)
- return 0;
- return 1;
-}
-
-int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
-{
- int ret;
- struct mmap_stream *new_mmap_stream;
-
- /* Opening the tracefile in write mode */
- if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) {
- ret = open(helper_get_lttng_consumer_stream_path_name(kconsumerd_fd),
- O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO);
- if (ret < 0) {
- perror("open");
- goto end;
- }
- helper_set_lttng_consumer_stream_out_fd(kconsumerd_fd, ret);
- }
-
- if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_MMAP) {
- new_mmap_stream = malloc(sizeof(struct mmap_stream));
- new_mmap_stream->fd = helper_get_lttng_consumer_stream_wait_fd(
- kconsumerd_fd);
- bt_list_add(&new_mmap_stream->list, &mmap_list.head);
-
- g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd);
- /* keep mmap FDs internally */
- ret = 1;
- } else {
- consumerd_metadata = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
- sessiond_metadata = helper_get_lttng_consumer_stream_key(kconsumerd_fd);
- ret = 0;
- }
-
- reload_trace = 1;
-
-end:
- return ret;
-}
-
-void live_consume(struct bt_context **bt_ctx)
-{
- int ret;
- FILE *metadata_fp;
-
- sem_wait(&metadata_available);
- if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
- fprintf(stderr,"no metadata\n");
- goto end;
- }
- metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
-
- *bt_ctx = bt_context_create();
- ret = bt_context_add_trace(*bt_ctx, NULL, "ctf",
- lttngtop_ctf_packet_seek, &mmap_list, metadata_fp);
- if (ret < 0) {
- printf("Error adding trace\n");
- goto end;
- }
-
-end:
- return;
-}
-
-int setup_consumer(char *command_sock_path, pthread_t *threads,
- struct lttng_consumer_local_data *ctx)
-{
- int ret = 0;
-
- ctx = helper_lttng_consumer_create(HELPER_LTTNG_CONSUMER_KERNEL,
- read_subbuffer, NULL, on_recv_fd, on_update_fd);
- if (!ctx)
- goto end;
-
- unlink(command_sock_path);
- helper_lttng_consumer_set_command_sock_path(ctx, command_sock_path);
- helper_lttng_consumer_init();
-
- /* Create the thread to manage the receive of fd */
- ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_receive_fds,
- (void *) ctx);
- if (ret != 0) {
- perror("pthread_create receive fd");
- goto end;
- }
- /* Create thread to manage the polling/writing of traces */
- ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_poll_fds,
- (void *) ctx);
- if (ret != 0) {
- perror("pthread_create poll fd");
- goto end;
- }
-
end:
return ret;
}
-int enable_kprobes(struct lttng_handle *handle, char *channel_name)
-{
- struct lttng_event ev;
- struct kprobes *kprobe;
- int ret = 0;
- int i;
-
- for (i = 0; i < lttngtop.kprobes_table->len; i++) {
- kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
-
- memset(&ev, '\0', sizeof(struct lttng_event));
- ev.type = LTTNG_EVENT_PROBE;
- if (kprobe->symbol_name)
- sprintf(ev.attr.probe.symbol_name, "%s", kprobe->symbol_name);
- sprintf(ev.name, "%s", kprobe->probe_name);
- ev.attr.probe.addr = kprobe->probe_addr;
- ev.attr.probe.offset = kprobe->probe_offset;
- if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
- fprintf(stderr,"error enabling kprobes : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto end;
- }
- }
-
-end:
- return ret;
-}
-
-int setup_live_tracing()
-{
- struct lttng_domain dom;
- struct lttng_channel chan;
- char *channel_name = "mmapchan";
- struct lttng_event ev;
- int ret = 0;
- char *command_sock_path = "/tmp/consumerd_sock";
- static pthread_t threads[2]; /* recv_fd, poll */
- struct lttng_event_context kctxpid, kctxcomm, kctxppid, kctxtid;
-
- struct lttng_handle *handle;
-
- BT_INIT_LIST_HEAD(&mmap_list.head);
-
- lttng_consumer_stream_array = g_ptr_array_new();
-
- if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) {
- fprintf(stderr,"error setting up consumer\n");
- goto error;
- }
-
- available_snapshots = g_ptr_array_new();
-
- /* setup the session */
- dom.type = LTTNG_DOMAIN_KERNEL;
-
- ret = unlink("/tmp/livesession");
-
- lttng_destroy_session("test");
- if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) {
- fprintf(stderr,"error creating the session : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error;
- }
-
- if ((handle = lttng_create_handle("test", &dom)) == NULL) {
- fprintf(stderr,"error creating handle\n");
- goto error_session;
- }
-
- /*
- * FIXME : need to let the
- * helper_lttng_consumer_thread_receive_fds create the
- * socket.
- * Cleaner solution ?
- */
- while (access(command_sock_path, F_OK)) {
- sleep(0.1);
- }
-
- if ((ret = lttng_register_consumer(handle, command_sock_path)) < 0) {
- fprintf(stderr,"error registering consumer : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error_session;
- }
-
- strcpy(chan.name, channel_name);
- chan.attr.overwrite = 0;
- if (opt_tid && opt_textdump) {
- chan.attr.subbuf_size = 32768;
- chan.attr.num_subbuf = 8;
- } else {
- //chan.attr.subbuf_size = 1048576; /* 1MB */
- chan.attr.subbuf_size = 2097152; /* 1MB */
- chan.attr.num_subbuf = 4;
- }
- chan.attr.switch_timer_interval = 0;
- chan.attr.read_timer_interval = 200;
- chan.attr.output = LTTNG_EVENT_MMAP;
-
- if ((ret = lttng_enable_channel(handle, &chan)) < 0) {
- fprintf(stderr,"error creating channel : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error_session;
- }
-
- memset(&ev, '\0', sizeof(struct lttng_event));
- //sprintf(ev.name, "sched_switch");
- ev.type = LTTNG_EVENT_TRACEPOINT;
- if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
- fprintf(stderr,"error enabling event : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error_session;
- }
-
- memset(&ev, '\0', sizeof(struct lttng_event));
- ev.type = LTTNG_EVENT_SYSCALL;
- if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
- fprintf(stderr,"error enabling syscalls : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error_session;
- }
-
- if (lttngtop.kprobes_table) {
- ret = enable_kprobes(handle, channel_name);
- if (ret < 0) {
- goto error_session;
- }
- }
-
- kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
- lttng_add_context(handle, &kctxpid, NULL, NULL);
- kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
- lttng_add_context(handle, &kctxtid, NULL, NULL);
- kctxppid.ctx = LTTNG_EVENT_CONTEXT_PPID;
- lttng_add_context(handle, &kctxppid, NULL, NULL);
- kctxcomm.ctx = LTTNG_EVENT_CONTEXT_PROCNAME;
- lttng_add_context(handle, &kctxcomm, NULL, NULL);
- kctxpid.ctx = LTTNG_EVENT_CONTEXT_VPID;
- lttng_add_context(handle, &kctxpid, NULL, NULL);
- kctxtid.ctx = LTTNG_EVENT_CONTEXT_VTID;
- lttng_add_context(handle, &kctxtid, NULL, NULL);
- kctxtid.ctx = LTTNG_EVENT_CONTEXT_HOSTNAME;
- lttng_add_context(handle, &kctxtid, NULL, NULL);
-
- if ((ret = lttng_start_tracing("test")) < 0) {
- fprintf(stderr,"error starting tracing : %s\n",
- helper_lttcomm_get_readable_code(ret));
- goto error_session;
- }
-
- helper_kernctl_buffer_flush(consumerd_metadata);
-
- /* block until metadata is ready */
- sem_init(&metadata_available, 0, 0);
-
- return 0;
-
-error_session:
- lttng_destroy_session("test");
-error:
- return -1;
-}
-
int main(int argc, char **argv)
{
int ret;
struct bt_context *bt_ctx = NULL;
- struct mmap_stream *mmap_info;
- unsigned long mmap_len;
init_lttngtop();
ret = parse_options(argc, argv);
exit(EXIT_SUCCESS);
}
- if (!opt_input_path) {
+ 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);
}
- ret = setup_live_tracing();
- if (ret < 0) {
- goto end;
- }
- if (!opt_textdump) {
- pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
- pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
- }
- while (!quit) {
- reload_trace = 0;
- live_consume(&bt_ctx);
- iter_trace(bt_ctx);
- ret = bt_context_remove_trace(bt_ctx, 0);
- if (ret != 0)
- fprintf(stderr, "error removing trace\n");
- if (bt_ctx) {
- bt_context_put(bt_ctx);
- }
-
- /*
- * since we receive all FDs every time there is an
- * update and the FD number is different every time,
- * we don't know which one are valid.
- * so we check if all FDs are usable with a simple
- * ioctl call.
- */
- bt_list_for_each_entry(mmap_info, &mmap_list.head, list) {
- ret = helper_kernctl_get_mmap_len(mmap_info->fd, &mmap_len);
- if (ret != 0) {
- bt_list_del(&mmap_info->list);
- }
- }
- sem_post(&metadata_available);
- }
-
+ mmap_live_loop(bt_ctx);
pthread_join(timer_thread, NULL);
quit = 1;
pthread_join(display_thread, NULL);
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;
+ }
+
+ ret = open_trace(&bt_ctx);
+ if (ret < 0) {
+ goto end;
+ }
+#endif
+
+ bt_ctx = bt_context_create();
+ ret = bt_context_add_traces_recursive(bt_ctx, opt_relay_hostname,
+ "lttng-live", NULL);
+ if (ret < 0) {
+ fprintf(stderr, "[error] Opening the trace\n");
+ goto end;
+ }
} else {
//init_lttngtop();
ret = check_requirements(bt_ctx);
if (ret < 0) {
- fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
+ fprintf(stderr, "[error] some mandatory contexts "
+ "were missing, exiting.\n");
goto end;
}
- pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
- pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
- iter_trace(bt_ctx);
+ if (!opt_textdump) {
+ pthread_create(&display_thread, NULL, ncurses_display,
+ (void *) NULL);
+ pthread_create(&timer_thread, NULL, refresh_thread,
+ (void *) NULL);
+ }
- pthread_join(display_thread, NULL);
- quit = 1;
- pthread_join(timer_thread, NULL);
+ iter_trace(bt_ctx);
}
+
+ pthread_join(display_thread, NULL);
+ quit = 1;
+ pthread_join(timer_thread, NULL);
+
+ ret = 0;
+
end:
if (bt_ctx)
bt_context_put(bt_ctx);
- return 0;
+ return ret;
}
projects / lttngtop.git / blobdiff