Update ABI to select the output method

[lttng-modules.git] / ltt-debugfs-abi.c

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 53cc35d673c5e65a943e2dfea6ccbec96918ba8d..0aa2cec03381ea0f58d121f1136cc6e7544b9455 100644 (file)
--- 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;
        }
@@ -274,12 +289,24 @@ int lttng_abi_create_channel(struct file *session_file,
        }
        switch (channel_type) {
        case PER_CPU_CHANNEL:
-               transport_name = chan_param.overwrite ?
-                       "relay-overwrite" : "relay-discard";
+               if (chan_param.output == LTTNG_KERNEL_SPLICE) {
+                       transport_name = chan_param.overwrite ?
+                               "relay-overwrite" : "relay-discard";
+               } else if (chan_param.output == LTTNG_KERNEL_MMAP) {
+                       transport_name = chan_param.overwrite ?
+                               "relay-overwrite-mmap" : "relay-discard-mmap";
+               } else {
+                       return -EINVAL;
+               }
                fops = &lttng_channel_fops;
                break;
        case METADATA_CHANNEL:
-               transport_name = "relay-metadata";
+               if (chan_param.output == LTTNG_KERNEL_SPLICE)
+                       transport_name = "relay-metadata";
+               else if (chan_param.output == LTTNG_KERNEL_MMAP)
+                       transport_name = "relay-metadata-mmap";
+               else
+                       return -EINVAL;
                fops = &lttng_metadata_fops;
                break;
        default: