}
/*
- * 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 */
* 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);
if (ret < 0) {
goto end;
}
- } else {
+ } else if (ret == 0) {
fprintf(stderr, "[error] Missing port number after delimitor ':'\n");
ret = -1;
goto 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;
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));
}
if (ctx->session_ids->len > 0) {
- lttng_live_read(ctx);
+ ret = lttng_live_read(ctx);
}
end_free:
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:
struct ctf_text_stream_pos *pos =
container_of(td, struct ctf_text_stream_pos,
trace_descriptor);
- free(pos);
+ g_free(pos);
return 0;
}