X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-plugin.c;h=f2c7536ec0d4e6223f21d68985fa9fcbb0665b3b;hb=7e3e3582f6fc79c97b07fad7fa7019e8a80aeb0e;hp=a8cae580de7a140470fc78180db667839368f40e;hpb=09e76ccc93dc3738ff1f7fb0f99b01cdeff0acc9;p=babeltrace.git

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index a8cae580..f2c7536e 100644
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -41,6 +41,14 @@
 
 static volatile int should_quit;
 
+void bt_lttng_live_hook(void)
+{
+	/*
+	 * Dummy function to prevent the linker from discarding this format as
+	 * "unused" in static builds.
+	 */
+}
+
 int lttng_live_should_quit(void)
 {
 	return should_quit;
@@ -90,12 +98,12 @@ int setup_sighandler(void)
 }
 
 /*
- * hostname parameter needs to hold NAME_MAX chars.
+ * hostname parameter needs to hold MAXNAMLEN chars.
  */
 static
 int parse_url(const char *path, struct lttng_live_ctx *ctx)
 {
-	char remain[3][NAME_MAX];
+	char remain[3][MAXNAMLEN];
 	int ret = -1, proto, proto_offset = 0;
 	size_t path_len = strlen(path);	/* not accounting \0 */
 
@@ -104,7 +112,7 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
 	 * against a size defined by a macro. Test it beforehand on the
 	 * input. We know the output is always <= than the input length.
 	 */
-	if (path_len >= NAME_MAX) {
+	if (path_len >= MAXNAMLEN) {
 		goto end;
 	}
 	ret = sscanf(path, "net%d://", &proto);
@@ -119,6 +127,10 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
 	if (proto_offset > path_len) {
 		goto end;
 	}
+	if (proto == 6) {
+		fprintf(stderr, "[error] IPv6 is currently unsupported by lttng-live\n");
+		goto end;
+	}
 	/* TODO : parse for IPv6 as well */
 	/* Parse the hostname or IP */
 	ret = sscanf(&path[proto_offset], "%[a-zA-Z.0-9%-]%s",
@@ -187,6 +199,30 @@ end:
 	return ret;
 }
 
+static
+guint g_uint64p_hash(gconstpointer key)
+{
+	uint64_t v = *(uint64_t *) key;
+
+	if (sizeof(gconstpointer) == sizeof(uint64_t)) {
+		return g_direct_hash((gconstpointer) (unsigned long) v);
+	} else {
+		return g_direct_hash((gconstpointer) (unsigned long) (v >> 32))
+			^ g_direct_hash((gconstpointer) (unsigned long) v);
+	}
+}
+
+static
+gboolean g_uint64p_equal(gconstpointer a, gconstpointer b)
+{
+	uint64_t va = *(uint64_t *) a;
+	uint64_t vb = *(uint64_t *) b;
+
+	if (va != vb)
+		return FALSE;
+	return TRUE;
+}
+
 static int lttng_live_open_trace_read(const char *path)
 {
 	int ret = 0;
@@ -199,8 +235,8 @@ static int lttng_live_open_trace_read(const char *path)
 	ctx->session->ctx = ctx;
 
 	/* HT to store the CTF traces. */
-	ctx->session->ctf_traces = g_hash_table_new(g_direct_hash,
-			g_direct_equal);
+	ctx->session->ctf_traces = g_hash_table_new(g_uint64p_hash,
+			g_uint64p_equal);
 	ctx->port = -1;
 	ctx->session_ids = g_array_new(FALSE, TRUE, sizeof(uint64_t));
 
@@ -230,7 +266,7 @@ static int lttng_live_open_trace_read(const char *path)
 	}
 
 	if (ctx->session_ids->len > 0) {
-		lttng_live_read(ctx);
+		ret = lttng_live_read(ctx);
 	}
 
 end_free:
@@ -268,7 +304,15 @@ struct bt_trace_descriptor *lttng_live_open_trace(const char *path, int flags,
 	pos->parent.rw_table = NULL;
 	pos->parent.event_cb = NULL;
 	pos->parent.trace = &pos->trace_descriptor;
-	lttng_live_open_trace_read(path);
+	/*
+	 * Since we do *everything* in this function, we are skipping
+	 * the output plugin handling that is part of Babeltrace 1.x.
+	 * Therefore, don't expect the --output cmd line option to work.
+	 * This limits the output of lttng-live to stderr and stdout.
+	 */
+	if (lttng_live_open_trace_read(path) < 0) {
+		goto error;
+	}
 	return &pos->trace_descriptor;
 
 error:
@@ -281,7 +325,7 @@ int lttng_live_close_trace(struct bt_trace_descriptor *td)
 	struct ctf_text_stream_pos *pos =
 		container_of(td, struct ctf_text_stream_pos,
 			trace_descriptor);
-	free(pos);
+	g_free(pos);
 	return 0;
 }
 
@@ -296,7 +340,7 @@ void __attribute__((constructor)) lttng_live_init(void)
 {
 	int ret;
 
-	lttng_live_format.name = g_quark_from_static_string("lttng-live");
+	lttng_live_format.name = g_quark_from_string("lttng-live");
 	ret = bt_register_format(&lttng_live_format);
 	assert(!ret);
 }