X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt-events.c;h=98cdf01f9d912071a38470ee602d954adf364c00;hb=c6dfdf6f8d56f882064922f623c7efb64c8f4010;hp=61b9de6af5a649829252f9e8b24e553078b36534;hpb=4f1c3952cad3ae2b2286d34b1c568632c18dfb77;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index 61b9de6a..98cdf01f 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -23,6 +23,7 @@ static DEFINE_MUTEX(sessions_mutex);
 static struct kmem_cache *event_cache;
 
 static void _ltt_event_destroy(struct ltt_event *event);
+static void _ltt_channel_destroy(struct ltt_channel *chan);
 static int _ltt_event_unregister(struct ltt_event *event);
 static
 int _ltt_event_metadata_statedump(struct ltt_session *session,
@@ -191,6 +192,7 @@ active:
 /*
  * Only used internally at session destruction.
  */
+static
 void _ltt_channel_destroy(struct ltt_channel *chan)
 {
 	chan->ops->channel_destroy(chan->chan);
@@ -308,19 +310,6 @@ int _ltt_event_unregister(struct ltt_event *event)
 	return ret;
 }
 
-/*
- * Used when an event FD is released.
- */
-int ltt_event_unregister(struct ltt_event *event)
-{
-	int ret;
-
-	mutex_lock(&sessions_mutex);
-	ret = ltt_event_unregister(event);
-	mutex_unlock(&sessions_mutex);
-	return ret;
-}
-
 /*
  * Only used internally at session destruction.
  */
@@ -600,7 +589,7 @@ int _ltt_stream_packet_context_declare(struct ltt_session *session)
 		"	uint32_t content_size;\n"
 		"	uint32_t packet_size;\n"
 		"	uint32_t cpu_id;\n"
-		"};\n"
+		"};\n\n"
 		);
 }
 
@@ -691,9 +680,10 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		"		uint32_t magic;\n"
 		"		uint8_t  uuid[16];\n"
 		"		uint32_t stream_id;\n"
-		"	};\n",
+		"	};\n"
 		"};\n\n",
 		ltt_alignof(uint8_t) * CHAR_BIT,
+		ltt_alignof(uint16_t) * CHAR_BIT,
 		ltt_alignof(uint32_t) * CHAR_BIT,
 		ltt_alignof(uint64_t) * CHAR_BIT,
 		CTF_VERSION_MAJOR,