X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=77e5e9859e7f51099964f4002b932faf98531984;hb=df93abe8f183251659200d95429dc67e8cfe8e4a;hp=c14cc82b2baca8aa6e2012a6f46d8079fa58f2ec;hpb=0d2c717fd11a41a578a4370516605066f4371b89;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index c14cc82b..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);
@@ -569,6 +570,8 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_session_list_tracker_pids(session);
 	case LTTNG_KERNEL_SESSION_METADATA_REGEN:
 		return lttng_session_metadata_regenerate(session);
+	case LTTNG_KERNEL_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -681,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;
@@ -757,6 +761,28 @@ 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;
+		struct lib_ring_buffer *buf = stream->priv;
+		struct channel *chan = buf->backend.chan;
+
+		/*
+		 * Before doing the actual ring buffer flush, write up to one
+		 * packet of metadata in the ring buffer.
+		 */
+		ret = lttng_metadata_output_channel(stream, chan);
+		if (ret < 0)
+			goto err;
+		break;
+	}
+	case RING_BUFFER_GET_METADATA_VERSION:
+	{
+		struct lttng_metadata_stream *stream = filp->private_data;
+
+		return put_u64(stream->version, arg);
+	}
 	default:
 		break;
 	}
@@ -774,12 +800,6 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 				cmd, arg);
 		break;
 	}
-	case RING_BUFFER_GET_METADATA_VERSION:
-	{
-		struct lttng_metadata_stream *stream = filp->private_data;
-
-		return put_u64(stream->version, arg);
-	}
 	default:
 		break;
 	}
@@ -957,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)
@@ -1024,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,
@@ -1702,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;