#define DEFAULT_FILE_ARRAY_SIZE 1
const char *opt_input_path;
-int opt_textdump;
+static int opt_textdump;
+static int opt_pid;
+static int opt_child;
int quit = 0;
OPT_NONE = 0,
OPT_HELP,
OPT_TEXTDUMP,
+ OPT_PID,
+ OPT_CHILD,
};
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{ "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 },
+ { "pid", 'p', POPT_ARG_INT, &opt_pid, OPT_PID, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
if (quit) {
sem_post(&pause_sem);
sem_post(&timer);
+ sem_post(&end_trace_sem);
sem_post(&goodtodisplay);
+ sem_post(&goodtoupdate);
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);
+ }
sem_wait(&pause_sem);
sem_post(&pause_sem);
sem_post(&timer);
unsigned long timestamp;
struct tm start;
uint64_t ts_nsec_start;
+ int pid;
timestamp = bt_ctf_get_timestamp(call_data);
start = format_timestamp(timestamp);
ts_nsec_start = timestamp % NSEC_PER_SEC;
- printf("%02d:%02d:%02d.%09" PRIu64 " %s\n", start.tm_hour,
+ pid = get_context_pid(call_data);
+ if (pid == -1ULL && opt_pid) {
+ goto error;
+ }
+
+ if (opt_pid && opt_pid != pid)
+ goto end;
+
+ printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s\n", start.tm_hour,
start.tm_min, start.tm_sec, ts_nsec_start,
- bt_ctf_event_name(call_data));
+ pid, bt_ctf_event_name(call_data));
+end:
return BT_CB_OK;
+error:
+ return BT_CB_ERROR_STOP;
}
/*
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
void *private_data)
{
- int pid, tid, ppid;
+ int pid, tid, ppid, vpid, vtid, vppid;
char *comm;
struct processtop *parent, *child;
unsigned long timestamp;
if (ppid == -1ULL) {
goto error;
}
+ vpid = get_context_vpid(call_data);
+ if (pid == -1ULL) {
+ vpid = -1;
+ }
+ vtid = get_context_vtid(call_data);
+ if (tid == -1ULL) {
+ vtid = -1;
+ }
+ vppid = get_context_vppid(call_data);
+ if (ppid == -1ULL) {
+ vppid = -1;
+ }
comm = get_context_comm(call_data);
if (!comm) {
goto error;
child = find_process_tid(<tngtop, tid, comm);
if (!child)
child = add_proc(<tngtop, tid, comm, timestamp);
- update_proc(child, pid, tid, ppid, comm);
+ update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
if (pid != tid) {
/* find or create the parent */
goto end;
case OPT_TEXTDUMP:
opt_textdump = 1;
- goto end;
+ break;
+ case OPT_CHILD:
+ opt_textdump = 1;
+ opt_child = 1;
+ break;
+ case OPT_PID:
+ opt_textdump = 1;
+ break;
default:
ret = -EINVAL;
goto end;
iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
if (opt_textdump) {
+ if (opt_pid) {
+ printf("PID : %d, Child : %d\n", opt_pid, opt_child);
+ }
bt_ctf_iter_add_callback(iter, 0, NULL, 0,
print_timestamp,
NULL, NULL, NULL);
NULL, NULL, NULL);
}
- while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
+ while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) {
if (quit || reload_trace)
goto end_iter;
ret = bt_iter_next(bt_ctf_get_iter(iter));
lttng_add_context(handle, &kctxcomm, NULL, NULL);
kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
lttng_add_context(handle, &kctxtid, 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);
if ((ret = lttng_start_tracing("test")) < 0) {
fprintf(stderr,"error starting tracing : %s\n",