X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=77e5e9859e7f51099964f4002b932faf98531984;hb=5a32ce54ebf73b297a0bbccfe88c36994e15dcc4;hp=e193f4377734d1a47a8d881125de8d93befe0cc3;hpb=601252cfa07fa29f15c769fe3f4cf4419311d6f9;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index e193f437..77e5e985 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -51,6 +51,7 @@
 #include <wrapper/poll.h>
 #include <wrapper/file.h>
 #include <wrapper/kref.h>
+#include <lttng-string-utils.h>
 #include <lttng-abi.h>
 #include <lttng-abi-old.h>
 #include <lttng-events.h>
@@ -396,7 +397,7 @@ int lttng_abi_create_channel(struct file *session_file,
 		fops = &lttng_metadata_fops;
 		break;
 	}
-		
+
 	chan_file = anon_inode_getfile("[lttng_channel]",
 				       fops,
 				       NULL, O_RDWR);
@@ -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;
@@ -704,18 +706,6 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 
 		return put_u64(stream->version, arg);
 	}
-	case RING_BUFFER_SNAPSHOT:
-	{
-		/*
-		 * Force the buffer to quiescent so the ring buffer
-		 * don't attempt to perform a SWITCH_FLUSH, which would
-		 * desynchronize the client accounting of the amount of
-		 * data available in the buffer from the ring buffer
-		 * view.
-		 */
-		buf->quiescent = true;
-		break;
-	}
 	default:
 		break;
 	}
@@ -771,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;
@@ -792,18 +783,6 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 
 		return put_u64(stream->version, arg);
 	}
-	case RING_BUFFER_SNAPSHOT:
-	{
-		/*
-		 * Force the buffer to quiescent so the ring buffer
-		 * don't attempt to perform a SWITCH_FLUSH, which would
-		 * desynchronize the client accounting of the amount of
-		 * data available in the buffer from the ring buffer
-		 * view.
-		 */
-		buf->quiescent = true;
-		break;
-	}
 	default:
 		break;
 	}
@@ -998,8 +977,11 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
 		goto notransport;
 	}
 
-	if (!lttng_kref_get(&session->metadata_cache->refcount))
+	if (!lttng_kref_get(&session->metadata_cache->refcount)) {
+		ret = -EOVERFLOW;
 		goto kref_error;
+	}
+
 	ret = lttng_abi_create_stream_fd(channel_file, stream_priv,
 			&lttng_metadata_ring_buffer_file_operations);
 	if (ret < 0)
@@ -1065,8 +1047,12 @@ int lttng_abi_create_event(struct file *channel_file,
 			|| event_param->instrumentation == LTTNG_KERNEL_SYSCALL) {
 		struct lttng_enabler *enabler;
 
-		if (event_param->name[strlen(event_param->name) - 1] == '*') {
-			enabler = lttng_enabler_create(LTTNG_ENABLER_WILDCARD,
+		if (strutils_is_star_glob_pattern(event_param->name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
+			enabler = lttng_enabler_create(LTTNG_ENABLER_STAR_GLOB,
 				event_param, channel);
 		} else {
 			enabler = lttng_enabler_create(LTTNG_ENABLER_NAME,
@@ -1743,7 +1729,7 @@ int __init lttng_abi_init(void)
 	lttng_clock_ref();
 	lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
 					&lttng_fops, NULL);
-	
+
 	if (!lttng_proc_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");
 		ret = -ENOMEM;