X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=8b123a79df08073a0c69146b1679a468d24c8c7a;hp=94d3c4946619c8429614b9f091f4000a91dd5ccc;hb=8e12081b0ef475c304c629257bf4dbee2a826886;hpb=99497cd03fb27fd2416a88d80292a0cc5647bff2

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index 94d3c4946..8b123a79d 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -21,15 +21,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <urcu/list.h>
 
-#include "lttngerr.h"
+#include <lttngerr.h>
+
 #include "trace.h"
 
 /*
- *  get_kernel_channel_by_name
- *
- *  Find the channel name for the given kernel session.
+ * Find the channel name for the given kernel session.
  */
 struct ltt_kernel_channel *get_kernel_channel_by_name(
 		char *name, struct ltt_kernel_session *session)
@@ -53,9 +51,7 @@ error:
 }
 
 /*
- *  get_kernel_event_by_name
- *
- *  Find the event name for the given channel.
+ * Find the event name for the given channel.
  */
 struct ltt_kernel_event *get_kernel_event_by_name(
 		char *name, struct ltt_kernel_channel *channel)
@@ -80,11 +76,9 @@ error:
 }
 
 /*
- *  trace_create_kernel_session
+ * Allocate and initialize a kernel session data structure.
  *
- *  Allocate and initialize a kernel session data structure.
- *
- *  Return pointer to structure or NULL.
+ * Return pointer to structure or NULL.
  */
 struct ltt_kernel_session *trace_create_kernel_session(void)
 {
@@ -103,6 +97,7 @@ struct ltt_kernel_session *trace_create_kernel_session(void)
 	lks->channel_count = 0;
 	lks->stream_count_global = 0;
 	lks->metadata = NULL;
+	lks->consumer_fd = 0;
 	CDS_INIT_LIST_HEAD(&lks->channel_list.head);
 
 	return lks;
@@ -112,11 +107,9 @@ error:
 }
 
 /*
- *  trace_create_kernel_channel
- *
- *  Allocate and initialize a kernel channel data structure.
+ * Allocate and initialize a kernel channel data structure.
  *
- *  Return pointer to structure or NULL.
+ * Return pointer to structure or NULL.
  */
 struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path)
 {
@@ -158,11 +151,9 @@ error:
 }
 
 /*
- *  trace_create_kernel_event
+ * Allocate and initialize a kernel event. Set name and event type.
  *
- *  Allocate and initialize a kernel event. Set name and event type.
- *
- *  Return pointer to structure or NULL.
+ * Return pointer to structure or NULL.
  */
 struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
 {
@@ -225,11 +216,9 @@ error:
 }
 
 /*
- *  trace_create_kernel_metadata
- *
- *  Allocate and initialize a kernel metadata.
+ * Allocate and initialize a kernel metadata.
  *
- *  Return pointer to structure or NULL.
+ * Return pointer to structure or NULL.
  */
 struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
 {
@@ -246,8 +235,8 @@ struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
 
 	/* Set default attributes */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	chan->attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
-	chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+	chan->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+	chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
 	chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 	chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
 	chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
@@ -269,12 +258,10 @@ error:
 }
 
 /*
- *  trace_create_kernel_stream
+ * Allocate and initialize a kernel stream. The stream is set to ACTIVE_FD by
+ * default.
  *
- *  Allocate and initialize a kernel stream. The stream is set to ACTIVE_FD by
- *  default.
- *
- *  Return pointer to structure or NULL.
+ * Return pointer to structure or NULL.
  */
 struct ltt_kernel_stream *trace_create_kernel_stream(void)
 {
@@ -297,6 +284,9 @@ error:
 	return NULL;
 }
 
+/*
+ * Cleanup kernel stream structure.
+ */
 void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream)
 {
 	DBG("[trace] Closing stream fd %d", stream->fd);
@@ -309,6 +299,9 @@ void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream)
 	free(stream);
 }
 
+/*
+ * Cleanup kernel event structure.
+ */
 void trace_destroy_kernel_event(struct ltt_kernel_event *event)
 {
 	DBG("[trace] Closing event fd %d", event->fd);
@@ -322,6 +315,9 @@ void trace_destroy_kernel_event(struct ltt_kernel_event *event)
 	free(event);
 }
 
+/*
+ * Cleanup kernel channel structure.
+ */
 void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
 {
 	struct ltt_kernel_stream *stream, *stmp;
@@ -349,6 +345,9 @@ void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
 	free(channel);
 }
 
+/*
+ * Cleanup kernel metadata structure.
+ */
 void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata)
 {
 	DBG("[trace] Closing metadata fd %d", metadata->fd);
@@ -360,6 +359,9 @@ void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata)
 	free(metadata);
 }
 
+/*
+ * Cleanup kernel session structure 
+ */
 void trace_destroy_kernel_session(struct ltt_kernel_session *session)
 {
 	struct ltt_kernel_channel *channel, *ctmp;