X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=e59e3573b8709b6440e37f8560ca3dfe1e737298;hp=d4ff2a52267be7d2a00d2428bd7b42a068875a01;hb=15d4fe3c66b4bc1453f82c075634e325e3008162;hpb=36741bea2b53007c29ac0391ee9086722e00653a

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index d4ff2a52..e59e3573 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -550,7 +550,6 @@ error:
 
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
-	memset(pos, 0, sizeof(*pos));
 	pos->fd = fd;
 	if (fd >= 0) {
 		pos->packet_cycles_index = g_array_new(FALSE, TRUE,
@@ -700,6 +699,9 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 			break;
 		}
 		case SEEK_SET:
+			packet_index = &g_array_index(pos->packet_cycles_index,
+					struct packet_index, index);
+			pos->last_events_discarded = packet_index->events_discarded;
 			pos->cur_index = index;
 			file_stream->parent.prev_real_timestamp = 0;
 			file_stream->parent.prev_real_timestamp_end = 0;
@@ -1265,6 +1267,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 		packet_index.timestamp_begin = 0;
 		packet_index.timestamp_end = 0;
 		packet_index.events_discarded = 0;
+		packet_index.events_discarded_len = 0;
 
 		/* read and check header, set stream id (and check) */
 		if (file_stream->parent.trace_packet_header) {
@@ -1901,35 +1904,13 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 				continue;
 			for (j = 0; j < stream->streams->len; j++) {
 				struct ctf_file_stream *file_stream;
-				file_stream = container_of(g_ptr_array_index(stream->streams, j), struct ctf_file_stream, parent);
+				file_stream = container_of(g_ptr_array_index(stream->streams, j),
+						struct ctf_file_stream, parent);
 				ctf_close_file_stream(file_stream);
 			}
-
-		}
-		g_ptr_array_free(td->streams, TRUE);
-	}
-
-	if (td->event_declarations) {
-		for (i = 0; i < td->event_declarations->len; i++) {
-			struct bt_ctf_event_decl *event;
-
-			event = g_ptr_array_index(td->event_declarations, i);
-			if (event->context_decl)
-				g_ptr_array_free(event->context_decl, TRUE);
-			if (event->fields_decl)
-				g_ptr_array_free(event->fields_decl, TRUE);
-			if (event->packet_header_decl)
-				g_ptr_array_free(event->packet_header_decl, TRUE);
-			if (event->event_context_decl)
-				g_ptr_array_free(event->event_context_decl, TRUE);
-			if (event->event_header_decl)
-				g_ptr_array_free(event->event_header_decl, TRUE);
-			if (event->packet_context_decl)
-				g_ptr_array_free(event->packet_context_decl, TRUE);
-			g_free(event);
 		}
-		g_ptr_array_free(td->event_declarations, TRUE);
 	}
+	ctf_destroy_metadata(td);
 	closedir(td->dir);
 	g_free(td);
 }