OPT_TEXTDUMP,
OPT_PID,
OPT_CHILD,
+ OPT_HOSTNAME,
};
static struct poptOption long_options[] = {
{ "textdump", 't', POPT_ARG_NONE, NULL, OPT_TEXTDUMP, NULL, NULL },
{ "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL },
{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
+ { "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
}
}
+void print_fields(struct bt_ctf_event *event)
+{
+ unsigned int cnt, i;
+ const struct definition *const * list;
+ const struct definition *scope;
+ enum ctf_type_id type;
+ const char *str;
+
+ 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]));
+ type = bt_ctf_field_type(list[i]);
+ if (type == CTF_TYPE_INTEGER) {
+ if (bt_ctf_get_int_signedness(list[i]) == 0)
+ printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
+ else
+ printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
+ } else if (type == CTF_TYPE_STRING) {
+ printf("%s", bt_ctf_get_string(list[i]));
+ } else if (type == CTF_TYPE_ARRAY) {
+ str = bt_ctf_get_char_array(list[i]);
+ if (str)
+ printf("%s", str);
+ }
+ }
+}
+
/*
* hook on each event to check the timestamp and refresh the display if
* necessary
unsigned long timestamp;
struct tm start;
uint64_t ts_nsec_start;
- int pid;
+ int pid, cpu_id;
int64_t syscall_ret;
const struct definition *scope;
+ const char *hostname, *procname;
timestamp = bt_ctf_get_timestamp(call_data);
goto error;
}
- if (opt_tid && !lookup_tid_list(pid))
+ hostname = get_context_hostname(call_data);
+ 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);
if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
scope = bt_ctf_get_top_level_scope(call_data,
* print the newline in this case */
if (last_textdump_print_newline == 0)
printf("\n");
- printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s ", start.tm_hour,
- start.tm_min, start.tm_sec, ts_nsec_start,
- pid, bt_ctf_event_name(call_data));
+ 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) {
+ } else {
+ printf("\n");
+ }
+ */
last_textdump_print_newline = 0;
}
void *private_data)
{
int pid, tid, ppid, vpid, vtid, vppid;
- char *comm;
+ char *comm, *hostname;
struct processtop *parent, *child;
unsigned long timestamp;
if (!comm) {
goto error;
}
+ /* optional */
+ hostname = get_context_hostname(call_data);
/* find or create the current process */
child = find_process_tid(<tngtop, tid, comm);
child = add_proc(<tngtop, tid, comm, timestamp);
if (!child)
goto end;
- update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
+ update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
if (pid != tid) {
/* find or create the parent */
void usage(FILE *fp)
{
fprintf(fp, "LTTngTop %s\n\n", VERSION);
- fprintf(fp, "Usage : lttngtop /path/to/trace\n");
+ 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, " -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");
}
/*
opt_child = 1;
break;
case OPT_PID:
- tid_list = g_hash_table_new(g_str_hash, g_str_equal);
+ tid_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, (gpointer) tid, tid);
+ g_hash_table_insert(tid_list,
+ (gpointer) tid, tid);
+ tmp_str = strtok(NULL, ",");
+ }
+ break;
+ case OPT_HOSTNAME:
+ 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);
tmp_str = strtok(NULL, ",");
}
break;
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",