projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add CPU hotplug notifier for ltt debugfs ABI, add pollwait exclusive wrapper
[lttng-modules.git]
/
ltt-debugfs-abi.c
diff --git
a/ltt-debugfs-abi.c
b/ltt-debugfs-abi.c
index 1314c663e77e321fc32bc638d0183bacc74f727a..fb6c789f1e0da0f4aa32bba7775fb86d439b90f0 100644
(file)
--- a/
ltt-debugfs-abi.c
+++ b/
ltt-debugfs-abi.c
@@
-32,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"
@@
-551,8
+552,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
*
@@
-565,11
+564,11
@@
unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
unsigned int mask = 0;
if (file->f_mode & FMODE_READ) {
unsigned int mask = 0;
if (file->f_mode & FMODE_READ) {
- poll_wait_set_exclusive(wait);
- poll_wait(file, &channel->notify_wait, wait);
+ init_poll_funcptr(wait, wrapper_pollwait_exclusive);
+ 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_finalized(channel->chan))
return POLLHUP;
else
return POLLIN | POLLRDNORM;
return POLLHUP;
else
return POLLIN | POLLRDNORM;
@@
-577,7
+576,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)
@@
-591,10
+589,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,
This page took
0.025091 seconds
and
4
git commands to generate.