projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add enable/disable per event/channel/session (new ABI)
[lttng-modules.git]
/
ltt-debugfs-abi.c
diff --git
a/ltt-debugfs-abi.c
b/ltt-debugfs-abi.c
index afdc09a61ad8eb0dcc1e39be75ec8be03d6a2169..53cc35d673c5e65a943e2dfea6ccbec96918ba8d 100644
(file)
--- a/
ltt-debugfs-abi.c
+++ b/
ltt-debugfs-abi.c
@@
-20,6
+20,8
@@
* - Takes an instrumentation source as parameter
* - e.g. tracepoints, dynamic_probes...
* - Takes instrumentation source specific arguments.
* - Takes an instrumentation source as parameter
* - e.g. tracepoints, dynamic_probes...
* - Takes instrumentation source specific arguments.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-30,6
+32,7
@@
#include <linux/slab.h>
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/ringbuffer/vfs.h"
#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"
#include "ltt-debugfs-abi.h"
#include "ltt-events.h"
#include "ltt-tracer.h"
@@
-152,8
+155,16
@@
long lttng_abi_add_context(struct file *file,
switch (context_param.ctx) {
case LTTNG_KERNEL_CONTEXT_PID:
return lttng_add_pid_to_ctx(ctx);
switch (context_param.ctx) {
case LTTNG_KERNEL_CONTEXT_PID:
return lttng_add_pid_to_ctx(ctx);
+ case LTTNG_KERNEL_CONTEXT_PRIO:
+ return lttng_add_prio_to_ctx(ctx);
+ case LTTNG_KERNEL_CONTEXT_NICE:
+ return lttng_add_nice_to_ctx(ctx);
case LTTNG_KERNEL_CONTEXT_PERF_COUNTER:
case LTTNG_KERNEL_CONTEXT_PERF_COUNTER:
- return -ENOSYS;
+ 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,
+ context_param.u.perf_counter.config,
+ context_param.u.perf_counter.name,
+ ctx);
case LTTNG_KERNEL_CONTEXT_COMM:
return lttng_add_comm_to_ctx(ctx);
default:
case LTTNG_KERNEL_CONTEXT_COMM:
return lttng_add_comm_to_ctx(ctx);
default:
@@
-319,10
+330,10
@@
fd_error:
* This ioctl implements lttng commands:
* LTTNG_KERNEL_CHANNEL
* Returns a LTTng channel file descriptor
* 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
*
* LTTNG_KERNEL_METADATA
* Returns a LTTng metadata file descriptor
*
@@
-339,9
+350,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:
(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:
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,
case LTTNG_KERNEL_METADATA:
return lttng_abi_create_channel(file,
(struct lttng_kernel_channel __user *) arg,
@@
-495,6
+508,10
@@
fd_error:
* Returns an event file descriptor or failure.
* LTTNG_KERNEL_CONTEXT
* Prepend a context field to each event in the channel
* 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.
*/
*
* Channel and event file descriptors also hold a reference on the session.
*/
@@
-512,6
+529,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);
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;
}
default:
return -ENOIOCTLCMD;
}
@@
-541,8
+562,6
@@
long lttng_metadata_ioctl(struct file *file, unsigned int cmd, unsigned long arg
}
}
}
}
-/* TODO: poll */
-#if 0
/**
* lttng_channel_poll - lttng stream addition/removal monitoring
*
/**
* lttng_channel_poll - lttng stream addition/removal monitoring
*
@@
-556,10
+575,12
@@
unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
if (file->f_mode & FMODE_READ) {
poll_wait_set_exclusive(wait);
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
return POLLIN | POLLRDNORM;
return POLLHUP;
else
return POLLIN | POLLRDNORM;
@@
-567,7
+588,6
@@
unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
return mask;
}
return mask;
}
-#endif //0
static
int lttng_channel_release(struct inode *inode, struct file *file)
static
int lttng_channel_release(struct inode *inode, struct file *file)
@@
-581,10
+601,7
@@
int lttng_channel_release(struct inode *inode, struct file *file)
static const struct file_operations lttng_channel_fops = {
.release = lttng_channel_release,
static const struct file_operations lttng_channel_fops = {
.release = lttng_channel_release,
-/* TODO */
-#if 0
.poll = lttng_channel_poll,
.poll = lttng_channel_poll,
-#endif //0
.unlocked_ioctl = lttng_channel_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = lttng_channel_ioctl,
.unlocked_ioctl = lttng_channel_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = lttng_channel_ioctl,
@@
-607,13
+624,12
@@
static const struct file_operations lttng_metadata_fops = {
* @arg: command arg
*
* This ioctl implements lttng commands:
* @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_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)
*/
static
long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
@@
-625,6
+641,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);
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;
}
default:
return -ENOIOCTLCMD;
}
This page took
0.024679 seconds
and
4
git commands to generate.