X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=d3742be16e944c55adac4ab339bb021854b5ef96;hp=4d2870addacbcb515e0fe1a8042752c2d5fb158f;hb=fdd9eb17f6b6928771744bb40bb2283ce3340033;hpb=3e230f922d67f7a47b66631f7a8cf458002b3727

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 4d2870add..d3742be16 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -35,10 +35,8 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 {
 	struct ltt_kernel_channel *chan;
 
-	if (session == NULL) {
-		ERR("Undefine session");
-		goto error;
-	}
+	assert(session);
+	assert(name);
 
 	DBG("Trying to find channel %s", name);
 
@@ -49,7 +47,6 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 		}
 	}
 
-error:
 	return NULL;
 }
 
@@ -61,10 +58,8 @@ struct ltt_kernel_event *trace_kernel_get_event_by_name(
 {
 	struct ltt_kernel_event *ev;
 
-	if (channel == NULL) {
-		ERR("Undefine channel");
-		goto error;
-	}
+	assert(name);
+	assert(channel);
 
 	cds_list_for_each_entry(ev, &channel->events_list.head, list) {
 		if (strcmp(name, ev->event->name) == 0) {
@@ -74,7 +69,6 @@ struct ltt_kernel_event *trace_kernel_get_event_by_name(
 		}
 	}
 
-error:
 	return NULL;
 }
 
@@ -85,7 +79,6 @@ error:
  */
 struct ltt_kernel_session *trace_kernel_create_session(char *path)
 {
-	int ret;
 	struct ltt_kernel_session *lks = NULL;
 
 	/* Allocate a new ltt kernel session */
@@ -117,6 +110,8 @@ struct ltt_kernel_session *trace_kernel_create_session(char *path)
 	lks->tmp_consumer = NULL;
 
 	if (path && strlen(path) > 0) {
+		int ret;
+
 		/* Use the default consumer output which is the tracing session path. */
 		ret = snprintf(lks->consumer->dst.trace_path, PATH_MAX,
 				"%s" DEFAULT_KERNEL_TRACE_DIR, path);
@@ -148,10 +143,12 @@ alloc_error:
  * Return pointer to structure or NULL.
  */
 struct ltt_kernel_channel *trace_kernel_create_channel(
-		struct lttng_channel *chan, char *path)
+		struct lttng_channel *chan)
 {
 	struct ltt_kernel_channel *lkc;
 
+	assert(chan);
+
 	lkc = zmalloc(sizeof(struct ltt_kernel_channel));
 	if (lkc == NULL) {
 		PERROR("ltt_kernel_channel zmalloc");
@@ -190,6 +187,8 @@ struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
 	struct ltt_kernel_event *lke;
 	struct lttng_kernel_event *attr;
 
+	assert(ev);
+
 	lke = zmalloc(sizeof(struct ltt_kernel_event));
 	attr = zmalloc(sizeof(struct lttng_kernel_event));
 	if (lke == NULL || attr == NULL) {
@@ -243,7 +242,6 @@ struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
 	lke->fd = -1;
 	lke->event = attr;
 	lke->enabled = 1;
-	lke->ctx = NULL;
 
 	return lke;
 
@@ -302,6 +300,8 @@ struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 	int ret;
 	struct ltt_kernel_stream *lks;
 
+	assert(name);
+
 	lks = zmalloc(sizeof(struct ltt_kernel_stream));
 	if (lks == NULL) {
 		PERROR("kernel stream zmalloc");
@@ -331,11 +331,13 @@ error:
  */
 void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
 {
-	int ret;
+	assert(stream);
 
 	DBG("[trace] Closing stream fd %d", stream->fd);
 	/* Close kernel fd */
 	if (stream->fd >= 0) {
+		int ret;
+
 		ret = close(stream->fd);
 		if (ret) {
 			PERROR("close");
@@ -352,9 +354,11 @@ void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
  */
 void trace_kernel_destroy_event(struct ltt_kernel_event *event)
 {
-	int ret;
+	assert(event);
 
 	if (event->fd >= 0) {
+		int ret;
+
 		DBG("[trace] Closing event fd %d", event->fd);
 		/* Close kernel fd */
 		ret = close(event->fd);
@@ -369,7 +373,6 @@ void trace_kernel_destroy_event(struct ltt_kernel_event *event)
 	cds_list_del(&event->list);
 
 	free(event->event);
-	free(event->ctx);
 	free(event);
 }
 
@@ -382,6 +385,8 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
 	struct ltt_kernel_event *event, *etmp;
 	int ret;
 
+	assert(channel);
+
 	DBG("[trace] Closing channel fd %d", channel->fd);
 	/* Close kernel fd */
 	if (channel->fd >= 0) {
@@ -414,11 +419,13 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
  */
 void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
 {
-	int ret;
+	assert(metadata);
 
 	DBG("[trace] Closing metadata fd %d", metadata->fd);
 	/* Close kernel fd */
 	if (metadata->fd >= 0) {
+		int ret;
+
 		ret = close(metadata->fd);
 		if (ret) {
 			PERROR("close");
@@ -437,6 +444,8 @@ void trace_kernel_destroy_session(struct ltt_kernel_session *session)
 	struct ltt_kernel_channel *channel, *ctmp;
 	int ret;
 
+	assert(session);
+
 	DBG("[trace] Closing session fd %d", session->fd);
 	/* Close kernel fds */
 	if (session->fd >= 0) {