X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-comm.c;h=fef374a381c2b4aa685f418b30bcd3ebc82b8a91;hb=0cbbc8b84ffc3d1444018015b8b9d5c229929281;hp=1912b57f5795b2bdbe475f6ff4dcb374b11085e4;hpb=86c86ab8206488873b3af3ae60977b6365189fc4;p=babeltrace.git

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index 1912b57f..fef374a3 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -408,7 +408,7 @@ int open_metadata_fp_write(struct lttng_live_viewer_stream *stream,
 	int ret = 0;
 
 	stream->metadata_fp_write =
-		babeltrace_open_memstream(metadata_buf, size);
+		bt_open_memstream(metadata_buf, size);
 	if (!stream->metadata_fp_write) {
 		perror("Metadata open_memstream");
 		ret = -1;
@@ -610,7 +610,7 @@ int append_metadata(struct lttng_live_ctx *ctx,
 
 	metadata = viewer_stream->ctf_trace->metadata_stream;
 	metadata->ctf_trace->metadata_fp =
-		babeltrace_fmemopen(metadata_buf,
+		bt_fmemopen(metadata_buf,
 				metadata->metadata_len, "rb");
 	if (!metadata->ctf_trace->metadata_fp) {
 		perror("Metadata fmemopen");
@@ -650,17 +650,6 @@ retry:
 		goto end;
 	}
 
-	/*
-	 * Flush the output between attempts to grab a packet, thus
-	 * ensuring we flush at least at the periodical timer period.
-	 * This ensures the output remains reactive for interactive users and
-	 * that the output is flushed when redirected to a file by the shell.
-	 */
-	if (fflush(LTTNG_LIVE_OUTPUT_FP) < 0) {
-		perror("fflush");
-		goto error;
-	}
-
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
 	cmd.data_size = htobe64((uint64_t) sizeof(rq));
 	cmd.cmd_version = htobe32(0);
@@ -944,9 +933,9 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
 		}
 	} while (ret > 0 || !len_read);
 
-	if (babeltrace_close_memstream(metadata_buf, &size,
+	if (bt_close_memstream(metadata_buf, &size,
 			metadata_stream->metadata_fp_write)) {
-		perror("babeltrace_close_memstream");
+		perror("bt_close_memstream");
 	}
 	metadata_stream->metadata_fp_write = NULL;
 
@@ -1293,6 +1282,17 @@ retry:
 				cur_index->ts_real.timestamp_begin;
 	}
 
+	/*
+	 * Flush the output between attempts to grab a packet, thus
+	 * ensuring we flush at least at the periodical timer period.
+	 * This ensures the output remains reactive for interactive users and
+	 * that the output is flushed when redirected to a file by the shell.
+	 */
+	if (fflush(LTTNG_LIVE_OUTPUT_FP) < 0) {
+		perror("fflush");
+		goto end;
+	}
+
 	if (pos->packet_size == 0 || pos->offset == EOF) {
 		goto end;
 	}
@@ -1432,7 +1432,7 @@ int add_one_trace(struct lttng_live_ctx *ctx,
 				goto end_free;
 			}
 
-			trace->metadata_fp = babeltrace_fmemopen(metadata_buf,
+			trace->metadata_fp = bt_fmemopen(metadata_buf,
 					stream->metadata_len, "rb");
 			if (!trace->metadata_fp) {
 				perror("Metadata fmemopen");
@@ -1646,7 +1646,7 @@ int lttng_live_read(struct lttng_live_ctx *ctx)
 		goto end;
 	}
 
-	fmt_write = bt_lookup_format(g_quark_from_static_string("text"));
+	fmt_write = bt_lookup_format(g_quark_from_string("text"));
 	if (!fmt_write) {
 		fprintf(stderr, "[error] ctf-text error\n");
 		goto end;