X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=fa207bc67eb1adc8e18a13ba27c583424f6d8a8d;hb=bf82eb3cf93a9f1823493a09ce612c578f1435d7;hp=29432de49a0355b16863ab69189929a6c37719f3;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 29432de49..fa207bc67 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -240,11 +240,33 @@ struct ltt_kernel_context *trace_kernel_create_context(
 	if (ctx) {
 		memcpy(&kctx->ctx, ctx, sizeof(kctx->ctx));
 	}
+error:
+	return kctx;
+}
+
+/*
+ * Allocate and init a kernel context object from an existing kernel context
+ * object.
+ *
+ * Return the allocated object or NULL on error.
+ */
+struct ltt_kernel_context *trace_kernel_copy_context(
+		struct ltt_kernel_context *kctx)
+{
+	struct ltt_kernel_context *kctx_copy;
 
-	CDS_INIT_LIST_HEAD(&kctx->list);
+	assert(kctx);
+	kctx_copy = zmalloc(sizeof(*kctx_copy));
+	if (!kctx_copy) {
+		PERROR("zmalloc ltt_kernel_context");
+		goto error;
+	}
+
+	memcpy(kctx_copy, kctx, sizeof(*kctx_copy));
+	memset(&kctx_copy->list, 0, sizeof(kctx_copy->list));
 
 error:
-	return kctx;
+	return kctx_copy;
 }
 
 /*
@@ -462,7 +484,9 @@ void trace_kernel_destroy_context(struct ltt_kernel_context *ctx)
 {
 	assert(ctx);
 
-	cds_list_del(&ctx->list);
+	if (ctx->in_list) {
+		cds_list_del(&ctx->list);
+	}
 	free(ctx);
 }