X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-ring-buffer-client.h;h=288cc32509dcde332f3aa3d9eab7b2a39b9b2f32;hb=dd5a0db3ea07c46bee3c1814ef7326736f38a06e;hp=c186c60b4a3eb62f68fef575cd2caf07860eeca0;hpb=461277e79d60d55afc769d76ece385681835d02b;p=lttng-modules.git

diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h
index c186c60b..288cc325 100644
--- a/lttng-ring-buffer-client.h
+++ b/lttng-ring-buffer-client.h
@@ -32,6 +32,8 @@
 #define LTTNG_COMPACT_EVENT_BITS	5
 #define LTTNG_COMPACT_TSC_BITS		27
 
+static struct lttng_transport lttng_relay_transport;
+
 /*
  * Keep the natural field alignment for _each field_ within this structure if
  * you ever add/remove a field from this header. Packed attribute is not used
@@ -486,6 +488,18 @@ static const struct lib_ring_buffer_config client_config = {
 	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
 };
 
+static
+void release_priv_ops(void *priv_ops)
+{
+	module_put(THIS_MODULE);
+}
+
+static
+void lttng_channel_destroy(struct channel *chan)
+{
+	channel_destroy(chan);
+}
+
 static
 struct channel *_channel_create(const char *name,
 				struct lttng_channel *lttng_chan, void *buf_addr,
@@ -493,15 +507,28 @@ struct channel *_channel_create(const char *name,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval)
 {
-	return channel_create(&client_config, name, lttng_chan, buf_addr,
+	struct channel *chan;
+
+	chan = channel_create(&client_config, name, lttng_chan, buf_addr,
 			      subbuf_size, num_subbuf, switch_timer_interval,
 			      read_timer_interval);
-}
+	if (chan) {
+		/*
+		 * Ensure this module is not unloaded before we finish
+		 * using lttng_relay_transport.ops.
+		 */
+		if (!try_module_get(THIS_MODULE)) {
+			printk(KERN_WARNING "LTT : Can't lock transport module.\n");
+			goto error;
+		}
+		chan->backend.priv_ops = &lttng_relay_transport.ops;
+		chan->backend.release_priv_ops = release_priv_ops;
+	}
+	return chan;
 
-static
-void lttng_channel_destroy(struct channel *chan)
-{
-	channel_destroy(chan);
+error:
+	lttng_channel_destroy(chan);
+	return NULL;
 }
 
 static