Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
* [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode
@ 2011-06-29 20:53 Julien Desfossez
  2011-06-29 20:53 ` [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method Julien Desfossez
  2011-06-29 21:10 ` [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Mathieu Desnoyers
  0 siblings, 2 replies; 4+ messages in thread
From: Julien Desfossez @ 2011-06-29 20:53 UTC (permalink / raw)


Three new modules to configure the ring buffer output for mmap support.
Add the RING_BUFFER_OUTPUT_TEMPLATE macro to configure the ring buffer
output instead of being splice by default.

Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>
---
 Makefile                                |    3 +++
 ltt-ring-buffer-client-discard.c        |    1 +
 ltt-ring-buffer-client-mmap-discard.c   |   21 +++++++++++++++++++++
 ltt-ring-buffer-client-mmap-overwrite.c |   21 +++++++++++++++++++++
 ltt-ring-buffer-client-overwrite.c      |    1 +
 ltt-ring-buffer-client.h                |    2 +-
 ltt-ring-buffer-metadata-client.c       |    1 +
 ltt-ring-buffer-metadata-client.h       |    2 +-
 ltt-ring-buffer-metadata-mmap-client.c  |   21 +++++++++++++++++++++
 9 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 ltt-ring-buffer-client-mmap-discard.c
 create mode 100644 ltt-ring-buffer-client-mmap-overwrite.c
 create mode 100644 ltt-ring-buffer-metadata-mmap-client.c

diff --git a/Makefile b/Makefile
index 9a0effc..1384ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ ifneq ($(CONFIG_TRACEPOINTS),)
 obj-m += ltt-ring-buffer-client-discard.o
 obj-m += ltt-ring-buffer-client-overwrite.o
 obj-m += ltt-ring-buffer-metadata-client.o
+obj-m += ltt-ring-buffer-client-mmap-discard.o
+obj-m += ltt-ring-buffer-client-mmap-overwrite.o
+obj-m += ltt-ring-buffer-metadata-mmap-client.o
 
 obj-m += ltt-relay.o
 ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
diff --git a/ltt-ring-buffer-client-discard.c b/ltt-ring-buffer-client-discard.c
index ca7dfa8..eafcf45 100644
--- a/ltt-ring-buffer-client-discard.c
+++ b/ltt-ring-buffer-client-discard.c
@@ -13,6 +13,7 @@
 
 #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
 #define RING_BUFFER_MODE_TEMPLATE_STRING	"discard"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
 #include "ltt-ring-buffer-client.h"
 
 MODULE_LICENSE("GPL and additional rights");
diff --git a/ltt-ring-buffer-client-mmap-discard.c b/ltt-ring-buffer-client-mmap-discard.c
new file mode 100644
index 0000000..29819a7
--- /dev/null
+++ b/ltt-ring-buffer-client-mmap-discard.c
@@ -0,0 +1,21 @@
+/*
+ * ltt-ring-buffer-client-discard.c
+ *
+ * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
+ *
+ * LTTng lib ring buffer client (discard mode).
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#include <linux/module.h>
+#include "ltt-tracer.h"
+
+#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
+#define RING_BUFFER_MODE_TEMPLATE_STRING	"discard-mmap"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
+#include "ltt-ring-buffer-client.h"
+
+MODULE_LICENSE("GPL and additional rights");
+MODULE_AUTHOR("Mathieu Desnoyers");
+MODULE_DESCRIPTION("LTTng Ring Buffer Client Discard Mode");
diff --git a/ltt-ring-buffer-client-mmap-overwrite.c b/ltt-ring-buffer-client-mmap-overwrite.c
new file mode 100644
index 0000000..741aa7b
--- /dev/null
+++ b/ltt-ring-buffer-client-mmap-overwrite.c
@@ -0,0 +1,21 @@
+/*
+ * ltt-ring-buffer-client-overwrite.c
+ *
+ * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
+ *
+ * LTTng lib ring buffer client (overwrite mode).
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#include <linux/module.h>
+#include "ltt-tracer.h"
+
+#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_OVERWRITE
+#define RING_BUFFER_MODE_TEMPLATE_STRING	"overwrite-mmap"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
+#include "ltt-ring-buffer-client.h"
+
+MODULE_LICENSE("GPL and additional rights");
+MODULE_AUTHOR("Mathieu Desnoyers");
+MODULE_DESCRIPTION("LTTng Ring Buffer Client Overwrite Mode");
diff --git a/ltt-ring-buffer-client-overwrite.c b/ltt-ring-buffer-client-overwrite.c
index ec3b1cf..9811941 100644
--- a/ltt-ring-buffer-client-overwrite.c
+++ b/ltt-ring-buffer-client-overwrite.c
@@ -13,6 +13,7 @@
 
 #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_OVERWRITE
 #define RING_BUFFER_MODE_TEMPLATE_STRING	"overwrite"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
 #include "ltt-ring-buffer-client.h"
 
 MODULE_LICENSE("GPL and additional rights");
diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 6389c98..39587dd 100644
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -361,7 +361,7 @@ static const struct lib_ring_buffer_config client_config = {
 	.sync = RING_BUFFER_SYNC_PER_CPU,
 	.mode = RING_BUFFER_MODE_TEMPLATE,
 	.backend = RING_BUFFER_PAGE,
-	.output = RING_BUFFER_SPLICE,
+	.output = RING_BUFFER_OUTPUT_TEMPLATE,
 	.oops = RING_BUFFER_OOPS_CONSISTENCY,
 	.ipi = RING_BUFFER_IPI_BARRIER,
 	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
diff --git a/ltt-ring-buffer-metadata-client.c b/ltt-ring-buffer-metadata-client.c
index 64f4408..ac6fe78 100644
--- a/ltt-ring-buffer-metadata-client.c
+++ b/ltt-ring-buffer-metadata-client.c
@@ -13,6 +13,7 @@
 
 #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
 #define RING_BUFFER_MODE_TEMPLATE_STRING	"metadata"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
 #include "ltt-ring-buffer-metadata-client.h"
 
 MODULE_LICENSE("GPL and additional rights");
diff --git a/ltt-ring-buffer-metadata-client.h b/ltt-ring-buffer-metadata-client.h
index 6d92e42..43a711c 100644
--- a/ltt-ring-buffer-metadata-client.h
+++ b/ltt-ring-buffer-metadata-client.h
@@ -142,7 +142,7 @@ static const struct lib_ring_buffer_config client_config = {
 	.sync = RING_BUFFER_SYNC_GLOBAL,
 	.mode = RING_BUFFER_MODE_TEMPLATE,
 	.backend = RING_BUFFER_PAGE,
-	.output = RING_BUFFER_SPLICE,
+	.output = RING_BUFFER_OUTPUT_TEMPLATE,
 	.oops = RING_BUFFER_OOPS_CONSISTENCY,
 	.ipi = RING_BUFFER_IPI_BARRIER,
 	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
diff --git a/ltt-ring-buffer-metadata-mmap-client.c b/ltt-ring-buffer-metadata-mmap-client.c
new file mode 100644
index 0000000..5cad3f9
--- /dev/null
+++ b/ltt-ring-buffer-metadata-mmap-client.c
@@ -0,0 +1,21 @@
+/*
+ * ltt-ring-buffer-metadata-client.c
+ *
+ * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
+ *
+ * LTTng lib ring buffer metadta client.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#include <linux/module.h>
+#include "ltt-tracer.h"
+
+#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
+#define RING_BUFFER_MODE_TEMPLATE_STRING	"metadata-mmap"
+#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
+#include "ltt-ring-buffer-metadata-client.h"
+
+MODULE_LICENSE("GPL and additional rights");
+MODULE_AUTHOR("Mathieu Desnoyers");
+MODULE_DESCRIPTION("LTTng Ring Buffer Metadata Client");
-- 
1.7.4.1





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method
  2011-06-29 20:53 [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Julien Desfossez
@ 2011-06-29 20:53 ` Julien Desfossez
  2011-06-29 21:11   ` Mathieu Desnoyers
  2011-06-29 21:10 ` [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Mathieu Desnoyers
  1 sibling, 1 reply; 4+ messages in thread
From: Julien Desfossez @ 2011-06-29 20:53 UTC (permalink / raw)


Add output selection in lttng_kernel_channel to use mmap or splice.

Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>
---
 ltt-debugfs-abi.c |   18 +++++++++++++++---
 ltt-debugfs-abi.h |    9 +++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 6327d09..0aa2cec 100644
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -289,12 +289,24 @@ int lttng_abi_create_channel(struct file *session_file,
 	}
 	switch (channel_type) {
 	case PER_CPU_CHANNEL:
-		transport_name = chan_param.overwrite ?
-			"relay-overwrite" : "relay-discard";
+		if (chan_param.output == LTTNG_KERNEL_SPLICE) {
+			transport_name = chan_param.overwrite ?
+				"relay-overwrite" : "relay-discard";
+		} else if (chan_param.output == LTTNG_KERNEL_MMAP) {
+			transport_name = chan_param.overwrite ?
+				"relay-overwrite-mmap" : "relay-discard-mmap";
+		} else {
+			return -EINVAL;
+		}
 		fops = &lttng_channel_fops;
 		break;
 	case METADATA_CHANNEL:
-		transport_name = "relay-metadata";
+		if (chan_param.output == LTTNG_KERNEL_SPLICE)
+			transport_name = "relay-metadata";
+		else if (chan_param.output == LTTNG_KERNEL_MMAP)
+			transport_name = "relay-metadata-mmap";
+		else
+			return -EINVAL;
 		fops = &lttng_metadata_fops;
 		break;
 	default:
diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index e3a7160..e333655 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -22,6 +22,14 @@ enum lttng_kernel_instrumentation {
 };
 
 /*
+ * LTTng consumer mode
+ */
+enum lttng_kernel_output {
+	LTTNG_KERNEL_SPLICE,
+	LTTNG_KERNEL_MMAP,
+};
+
+/*
  * LTTng DebugFS ABI structures.
  */
 
@@ -31,6 +39,7 @@ struct lttng_kernel_channel {
 	uint64_t num_subbuf;
 	unsigned int switch_timer_interval;	/* usecs */
 	unsigned int read_timer_interval;	/* usecs */
+	enum lttng_kernel_output output;	/* splice, mmap */
 };
 
 /*
-- 
1.7.4.1





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode
  2011-06-29 20:53 [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Julien Desfossez
  2011-06-29 20:53 ` [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method Julien Desfossez
@ 2011-06-29 21:10 ` Mathieu Desnoyers
  1 sibling, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2011-06-29 21:10 UTC (permalink / raw)


* Julien Desfossez (julien.desfossez at polymtl.ca) wrote:
> Three new modules to configure the ring buffer output for mmap support.
> Add the RING_BUFFER_OUTPUT_TEMPLATE macro to configure the ring buffer
> output instead of being splice by default.

merged, thanks!

Mathieu

> 
> Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>
> ---
>  Makefile                                |    3 +++
>  ltt-ring-buffer-client-discard.c        |    1 +
>  ltt-ring-buffer-client-mmap-discard.c   |   21 +++++++++++++++++++++
>  ltt-ring-buffer-client-mmap-overwrite.c |   21 +++++++++++++++++++++
>  ltt-ring-buffer-client-overwrite.c      |    1 +
>  ltt-ring-buffer-client.h                |    2 +-
>  ltt-ring-buffer-metadata-client.c       |    1 +
>  ltt-ring-buffer-metadata-client.h       |    2 +-
>  ltt-ring-buffer-metadata-mmap-client.c  |   21 +++++++++++++++++++++
>  9 files changed, 71 insertions(+), 2 deletions(-)
>  create mode 100644 ltt-ring-buffer-client-mmap-discard.c
>  create mode 100644 ltt-ring-buffer-client-mmap-overwrite.c
>  create mode 100644 ltt-ring-buffer-metadata-mmap-client.c
> 
> diff --git a/Makefile b/Makefile
> index 9a0effc..1384ce4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -8,6 +8,9 @@ ifneq ($(CONFIG_TRACEPOINTS),)
>  obj-m += ltt-ring-buffer-client-discard.o
>  obj-m += ltt-ring-buffer-client-overwrite.o
>  obj-m += ltt-ring-buffer-metadata-client.o
> +obj-m += ltt-ring-buffer-client-mmap-discard.o
> +obj-m += ltt-ring-buffer-client-mmap-overwrite.o
> +obj-m += ltt-ring-buffer-metadata-mmap-client.o
>  
>  obj-m += ltt-relay.o
>  ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
> diff --git a/ltt-ring-buffer-client-discard.c b/ltt-ring-buffer-client-discard.c
> index ca7dfa8..eafcf45 100644
> --- a/ltt-ring-buffer-client-discard.c
> +++ b/ltt-ring-buffer-client-discard.c
> @@ -13,6 +13,7 @@
>  
>  #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
>  #define RING_BUFFER_MODE_TEMPLATE_STRING	"discard"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
>  #include "ltt-ring-buffer-client.h"
>  
>  MODULE_LICENSE("GPL and additional rights");
> diff --git a/ltt-ring-buffer-client-mmap-discard.c b/ltt-ring-buffer-client-mmap-discard.c
> new file mode 100644
> index 0000000..29819a7
> --- /dev/null
> +++ b/ltt-ring-buffer-client-mmap-discard.c
> @@ -0,0 +1,21 @@
> +/*
> + * ltt-ring-buffer-client-discard.c
> + *
> + * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> + *
> + * LTTng lib ring buffer client (discard mode).
> + *
> + * Dual LGPL v2.1/GPL v2 license.
> + */
> +
> +#include <linux/module.h>
> +#include "ltt-tracer.h"
> +
> +#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
> +#define RING_BUFFER_MODE_TEMPLATE_STRING	"discard-mmap"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
> +#include "ltt-ring-buffer-client.h"
> +
> +MODULE_LICENSE("GPL and additional rights");
> +MODULE_AUTHOR("Mathieu Desnoyers");
> +MODULE_DESCRIPTION("LTTng Ring Buffer Client Discard Mode");
> diff --git a/ltt-ring-buffer-client-mmap-overwrite.c b/ltt-ring-buffer-client-mmap-overwrite.c
> new file mode 100644
> index 0000000..741aa7b
> --- /dev/null
> +++ b/ltt-ring-buffer-client-mmap-overwrite.c
> @@ -0,0 +1,21 @@
> +/*
> + * ltt-ring-buffer-client-overwrite.c
> + *
> + * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> + *
> + * LTTng lib ring buffer client (overwrite mode).
> + *
> + * Dual LGPL v2.1/GPL v2 license.
> + */
> +
> +#include <linux/module.h>
> +#include "ltt-tracer.h"
> +
> +#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_OVERWRITE
> +#define RING_BUFFER_MODE_TEMPLATE_STRING	"overwrite-mmap"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
> +#include "ltt-ring-buffer-client.h"
> +
> +MODULE_LICENSE("GPL and additional rights");
> +MODULE_AUTHOR("Mathieu Desnoyers");
> +MODULE_DESCRIPTION("LTTng Ring Buffer Client Overwrite Mode");
> diff --git a/ltt-ring-buffer-client-overwrite.c b/ltt-ring-buffer-client-overwrite.c
> index ec3b1cf..9811941 100644
> --- a/ltt-ring-buffer-client-overwrite.c
> +++ b/ltt-ring-buffer-client-overwrite.c
> @@ -13,6 +13,7 @@
>  
>  #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_OVERWRITE
>  #define RING_BUFFER_MODE_TEMPLATE_STRING	"overwrite"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
>  #include "ltt-ring-buffer-client.h"
>  
>  MODULE_LICENSE("GPL and additional rights");
> diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
> index 6389c98..39587dd 100644
> --- a/ltt-ring-buffer-client.h
> +++ b/ltt-ring-buffer-client.h
> @@ -361,7 +361,7 @@ static const struct lib_ring_buffer_config client_config = {
>  	.sync = RING_BUFFER_SYNC_PER_CPU,
>  	.mode = RING_BUFFER_MODE_TEMPLATE,
>  	.backend = RING_BUFFER_PAGE,
> -	.output = RING_BUFFER_SPLICE,
> +	.output = RING_BUFFER_OUTPUT_TEMPLATE,
>  	.oops = RING_BUFFER_OOPS_CONSISTENCY,
>  	.ipi = RING_BUFFER_IPI_BARRIER,
>  	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
> diff --git a/ltt-ring-buffer-metadata-client.c b/ltt-ring-buffer-metadata-client.c
> index 64f4408..ac6fe78 100644
> --- a/ltt-ring-buffer-metadata-client.c
> +++ b/ltt-ring-buffer-metadata-client.c
> @@ -13,6 +13,7 @@
>  
>  #define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
>  #define RING_BUFFER_MODE_TEMPLATE_STRING	"metadata"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_SPLICE
>  #include "ltt-ring-buffer-metadata-client.h"
>  
>  MODULE_LICENSE("GPL and additional rights");
> diff --git a/ltt-ring-buffer-metadata-client.h b/ltt-ring-buffer-metadata-client.h
> index 6d92e42..43a711c 100644
> --- a/ltt-ring-buffer-metadata-client.h
> +++ b/ltt-ring-buffer-metadata-client.h
> @@ -142,7 +142,7 @@ static const struct lib_ring_buffer_config client_config = {
>  	.sync = RING_BUFFER_SYNC_GLOBAL,
>  	.mode = RING_BUFFER_MODE_TEMPLATE,
>  	.backend = RING_BUFFER_PAGE,
> -	.output = RING_BUFFER_SPLICE,
> +	.output = RING_BUFFER_OUTPUT_TEMPLATE,
>  	.oops = RING_BUFFER_OOPS_CONSISTENCY,
>  	.ipi = RING_BUFFER_IPI_BARRIER,
>  	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
> diff --git a/ltt-ring-buffer-metadata-mmap-client.c b/ltt-ring-buffer-metadata-mmap-client.c
> new file mode 100644
> index 0000000..5cad3f9
> --- /dev/null
> +++ b/ltt-ring-buffer-metadata-mmap-client.c
> @@ -0,0 +1,21 @@
> +/*
> + * ltt-ring-buffer-metadata-client.c
> + *
> + * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> + *
> + * LTTng lib ring buffer metadta client.
> + *
> + * Dual LGPL v2.1/GPL v2 license.
> + */
> +
> +#include <linux/module.h>
> +#include "ltt-tracer.h"
> +
> +#define RING_BUFFER_MODE_TEMPLATE		RING_BUFFER_DISCARD
> +#define RING_BUFFER_MODE_TEMPLATE_STRING	"metadata-mmap"
> +#define RING_BUFFER_OUTPUT_TEMPLATE		RING_BUFFER_MMAP
> +#include "ltt-ring-buffer-metadata-client.h"
> +
> +MODULE_LICENSE("GPL and additional rights");
> +MODULE_AUTHOR("Mathieu Desnoyers");
> +MODULE_DESCRIPTION("LTTng Ring Buffer Metadata Client");
> -- 
> 1.7.4.1
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com




^ permalink raw reply	[flat|nested] 4+ messages in thread
* [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method
  2011-06-29 20:53 ` [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method Julien Desfossez
@ 2011-06-29 21:11   ` Mathieu Desnoyers
  0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2011-06-29 21:11 UTC (permalink / raw)


* Julien Desfossez (julien.desfossez at polymtl.ca) wrote:
> Add output selection in lttng_kernel_channel to use mmap or splice.
> 

Merged, with a slight change: specified the enum values. Thanks,

Mathieu

> Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>
> ---
>  ltt-debugfs-abi.c |   18 +++++++++++++++---
>  ltt-debugfs-abi.h |    9 +++++++++
>  2 files changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
> index 6327d09..0aa2cec 100644
> --- a/ltt-debugfs-abi.c
> +++ b/ltt-debugfs-abi.c
> @@ -289,12 +289,24 @@ int lttng_abi_create_channel(struct file *session_file,
>  	}
>  	switch (channel_type) {
>  	case PER_CPU_CHANNEL:
> -		transport_name = chan_param.overwrite ?
> -			"relay-overwrite" : "relay-discard";
> +		if (chan_param.output == LTTNG_KERNEL_SPLICE) {
> +			transport_name = chan_param.overwrite ?
> +				"relay-overwrite" : "relay-discard";
> +		} else if (chan_param.output == LTTNG_KERNEL_MMAP) {
> +			transport_name = chan_param.overwrite ?
> +				"relay-overwrite-mmap" : "relay-discard-mmap";
> +		} else {
> +			return -EINVAL;
> +		}
>  		fops = &lttng_channel_fops;
>  		break;
>  	case METADATA_CHANNEL:
> -		transport_name = "relay-metadata";
> +		if (chan_param.output == LTTNG_KERNEL_SPLICE)
> +			transport_name = "relay-metadata";
> +		else if (chan_param.output == LTTNG_KERNEL_MMAP)
> +			transport_name = "relay-metadata-mmap";
> +		else
> +			return -EINVAL;
>  		fops = &lttng_metadata_fops;
>  		break;
>  	default:
> diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
> index e3a7160..e333655 100644
> --- a/ltt-debugfs-abi.h
> +++ b/ltt-debugfs-abi.h
> @@ -22,6 +22,14 @@ enum lttng_kernel_instrumentation {
>  };
>  
>  /*
> + * LTTng consumer mode
> + */
> +enum lttng_kernel_output {
> +	LTTNG_KERNEL_SPLICE,
> +	LTTNG_KERNEL_MMAP,
> +};
> +
> +/*
>   * LTTng DebugFS ABI structures.
>   */
>  
> @@ -31,6 +39,7 @@ struct lttng_kernel_channel {
>  	uint64_t num_subbuf;
>  	unsigned int switch_timer_interval;	/* usecs */
>  	unsigned int read_timer_interval;	/* usecs */
> +	enum lttng_kernel_output output;	/* splice, mmap */
>  };
>  
>  /*
> -- 
> 1.7.4.1
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com




^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-29 21:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-29 20:53 [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Julien Desfossez
2011-06-29 20:53 ` [ltt-dev] [LTTNG-MODULES v2 2/2] Update ABI to select the output method Julien Desfossez
2011-06-29 21:11   ` Mathieu Desnoyers
2011-06-29 21:10 ` [ltt-dev] [LTTNG-MODULES PATCH v2 1/2] Add mmap client mode Mathieu Desnoyers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox