X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=3986217f73f242ea1ded61a37c9bb9391dc212bc;hb=585e5dcc4bf017c03b86dc84371f9c6170e12785;hp=2b72621cf2d6fccacaed54e3c8dde1159500ddb5;hpb=3e75e2a7f7693107faa58606538f80a4faf73fe6;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 2b72621c..3986217f 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -214,8 +214,10 @@ void lttng_session_destroy(struct lttng_session *session)
 		BUG_ON(chan->channel_type == METADATA_CHANNEL);
 		_lttng_channel_destroy(chan);
 	}
+	mutex_lock(&session->metadata_cache->lock);
 	list_for_each_entry(metadata_stream, &session->metadata_cache->metadata_stream, list)
 		_lttng_metadata_channel_hangup(metadata_stream);
+	mutex_unlock(&session->metadata_cache->lock);
 	lttng_id_tracker_destroy(&session->pid_tracker, false);
 	lttng_id_tracker_destroy(&session->vpid_tracker, false);
 	lttng_id_tracker_destroy(&session->uid_tracker, false);
@@ -500,12 +502,12 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 		goto active;	/* Refuse to add channel to active session */
 	transport = lttng_transport_find(transport_name);
 	if (!transport) {
-		printk(KERN_WARNING "LTTng transport %s not found\n",
+		printk(KERN_WARNING "LTTng: transport %s not found\n",
 		       transport_name);
 		goto notransport;
 	}
 	if (!try_module_get(transport->owner)) {
-		printk(KERN_WARNING "LTT : Can't lock transport module.\n");
+		printk(KERN_WARNING "LTTng: Can't lock transport module.\n");
 		goto notransport;
 	}
 	chan = kzalloc(sizeof(struct lttng_channel), GFP_KERNEL);
@@ -1318,7 +1320,7 @@ void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler)
 					NULL, NULL, desc,
 					LTTNG_KERNEL_TRACEPOINT);
 			if (!event) {
-				printk(KERN_INFO "Unable to create event %s\n",
+				printk(KERN_INFO "LTTng: Unable to create event %s\n",
 					probe_desc->event_desc[i]->name);
 			}
 		}
@@ -1700,9 +1702,9 @@ void lttng_metadata_end(struct lttng_session *session)
 	if (atomic_dec_return(&session->metadata_cache->producing) == 0) {
 		struct lttng_metadata_stream *stream;
 
-		mutex_unlock(&session->metadata_cache->lock);
 		list_for_each_entry(stream, &session->metadata_cache->metadata_stream, list)
 			wake_up_interruptible(&stream->read_wait);
+		mutex_unlock(&session->metadata_cache->lock);
 	}
 }
 
@@ -1721,7 +1723,7 @@ int lttng_metadata_printf(struct lttng_session *session,
 	size_t len;
 	va_list ap;
 
-	WARN_ON_ONCE(!READ_ONCE(session->active));
+	WARN_ON_ONCE(!LTTNG_READ_ONCE(session->active));
 
 	va_start(ap, fmt);
 	str = kvasprintf(GFP_KERNEL, fmt, ap);
@@ -2345,7 +2347,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session,
 {
 	int ret = 0;
 
-	if (event->metadata_dumped || !READ_ONCE(session->active))
+	if (event->metadata_dumped || !LTTNG_READ_ONCE(session->active))
 		return 0;
 	if (chan->channel_type == METADATA_CHANNEL)
 		return 0;
@@ -2417,7 +2419,7 @@ int _lttng_channel_metadata_statedump(struct lttng_session *session,
 {
 	int ret = 0;
 
-	if (chan->metadata_dumped || !READ_ONCE(session->active))
+	if (chan->metadata_dumped || !LTTNG_READ_ONCE(session->active))
 		return 0;
 
 	if (chan->channel_type == METADATA_CHANNEL)
@@ -2644,7 +2646,7 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 	struct lttng_event *event;
 	int ret = 0;
 
-	if (!READ_ONCE(session->active))
+	if (!LTTNG_READ_ONCE(session->active))
 		return 0;
 
 	lttng_metadata_begin(session);