X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.c;h=af78dc00086fdd506e175de11239b0325f8a0a4f;hp=bc73b79776780a0d64fe98ceb2e5c93b0bf83a44;hb=13dce3b738049495c54e14b7401c6f2aa421f5ed;hpb=284d8f5566ac2689a537eacc951473d258f49ec0

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index bc73b7977..af78dc000 100644
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -91,14 +91,13 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
 	struct ltt_ust_session *lus;
 
 	/* Allocate a new ltt ust session */
-	lus = malloc(sizeof(struct ltt_ust_session));
+	lus = zmalloc(sizeof(struct ltt_ust_session));
 	if (lus == NULL) {
-		PERROR("create ust session malloc");
+		PERROR("create ust session zmalloc");
 		goto error;
 	}
 
 	/* Init data structure */
-	lus->consumer_fds_sent = 0;
 	lus->uid = uid;
 	lus->start_trace = 0;
 
@@ -137,9 +136,9 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	int ret;
 	struct ltt_ust_channel *luc;
 
-	luc = malloc(sizeof(struct ltt_ust_channel));
+	luc = zmalloc(sizeof(struct ltt_ust_channel));
 	if (luc == NULL) {
-		perror("ltt_ust_channel malloc");
+		perror("ltt_ust_channel zmalloc");
 		goto error;
 	}
 
@@ -166,7 +165,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	hashtable_node_init(&luc->node, (void *) luc->name, strlen(luc->name));
 	/* Alloc hash tables */
 	luc->events = hashtable_new_str(0);
-	luc->ctx = hashtable_new_str(0);
+	luc->ctx = hashtable_new(0);
 
 	/* Set trace output path */
 	ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
@@ -194,9 +193,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 {
 	struct ltt_ust_event *lue;
 
-	lue = malloc(sizeof(struct ltt_ust_event));
+	lue = zmalloc(sizeof(struct ltt_ust_event));
 	if (lue == NULL) {
-		PERROR("ust event malloc");
+		PERROR("ust event zmalloc");
 		goto error;
 	}
 
@@ -213,6 +212,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	case LTTNG_EVENT_TRACEPOINT:
 		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
 		break;
+	case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
+		break;
 	default:
 		ERR("Unknown ust instrumentation type (%d)", ev->type);
 		goto error_free_event;
@@ -226,7 +228,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	hashtable_node_init(&lue->node, (void *) lue->attr.name,
 			strlen(lue->attr.name));
 	/* Alloc context hash tables */
-	lue->ctx = hashtable_new_str(0);
+	lue->ctx = hashtable_new(0);
 
 	DBG2("Trace UST event %s created", lue->attr.name);
 
@@ -250,7 +252,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
 	lum = zmalloc(sizeof(struct ltt_ust_metadata));
 	if (lum == NULL) {
-		perror("ust metadata malloc");
+		perror("ust metadata zmalloc");
 		goto error;
 	}
 
@@ -278,6 +280,32 @@ error:
 	return NULL;
 }
 
+/*
+ * Allocate and initialize an UST context.
+ *
+ * Return pointer to structure or NULL.
+ */
+struct ltt_ust_context *trace_ust_create_context(
+		struct lttng_event_context *ctx)
+{
+	struct ltt_ust_context *uctx;
+
+	uctx = zmalloc(sizeof(struct ltt_ust_context));
+	if (uctx == NULL) {
+		PERROR("zmalloc ltt_ust_context");
+		goto error;
+	}
+
+	uctx->ctx.ctx = ctx->ctx;
+	hashtable_node_init(&uctx->node, (void *)((unsigned long) uctx->ctx.ctx),
+				sizeof(void *));
+
+	return uctx;
+
+error:
+	return NULL;
+}
+
 /*
  * RCU safe free context structure.
  */