X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=66ca8dbdef5a9b8f5818855b6cb51c88820ef319;hp=ed5b3318921248250f135806e8450f3bf040f790;hb=ffe600149a7608221985751e1bf293234bf2545c;hpb=9b6c7ec5aebd1b1e3610ea54bbd0d6d4e9efaa82

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index ed5b33189..66ca8dbde 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -46,11 +46,6 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_event {
 	int fd;
 	int enabled;
-	/*
-	 * TODO: need internal representation to support more than a
-	 * single context.
-	 */
-	struct lttng_kernel_context *ctx;
 	struct lttng_kernel_event *event;
 	struct cds_list_head list;
 };
@@ -70,6 +65,8 @@ struct ltt_kernel_channel {
 	struct ltt_kernel_event_list events_list;
 	struct ltt_kernel_stream_list stream_list;
 	struct cds_list_head list;
+	/* Session pointer which has a reference to this object. */
+	struct ltt_kernel_session *session;
 };
 
 /* Metadata */
@@ -82,6 +79,7 @@ struct ltt_kernel_metadata {
 struct ltt_kernel_stream {
 	int fd;
 	int state;
+	int cpu;
 	/* Format is %s_%d respectively channel name and CPU number. */
 	char name[DEFAULT_STREAM_NAME_LEN];
 	struct cds_list_head list;
@@ -126,7 +124,8 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_kernel_create_session(char *path);
-struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path);
+struct ltt_kernel_channel *trace_kernel_create_channel(
+		struct lttng_channel *chan);
 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,