X-Git-Url: http://git.liburcu.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=28acebf6c1134851571acd243919d672bbe188e1;hp=9b650f4bddc5b43926bf318ba6961d1b591caf7c;hb=32b70e07fe8aa2f06988d2a9accddf5992b08746;hpb=050f9cf91c01ff380df000bd0daa559285b7e787

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 9b650f4..28acebf 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -51,7 +51,9 @@
 #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;
 
@@ -76,12 +78,16 @@ enum {
 	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 },
 };
 
@@ -93,11 +99,15 @@ void *refresh_thread(void *p)
 		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);
@@ -146,17 +156,29 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	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;
 }
 
 /*
@@ -293,7 +315,7 @@ void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *eve
 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;
@@ -314,6 +336,18 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	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;
@@ -323,7 +357,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
 		child = add_proc(&lttngtop, 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 */
@@ -396,7 +430,14 @@ static int parse_options(int argc, char **argv)
 				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;
@@ -423,6 +464,9 @@ void iter_trace(struct bt_context *bt_ctx)
 	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);
@@ -473,7 +517,7 @@ void iter_trace(struct bt_context *bt_ctx)
 				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));
@@ -834,7 +878,7 @@ end:
 	return ret;
 }
 
-void *setup_live_tracing()
+int setup_live_tracing()
 {
 	struct lttng_domain dom;
 	struct lttng_channel chan;
@@ -853,7 +897,7 @@ void *setup_live_tracing()
 
 	if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) {
 		fprintf(stderr,"error setting up consumer\n");
-		goto end;
+		goto error;
 	}
 
 	available_snapshots = g_ptr_array_new();
@@ -867,12 +911,12 @@ void *setup_live_tracing()
 	if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) {
 		fprintf(stderr,"error creating the session : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error;
 	}
 
 	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
 		fprintf(stderr,"error creating handle\n");
-		goto end;
+		goto error_session;
 	}
 
 	/*
@@ -888,7 +932,7 @@ void *setup_live_tracing()
 	if ((ret = lttng_register_consumer(handle, command_sock_path)) < 0) {
 		fprintf(stderr,"error registering consumer : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	strcpy(chan.name, channel_name);
@@ -903,7 +947,7 @@ void *setup_live_tracing()
 	if ((ret = lttng_enable_channel(handle, &chan)) < 0) {
 		fprintf(stderr,"error creating channel : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	memset(&ev, '\0', sizeof(struct lttng_event));
@@ -912,14 +956,14 @@ void *setup_live_tracing()
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
 		fprintf(stderr,"error enabling event : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	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 end;
+		goto error_session;
 	}
 
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
@@ -930,11 +974,15 @@ void *setup_live_tracing()
 	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",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	helper_kernctl_buffer_flush(consumerd_metadata);
@@ -942,8 +990,12 @@ void *setup_live_tracing()
 	/* block until metadata is ready */
 	sem_init(&metadata_available, 0, 0);
 
-end:
-	return NULL;
+	return 0;
+
+error_session:
+	lttng_destroy_session("test");
+error:
+	return -1;
 }
 
 int main(int argc, char **argv)
@@ -963,7 +1015,10 @@ int main(int argc, char **argv)
 	}
 
 	if (!opt_input_path) {
-		setup_live_tracing();
+		ret = setup_live_tracing();
+		if (ret < 0) {
+			goto end;
+		}
 		init_lttngtop();
 		if (!opt_textdump) {
 			pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
@@ -990,7 +1045,6 @@ int main(int argc, char **argv)
 			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) {
-					ret = errno;
 					bt_list_del(&mmap_info->list);
 				}
 			}