#include <linux/slab.h>
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/ringbuffer/vfs.h"
+#include "wrapper/poll.h"
#include "ltt-debugfs-abi.h"
#include "ltt-events.h"
#include "ltt-tracer.h"
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,
* 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.
*/
(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;
}
}
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 = <tng_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 = <tng_metadata_fops;
break;
default:
* 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
*
(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,
* 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.
*/
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;
}
}
}
-/* TODO: poll */
-#if 0
/**
* lttng_channel_poll - lttng stream addition/removal monitoring
*
if (file->f_mode & FMODE_READ) {
poll_wait_set_exclusive(wait);
- poll_wait(file, &channel->notify_wait, wait);
+ poll_wait(file, channel->ops->get_hp_wait_queue(channel->chan),
+ wait);
- /* TODO: identify when the channel is being finalized. */
- if (finalized)
+ if (channel->ops->is_disabled(channel->chan))
+ return POLLERR;
+ if (channel->ops->is_finalized(channel->chan))
return POLLHUP;
- else
+ if (channel->ops->buffer_has_read_closed_stream(channel->chan))
return POLLIN | POLLRDNORM;
+ return 0;
}
return mask;
}
-#endif //0
static
int lttng_channel_release(struct inode *inode, struct file *file)
static const struct file_operations lttng_channel_fops = {
.release = lttng_channel_release,
-/* TODO */
-#if 0
.poll = lttng_channel_poll,
-#endif //0
.unlocked_ioctl = lttng_channel_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = lttng_channel_ioctl,
* @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)
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;
}