X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=15d44e02e08eec5660d607c6b593146646e9e4e4;hp=fd23e74da416c746cf437586ecb275d3c0628a2d;hb=b520ab458ea26829d00fca98f4bbb90309fd30df;hpb=c78f2cdca5c8f39eddd468a7c4ec6c373ed5495e

diff --git a/src/lttngtop.c b/src/lttngtop.c
index fd23e74..15d44e0 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -132,6 +132,29 @@ void *ncurses_display(void *p)
 	}
 }
 
+/*
+ * hook on each event to check the timestamp and refresh the display if
+ * necessary
+ */
+enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data)
+{
+	unsigned long timestamp;
+	struct tm start;
+	uint64_t ts_nsec_start;
+
+
+	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,
+			start.tm_min, start.tm_sec, ts_nsec_start,
+			bt_ctf_event_name(call_data));
+
+	return BT_CB_OK;
+}
+
 /*
  * hook on each event to check the timestamp and refresh the display if
  * necessary
@@ -390,6 +413,11 @@ void iter_trace(struct bt_context *bt_ctx)
 	begin_pos.type = BT_SEEK_BEGIN;
 	iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
 
+	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+			print_timestamp,
+			NULL, NULL, NULL);
+
+#if 0
 	/* at each event check if we need to refresh */
 	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
 			check_timestamp,
@@ -434,7 +462,7 @@ void iter_trace(struct bt_context *bt_ctx)
 					"lttng_statedump_file_descriptor"),
 			NULL, 0, handle_statedump_file_descriptor,
 			NULL, NULL, NULL);
-
+#endif
 	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
@@ -644,84 +672,6 @@ int check_requirements(struct bt_context *ctx)
 	return ret;
 }
 
-void dump_snapshot()
-{
-#if 0
-	struct lttng_consumer_stream *iter;
-	unsigned long spos;
-	struct mmap_stream *new_snapshot;
-
-	int ret = 0;
-	int i;
-	/*
-	 * try lock mutex ressource courante (overrun)
-	 * if fail : overrun
-	 * stop trace (flush implicite avant stop)
-	 * lttng_consumer_take_snapshot
-	 * read timestamp packet end (use time as end pos)
-	 * 	- stream_packet_context
-	 * 	- reculer de 1 subbuf : pos - max_subbuff_size
-	 *
-	 * 	- position de fin (take_snapshot)
-	 * 	- mov_pos_slow ( fin - max_subbuff_size) lire timestamp packet end
-	 * 	- prend min(end) (activité sur tous les streams)
-	 *
-	 * start trace
-	 * unlock mutex
-	 */
-
-	helper_kernctl_buffer_flush(consumerd_metadata);
-	for (i = 0; i < lttng_consumer_stream_array->len; i++) {
-		iter = g_ptr_array_index(lttng_consumer_stream_array, i);
-		helper_kernctl_buffer_flush(helper_get_lttng_consumer_stream_wait_fd(iter));
-		printf("Taking snapshot of fd : %d\n", helper_get_lttng_consumer_stream_wait_fd(iter));
-		ret = helper_lttng_consumer_take_snapshot(ctx, iter);
-		if (ret != 0) {
-			ret = errno;
-			perror("lttng_consumer_take_snapshots");
-			goto end;
-		}
-	}
-	for (i = 0; i < lttng_consumer_stream_array->len; i++) {
-		iter = g_ptr_array_index(lttng_consumer_stream_array, i);
-		ret = helper_lttng_consumer_get_produced_snapshot(ctx, iter, &spos);
-		if (ret != 0) {
-			ret = errno;
-			perror("helper_lttng_consumer_get_produced_snapshot");
-			goto end;
-		}
-		while (helper_get_lttng_consumer_stream_wait_last_pos(iter) < spos) {
-			new_snapshot = g_new0(struct mmap_stream, 1);
-			new_snapshot->fd = helper_get_lttng_consumer_stream_wait_fd(iter);
-			new_snapshot->last_pos = helper_get_lttng_consumer_stream_wait_last_pos(iter);
-			fprintf(stderr,"ADDING AVAILABLE SNAPSHOT ON FD %d AT POSITION %lu\n",
-					new_snapshot->fd,
-					new_snapshot->last_pos);
-			g_ptr_array_add(available_snapshots, new_snapshot);
-			helper_set_lttng_consumer_stream_wait_last_pos(iter, 
-				helper_get_lttng_consumer_stream_wait_last_pos(iter) +
-				helper_get_lttng_consumer_stream_chan_max_sb_size(iter));
-		}
-	}
-
-	if (!metadata_ready) {
-		fprintf(stderr, "BLOCKING BEFORE METADATA\n");
-		sem_wait(&metadata_available);
-		fprintf(stderr,"OPENING TRACE\n");
-		if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
-			fprintf(stderr,"NO METADATA FILE, SKIPPING\n");
-			return;
-		}
-		metadata_ready = 1;
-		metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
-	}
-
-
-end:
-	return;
-#endif
-}
-
 ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 		struct lttng_consumer_local_data *ctx)
 {
@@ -732,7 +682,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_SPLICE) {
 		/* Get the next subbuffer */
-		printf("get_next : %d\n", infd);
 		err = helper_kernctl_get_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -747,7 +696,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			perror("Getting sub-buffer len failed.");
 			goto end;
 		}
-		printf("len : %ld\n", len);
 
 		/* splice the subbuffer to the tracefile */
 		ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
@@ -758,8 +706,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			 */
 			fprintf(stderr,"Error splicing to tracefile\n");
 		}
-		printf("ret : %ld\n", ret);
-		printf("put_next : %d\n", infd);
 		err = helper_kernctl_put_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -785,8 +731,7 @@ int on_update_fd(int key, uint32_t state)
 int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 {
 	int ret;
-	struct mmap_stream *new_info;
-	size_t tmp_mmap_len;
+	struct mmap_stream *new_mmap_stream;
 
 	/* Opening the tracefile in write mode */
 	if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) {
@@ -800,31 +745,14 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 	}
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_MMAP) {
-		new_info = malloc(sizeof(struct mmap_stream));
-		new_info->fd = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
-		bt_list_add(&new_info->list, &mmap_list.head);
-
-		/* get the len of the mmap region */
-		ret = helper_kernctl_get_mmap_len(helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd),
-				&tmp_mmap_len);
-		if (ret != 0) {
-			ret = errno;
-			perror("helper_kernctl_get_mmap_len");
-			goto end;
-		}
-		helper_set_lttng_consumer_stream_mmap_len(kconsumerd_fd, tmp_mmap_len);
-
-		helper_set_lttng_consumer_stream_mmap_base(kconsumerd_fd,
-				mmap(NULL, helper_get_lttng_consumer_stream_mmap_len(kconsumerd_fd),
-				PROT_READ, MAP_PRIVATE, helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd), 0));
-		if (helper_get_lttng_consumer_stream_mmap_base(kconsumerd_fd) == MAP_FAILED) {
-			perror("Error mmaping");
-			ret = -1;
-			goto end;
-		}
+		new_mmap_stream = malloc(sizeof(struct mmap_stream));
+		new_mmap_stream->fd = helper_get_lttng_consumer_stream_wait_fd(
+				kconsumerd_fd);
+		bt_list_add(&new_mmap_stream->list, &mmap_list.head);
 
 		g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd);
-		ret = 0;
+		/* keep mmap FDs internally */
+		ret = 1;
 	} else {
 		consumerd_metadata = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
 		sessiond_metadata = helper_get_lttng_consumer_stream_key(kconsumerd_fd);
@@ -840,30 +768,29 @@ void *live_consume()
 	struct bt_context *bt_ctx = NULL;
 	int ret;
 
-	while (1) {
-//		dump_snapshot();
-
-		if (!metadata_ready) {
-			fprintf(stderr, "BLOCKING BEFORE METADATA\n");
-			sem_wait(&metadata_available);
-			fprintf(stderr,"OPENING TRACE\n");
-			if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
-				fprintf(stderr,"NO METADATA FILE, SKIPPING\n");
-				return;
-			}
-			metadata_ready = 1;
-			metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
+	if (!metadata_ready) {
+		sem_wait(&metadata_available);
+		if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
+			fprintf(stderr,"no metadata\n");
+			return NULL;
 		}
+		metadata_ready = 1;
+		metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
+	}
 
-		if (!trace_opened) {
-			bt_ctx = bt_context_create();
-			ret = bt_context_add_trace(bt_ctx, NULL, "ctf",
-					lttngtop_ctf_packet_seek, &mmap_list, metadata_fp);
-			trace_opened = 1;
+	if (!trace_opened) {
+		bt_ctx = bt_context_create();
+		ret = bt_context_add_trace(bt_ctx, NULL, "ctf",
+				lttngtop_ctf_packet_seek, &mmap_list, metadata_fp);
+		if (ret < 0) {
+			printf("Error adding trace\n");
+			return NULL;
 		}
-		iter_trace(bt_ctx);
-		sleep(1);
+		trace_opened = 1;
 	}
+	iter_trace(bt_ctx);
+
+	return NULL;
 }
 
 int setup_consumer(char *command_sock_path, pthread_t *threads,
@@ -928,6 +855,7 @@ void *setup_live_tracing()
 
 	ret = system("rm -rf /tmp/livesession");
 
+	lttng_destroy_session("test");
 	if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) {
 		fprintf(stderr,"error creating the session : %s\n",
 				helper_lttcomm_get_readable_code(ret));
@@ -991,15 +919,13 @@ void *setup_live_tracing()
 		goto end;
 	}
 
-//	pthread_cancel(live_trace_thread);
-
 	/* block until metadata is ready */
 	sem_init(&metadata_available, 0, 0);
 
 	//init_lttngtop();
 
 end:
-	return ret;
+	return NULL;
 }
 
 int main(int argc, char **argv)
@@ -1017,9 +943,8 @@ int main(int argc, char **argv)
 	}
 
 	if (!opt_input_path) {
-		printf("live tracing enabled\n");
 		pthread_create(&live_trace_thread, NULL, setup_live_tracing, (void *) NULL);
-		sleep(20);
+		sleep(2000);
 		printf("STOPPING\n");
 		lttng_stop_tracing("test");
 		printf("DESTROYING\n");