X-Git-Url: http://git.liburcu.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=ce7607af05de18785209d4227475688fbdecbcfd;hp=87a4043adb6f70f5bb34bec34d72892ae0dcb848;hb=7f856e200eb22faf41d908d6af3fcb5b17fcb98b;hpb=fbbda4dac5b23757921dea8e2992cbb6bff5775f

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 87a4043..ce7607a 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -82,6 +82,7 @@ enum {
 	OPT_PID,
 	OPT_CHILD,
 	OPT_HOSTNAME,
+	OPT_KPROBES,
 };
 
 static struct poptOption long_options[] = {
@@ -91,6 +92,7 @@ static struct poptOption long_options[] = {
 	{ "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 },
+	{ "kprobes", 'k', POPT_ARG_STRING, &opt_kprobes, OPT_KPROBES, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -160,6 +162,7 @@ void print_fields(struct bt_ctf_event *event)
 {
 	unsigned int cnt, i;
 	const struct definition *const * list;
+	const struct declaration *l;
 	const struct definition *scope;
 	enum ctf_type_id type;
 	const char *str;
@@ -171,9 +174,10 @@ void print_fields(struct bt_ctf_event *event)
 		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]));
@@ -212,18 +216,15 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	}
 	
 	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;
+	if (opt_tid || opt_hostname)
+		if (!lookup_filter_tid_list(pid))
+			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) {
+	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,
@@ -255,6 +256,22 @@ error:
 	return BT_CB_ERROR_STOP;
 }
 
+enum bt_cb_ret handle_kprobes(struct bt_ctf_event *call_data, void *private_data)
+{
+	int i;
+	struct kprobes *kprobe;
+
+	/* for kprobes */
+	for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+		kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+		if (strcmp(bt_ctf_event_name(call_data), kprobe->probe_name) == 0) {
+			kprobe->count++;
+		}
+	}
+
+	return BT_CB_OK;
+}
+
 /*
  * hook on each event to check the timestamp and refresh the display if
  * necessary
@@ -433,7 +450,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	/* find or create the current process */
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
-		child = add_proc(&lttngtop, tid, comm, timestamp);
+		child = add_proc(&lttngtop, tid, comm, timestamp, hostname);
 	if (!child)
 		goto end;
 	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
@@ -442,7 +459,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		/* find or create the parent */
 		parent = find_process_tid(&lttngtop, pid, comm);
 		if (!parent) {
-			parent = add_proc(&lttngtop, pid, comm, timestamp);
+			parent = add_proc(&lttngtop, pid, comm, timestamp, hostname);
 			if (parent)
 				parent->pid = pid;
 		}
@@ -465,6 +482,8 @@ void init_lttngtop()
 {
 	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);
@@ -483,6 +502,8 @@ void init_lttngtop()
 	lttngtop.process_table = g_ptr_array_new();
 	lttngtop.files_table = g_ptr_array_new();
 	lttngtop.cpu_table = g_ptr_array_new();
+
+	toggle_filter = -1;
 }
 
 void usage(FILE *fp)
@@ -495,6 +516,82 @@ void usage(FILE *fp)
 	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");
+}
+
+/*
+ * Parse probe options.
+ * Shamelessly stolen from lttng-tools :
+ * src/bin/lttng/commands/enable_events.c
+ */
+static struct kprobes *parse_probe_opts(char *opt)
+{
+	char s_hex[19];
+	char name[LTTNG_SYMBOL_NAME_LEN];
+	struct kprobes *kprobe;
+	int ret;
+
+	/*
+	kprobe->probe_addr = 0;
+	kprobe->probe_offset = 0;
+	asprintf(&kprobe->probe_name, "probe_sys_open");
+	asprintf(&kprobe->symbol_name, "sys_open");
+	*/
+
+	if (opt == NULL) {
+		kprobe = NULL;
+		goto end;
+	}
+
+	kprobe = g_new0(struct kprobes, 1);
+
+	/* 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);
+
+		if (strlen(s_hex) == 0) {
+			fprintf(stderr, "Invalid probe offset %s", s_hex);
+			ret = -1;
+			goto end;
+		}
+		kprobe->probe_offset = strtoul(s_hex, NULL, 0);
+		kprobe->probe_addr = 0;
+		goto end;
+	}
+
+	/* Check for symbol */
+	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);
+			kprobe->probe_offset = 0;
+			kprobe->probe_addr = 0;
+			goto end;
+		}
+	}
+
+	/* Check for address */
+	ret = sscanf(opt, "%s", s_hex);
+	if (ret > 0) {
+		if (strlen(s_hex) == 0) {
+			fprintf(stderr, "Invalid probe address %s", s_hex);
+			ret = -1;
+			goto end;
+		}
+		asprintf(&kprobe->probe_name, "probe_%s", s_hex);
+		kprobe->probe_offset = 0;
+		kprobe->probe_addr = strtoul(s_hex, NULL, 0);
+		goto end;
+	}
+
+	/* No match */
+	kprobe = NULL;
+
+end:
+	return kprobe;
 }
 
 /*
@@ -525,26 +622,41 @@ static int parse_options(int argc, char **argv)
 				opt_child = 1;
 				break;
 			case OPT_PID:
-				tid_list = g_hash_table_new(g_str_hash,
+				toggle_filter = 1;
+				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_HOSTNAME:
-				hostname_list = g_hash_table_new(g_str_hash,
-						g_str_equal);
+				toggle_filter = 1;
 				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_KPROBES:
+				lttngtop.kprobes_table = g_ptr_array_new();
+				tmp_str = strtok(opt_kprobes, ",");
+				while (tmp_str) {
+					struct kprobes *kprobe;
+
+					kprobe = parse_probe_opts(tmp_str);
+					if (kprobe) {
+						g_ptr_array_add(
+							lttngtop.kprobes_table,
+							kprobe);
+					} else {
+						ret = -EINVAL;
+						goto end;
+					}
 					tmp_str = strtok(NULL, ",");
 				}
 				break;
@@ -567,12 +679,18 @@ void iter_trace(struct bt_context *bt_ctx)
 {
 	struct bt_ctf_iter *iter;
 	struct bt_iter_pos begin_pos;
+	struct kprobes *kprobe;
 	const struct bt_ctf_event *event;
+	int i;
 	int ret = 0;
 
 	begin_pos.type = BT_SEEK_BEGIN;
 	iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
 
+	/* at each event, verify the status of the process table */
+	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+			fix_process_table,
+			NULL, NULL, NULL);
 	if (opt_textdump) {
 		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
 				print_timestamp,
@@ -582,10 +700,6 @@ void iter_trace(struct bt_context *bt_ctx)
 		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
 				check_timestamp,
 				NULL, NULL, NULL);
-		/* at each event, verify the status of the process table */
-		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-				fix_process_table,
-				NULL, NULL, NULL);
 		/* to handle the scheduling events */
 		bt_ctf_iter_add_callback(iter,
 				g_quark_from_static_string("sched_switch"),
@@ -622,6 +736,18 @@ void iter_trace(struct bt_context *bt_ctx)
 					"lttng_statedump_file_descriptor"),
 				NULL, 0, handle_statedump_file_descriptor,
 				NULL, NULL, NULL);
+
+		/* for kprobes */
+		if (lttngtop.kprobes_table) {
+			for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+				kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+				bt_ctf_iter_add_callback(iter,
+						g_quark_from_static_string(
+							kprobe->probe_name),
+						NULL, 0, handle_kprobes,
+						NULL, NULL, NULL);
+			}
+		}
 	}
 
 	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
@@ -861,7 +987,7 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 		}
 
 		/* splice the subbuffer to the tracefile */
-		ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
+		ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len, 0);
 		if (ret < 0) {
 			/*
 			 * display the error but continue processing to try
@@ -967,14 +1093,14 @@ int setup_consumer(char *command_sock_path, pthread_t *threads,
 	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,
+	ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_sessiond_poll,
 			(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,
+	ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_metadata_poll,
 			(void *) ctx);
 	if (ret != 0) {
 		perror("pthread_create poll fd");
@@ -985,6 +1111,34 @@ 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;
@@ -1048,7 +1202,8 @@ int setup_live_tracing()
 		chan.attr.subbuf_size = 32768;
 		chan.attr.num_subbuf = 8;
 	} else {
-		chan.attr.subbuf_size = 1048576; /* 1MB */
+		//chan.attr.subbuf_size = 1048576; /* 1MB */
+		chan.attr.subbuf_size = 2097152; /* 1MB */
 		chan.attr.num_subbuf = 4;
 	}
 	chan.attr.switch_timer_interval = 0;
@@ -1062,35 +1217,50 @@ int setup_live_tracing()
 	}
 
 	memset(&ev, '\0', sizeof(struct lttng_event));
-	//sprintf(ev.name, "sched_switch");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
+	sprintf(ev.name, "sched_switch");
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-		fprintf(stderr,"error enabling event : %s\n",
+		fprintf(stderr,"error enabling event %s : %s\n",
+				ev.name,
 				helper_lttcomm_get_readable_code(ret));
 		goto error_session;
 	}
-
-	memset(&ev, '\0', sizeof(struct lttng_event));
-	ev.type = LTTNG_EVENT_SYSCALL;
+	sprintf(ev.name, "sched_process_free");
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-		fprintf(stderr,"error enabling syscalls : %s\n",
+		fprintf(stderr,"error enabling event %s : %s\n",
+				ev.name,
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
+	}
+	sprintf(ev.name, "lttng_statedump_process_state");
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		fprintf(stderr,"error enabling event %s : %s\n",
+				ev.name,
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
+	}
+	sprintf(ev.name, "lttng_statedump_file_descriptor");
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		fprintf(stderr,"error enabling event %s : %s\n",
+				ev.name,
 				helper_lttcomm_get_readable_code(ret));
 		goto error_session;
 	}
 
-	/*
 	memset(&ev, '\0', sizeof(struct lttng_event));
-	ev.type = LTTNG_EVENT_PROBE;
-	sprintf(ev.attr.probe.symbol_name, "sys_open");
-	sprintf(ev.name, "probe_sys_open");
-	ev.attr.probe.addr = 0;
-	ev.attr.probe.offset = 0;
+	ev.type = LTTNG_EVENT_SYSCALL;
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-		fprintf(stderr,"error enabling kprobes : %s\n",
+		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);
@@ -1133,6 +1303,7 @@ int main(int argc, char **argv)
 	struct mmap_stream *mmap_info;
 	unsigned long mmap_len;
 
+	init_lttngtop();
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
 		fprintf(stdout, "Error parsing options.\n\n");
@@ -1151,7 +1322,6 @@ int main(int argc, char **argv)
 		if (ret < 0) {
 			goto end;
 		}
-		init_lttngtop();
 		if (!opt_textdump) {
 			pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
 			pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
@@ -1160,9 +1330,14 @@ int main(int argc, char **argv)
 			reload_trace = 0;
 			live_consume(&bt_ctx);
 			iter_trace(bt_ctx);
+			/*
+			 * FIXME : pb with cleanup in libbabeltrace
 			ret = bt_context_remove_trace(bt_ctx, 0);
-			if (ret != 0)
+			if (ret != 0) {
 				fprintf(stderr, "error removing trace\n");
+				goto error;
+			}
+			*/
 			if (bt_ctx) {
 				bt_context_put(bt_ctx);
 			}
@@ -1192,7 +1367,7 @@ int main(int argc, char **argv)
 
 		goto end;
 	} else {
-		init_lttngtop();
+		//init_lttngtop();
 
 		bt_ctx = bt_context_create();
 		ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
@@ -1221,4 +1396,7 @@ end:
 		bt_context_put(bt_ctx);
 
 	return 0;
+
+error:
+	return -1;
 }