X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=c45c10f42c747fa4d553d08d18900b5bca1a9e08;hb=31b00794a30ea27fdf0c14f4885df500fb28a099;hp=3e4a88c1f83b74ab77f08b52493943d2d3035ef0;hpb=1e8d53a9f3e8b6d7a7434a442d449e3ccf9c12b0;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 3e4a88c1..c45c10f4 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -55,6 +55,7 @@
 #include <lttng-abi-old.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
+#include <lttng-tp-mempool.h>
 #include <lib/ringbuffer/frontend_types.h>
 
 /*
@@ -683,6 +684,7 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 		 */
 		return -ENOSYS;
 	}
+	case RING_BUFFER_FLUSH_EMPTY:	/* Fall-through. */
 	case RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
@@ -759,6 +761,7 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 		 */
 		return -ENOSYS;
 	}
+	case RING_BUFFER_FLUSH_EMPTY:	/* Fall-through. */
 	case RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
@@ -1720,6 +1723,12 @@ int __init lttng_abi_init(void)
 
 	wrapper_vmalloc_sync_all();
 	lttng_clock_ref();
+
+	ret = lttng_tp_mempool_init();
+	if (ret) {
+		goto error;
+	}
+
 	lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
 					&lttng_fops, NULL);
 	
@@ -1732,6 +1741,7 @@ int __init lttng_abi_init(void)
 	return 0;
 
 error:
+	lttng_tp_mempool_destroy();
 	lttng_clock_unref();
 	return ret;
 }
@@ -1739,6 +1749,7 @@ error:
 /* No __exit annotation because used by init error path too. */
 void lttng_abi_exit(void)
 {
+	lttng_tp_mempool_destroy();
 	lttng_clock_unref();
 	if (lttng_proc_dentry)
 		remove_proc_entry("lttng", NULL);