X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=a57e5e9f2acb699c899bba2fc2e1ccc5797be053;hb=0cc0962c46fa0f66ba6834345518cf145f019faf;hp=ab1e832b6ca6d2688a7cace9667615f33d4fe304;hpb=cc845d7556081ea01b8a5cab74151038cf7bb31a;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index ab1e832b..a57e5e9f 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -56,6 +56,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>
 
 /*
@@ -684,6 +685,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;
@@ -760,6 +762,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;
@@ -1725,6 +1728,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);
 
@@ -1737,6 +1746,7 @@ int __init lttng_abi_init(void)
 	return 0;
 
 error:
+	lttng_tp_mempool_destroy();
 	lttng_clock_unref();
 	return ret;
 }
@@ -1744,6 +1754,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);