X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt-debugfs-abi.c;h=6327d09a65d713fde5e6dd36dbf269163f9ad257;hb=a181050f402c41239e5537b89c66e0349af65d61;hp=e3f5b55df1219bb2f9ae76313d6532d0bb712f9e;hpb=a33e44a60b7128349043753e53affba8ebc40716;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index e3f5b55d..6327d09a 100644
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -159,6 +159,16 @@ long lttng_abi_add_context(struct file *file,
 		return lttng_add_prio_to_ctx(ctx);
 	case LTTNG_KERNEL_CONTEXT_NICE:
 		return lttng_add_nice_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VPID:
+		return lttng_add_vpid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_TID:
+		return lttng_add_tid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VTID:
+		return lttng_add_vtid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_PPID:
+		return lttng_add_ppid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VPPID:
+		return lttng_add_vppid_to_ctx(ctx);
 	case LTTNG_KERNEL_CONTEXT_PERF_COUNTER:
 		context_param.u.perf_counter.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
 		return lttng_add_perf_counter_to_ctx(context_param.u.perf_counter.type,
@@ -186,6 +196,8 @@ long lttng_abi_add_context(struct file *file,
  *		Returns the LTTng kernel tracer version
  *	LTTNG_KERNEL_TRACEPOINT_LIST
  *		Returns a file descriptor listing available tracepoints
+ *	LTTNG_KERNEL_WAIT_QUIESCENT
+ *		Returns after all previously running probes have completed
  *
  * The returned session will be deleted when its file descriptor is closed.
  */
@@ -200,6 +212,9 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				(struct lttng_kernel_tracer_version __user *) arg);
 	case LTTNG_KERNEL_TRACEPOINT_LIST:
 		return lttng_abi_tracepoint_list();
+	case LTTNG_KERNEL_WAIT_QUIESCENT:
+		synchronize_trace();
+		return 0;
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -330,10 +345,10 @@ fd_error:
  *	This ioctl implements lttng commands:
  *	LTTNG_KERNEL_CHANNEL
  *		Returns a LTTng channel file descriptor
- *	LTTNG_KERNEL_SESSION_START
- *		Starts tracing session
- *	LTTNG_KERNEL_SESSION_STOP
- *		Stops tracing session
+ *	LTTNG_KERNEL_ENABLE
+ *		Enables tracing for a session (weak enable)
+ *	LTTNG_KERNEL_DISABLE
+ *		Disables tracing for a session (strong disable)
  *	LTTNG_KERNEL_METADATA
  *		Returns a LTTng metadata file descriptor
  *
@@ -350,9 +365,11 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				(struct lttng_kernel_channel __user *) arg,
 				PER_CPU_CHANNEL);
 	case LTTNG_KERNEL_SESSION_START:
-		return ltt_session_start(session);
+	case LTTNG_KERNEL_ENABLE:
+		return ltt_session_enable(session);
 	case LTTNG_KERNEL_SESSION_STOP:
-		return ltt_session_stop(session);
+	case LTTNG_KERNEL_DISABLE:
+		return ltt_session_disable(session);
 	case LTTNG_KERNEL_METADATA:
 		return lttng_abi_create_channel(file,
 				(struct lttng_kernel_channel __user *) arg,
@@ -506,6 +523,10 @@ fd_error:
  *		Returns an event file descriptor or failure.
  *	LTTNG_KERNEL_CONTEXT
  *		Prepend a context field to each event in the channel
+ *	LTTNG_KERNEL_ENABLE
+ *		Enable recording for events in this channel (weak enable)
+ *	LTTNG_KERNEL_DISABLE
+ *		Disable recording for events in this channel (strong disable)
  *
  * Channel and event file descriptors also hold a reference on the session.
  */
@@ -523,6 +544,10 @@ long lttng_channel_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_abi_add_context(file,
 				(struct lttng_kernel_context __user *) arg,
 				&channel->ctx, channel->session);
+	case LTTNG_KERNEL_ENABLE:
+		return ltt_channel_enable(channel);
+	case LTTNG_KERNEL_DISABLE:
+		return ltt_channel_disable(channel);
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -614,13 +639,12 @@ static const struct file_operations lttng_metadata_fops = {
  *	@arg: command arg
  *
  *	This ioctl implements lttng commands:
- *      LTTNG_KERNEL_STREAM
- *              Returns an event stream file descriptor or failure.
- *              (typically, one event stream records events from one CPU)
- *	LTTNG_KERNEL_EVENT
- *		Returns an event file descriptor or failure.
  *	LTTNG_KERNEL_CONTEXT
  *		Prepend a context field to each record of this event
+ *	LTTNG_KERNEL_ENABLE
+ *		Enable recording for this event (weak enable)
+ *	LTTNG_KERNEL_DISABLE
+ *		Disable recording for this event (strong disable)
  */
 static
 long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
@@ -632,6 +656,10 @@ long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_abi_add_context(file,
 				(struct lttng_kernel_context __user *) arg,
 				&event->ctx, event->chan->session);
+	case LTTNG_KERNEL_ENABLE:
+		return ltt_event_enable(event);
+	case LTTNG_KERNEL_DISABLE:
+		return ltt_event_disable(event);
 	default:
 		return -ENOIOCTLCMD;
 	}