X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=8363ae2954912482900e2aa5f3eeeeb4cd7bd26f;hp=65fe84b7d37617a17d3d4a68130d2138158f1a8d;hb=55d097957f5bb8138959ad2202a40d85d49f029e;hpb=d9bf3ca437aa801c9364ca06b1083f83c6f8ef30

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 65fe84b7d..8363ae295 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -128,6 +128,13 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (name[0] == '\0')
+		name = DEFAULT_CHANNEL_NAME;
+
 	lttng_ht_lookup(ht, (void *)name, &iter);
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
@@ -203,7 +210,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 	 * during the session lifetime which is at the first enable channel and
 	 * only before start. The flag buffer_type_changed indicates the status.
 	 */
-	lus->buffer_type = LTTNG_BUFFER_PER_PID;
+	lus->buffer_type = LTTNG_BUFFER_PER_UID;
 	/* Once set to 1, the buffer_type is immutable for the session. */
 	lus->buffer_type_changed = 0;
 	/* Init it in case it get used after allocation. */
@@ -268,12 +275,22 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
 		break;
 	}
 
-	/* Copy channel name */
-	strncpy(luc->name, chan->name, sizeof(luc->name));
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (chan->name[0] == '\0') {
+		strncpy(luc->name, DEFAULT_CHANNEL_NAME, sizeof(luc->name));
+	} else {
+		/* Copy channel name */
+		strncpy(luc->name, chan->name, sizeof(luc->name));
+	}
 	luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	/* Init node */
 	lttng_ht_node_init_str(&luc->node, luc->name);
+	CDS_INIT_LIST_HEAD(&luc->ctx_list);
+
 	/* Alloc hash tables */
 	luc->events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 	luc->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
@@ -432,6 +449,9 @@ struct ltt_ust_context *trace_ust_create_context(
 	case LTTNG_EVENT_CONTEXT_PROCNAME:
 		utype = LTTNG_UST_CONTEXT_PROCNAME;
 		break;
+	case LTTNG_EVENT_CONTEXT_IP:
+		utype = LTTNG_UST_CONTEXT_IP;
+		break;
 	default:
 		ERR("Invalid UST context");
 		return NULL;
@@ -445,6 +465,7 @@ struct ltt_ust_context *trace_ust_create_context(
 
 	uctx->ctx.ctx = utype;
 	lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
+	CDS_INIT_LIST_HEAD(&uctx->list);
 
 	return uctx;
 
@@ -473,11 +494,16 @@ static void destroy_contexts(struct lttng_ht *ht)
 	int ret;
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
+	struct ltt_ust_context *ctx;
 
 	assert(ht);
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) {
+		/* Remove from ordered list. */
+		ctx = caa_container_of(node, struct ltt_ust_context, node);
+		cds_list_del(&ctx->list);
+		/* Remove from channel's hash table. */
 		ret = lttng_ht_del(ht, &iter);
 		if (!ret) {
 			call_rcu(&node->head, destroy_context_rcu);