#include "common.h"
#include "network-live.h"
-#include "lttng-index.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;
-static int opt_begin;
+int opt_textdump;
+int opt_child;
+int opt_begin;
int quit = 0;
sem_t metadata_available;
int reload_trace = 0;
-int last_textdump_print_newline = 1;
+uint64_t prev_ts = 0;
enum {
OPT_NONE = 0,
enum bt_cb_ret print_timestamp(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;
- int64_t syscall_ret;
+ int pid, cpu_id, tid;
const struct bt_definition *scope;
const char *hostname, *procname;
+ struct cputime *cpu;
+ char *from_syscall = NULL;
timestamp = bt_ctf_get_timestamp(call_data);
if (pid == -1ULL && opt_tid) {
goto error;
}
+
+ tid = get_context_tid(call_data);
hostname = get_context_hostname(call_data);
- if (opt_tid || opt_hostname)
- if (!lookup_filter_tid_list(pid))
- goto end;
+ if (opt_tid || opt_hostname) {
+ if (!lookup_filter_tid_list(pid)) {
+ /* 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;
+
+ scope = bt_ctf_get_top_level_scope(call_data,
+ BT_EVENT_FIELDS);
+ next_tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+ scope, "_next_tid"));
+ if (bt_ctf_field_get_error()) {
+ fprintf(stderr, "Missing next_tid field\n");
+ goto error;
+ }
+ if (!lookup_filter_tid_list(next_tid)) {
+ goto end;
+ }
+ } else {
+ goto end;
+ }
+ }
+ }
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
-
- if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) &&
- !last_textdump_print_newline) {
- 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"));
- printf("= %ld\n", syscall_ret);
- last_textdump_print_newline = 1;
- } else {
- /* we might have lost the exit_syscall event, so need to
- * 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));
- print_fields(call_data);
- printf(") ");
- if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
- printf("\n");
- last_textdump_print_newline = 1;
- } else {
- last_textdump_print_newline = 0;
+ if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 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;
+ } else if ((strncmp(bt_ctf_event_name(call_data), "exit_syscall", 12)) == 0) {
+ struct tm start_ts;
+
+ 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);
+ asprintf(&from_syscall, " [from %02d:%02d:%02d.%09" PRIu64
+ " (+%" PRIu64 ".%09" PRIu64 ") (cpu %d) %s]\n",
+ 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);
+ free(cpu->current_syscall->name);
+ g_free(cpu->current_syscall);
+ cpu->current_syscall = NULL;
}
}
+ if (prev_ts == 0)
+ prev_ts = timestamp;
+ delta = timestamp - prev_ts;
+ prev_ts = timestamp;
+
+ printf("%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);
+ printf(")%s", (from_syscall) ? from_syscall : "\n");
+
+ free(from_syscall);
+
end:
return BT_CB_OK;
error:
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");
opt_textdump = 1;
break;
case OPT_CHILD:
- opt_textdump = 1;
opt_child = 1;
break;
case OPT_PID:
bt_ctf_iter_add_callback(iter, 0, NULL, 0,
fix_process_table,
NULL, NULL, NULL);
+ /* to handle the follow child option */
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string("sched_process_fork"),
+ NULL, 0, handle_sched_process_fork, NULL, NULL, NULL);
if (opt_textdump) {
bt_ctf_iter_add_callback(iter, 0, NULL, 0,
print_timestamp,
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.
goto end;
#else
- fprintf(stderr, "Mmap live support not compiled\n");
+ 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 (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();
fprintf(stderr, "[error] Opening the trace\n");
goto end;
}
- }
- ret = check_requirements(bt_ctx);
- if (ret < 0) {
- fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
- goto end;
- }
- if (!opt_textdump) {
- pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
- pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
+ ret = check_requirements(bt_ctx);
+ if (ret < 0) {
+ fprintf(stderr, "[error] some mandatory contexts "
+ "were missing, exiting.\n");
+ goto end;
+ }
+
+ if (!opt_textdump) {
+ pthread_create(&display_thread, NULL, ncurses_display,
+ (void *) NULL);
+ pthread_create(&timer_thread, NULL, refresh_thread,
+ (void *) NULL);
+ }
+
+ iter_trace(bt_ctx);
}
- 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