projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.5.6
[lttng-modules.git]
/
lttng-abi.c
diff --git
a/lttng-abi.c
b/lttng-abi.c
index a373504c26d0d7804e22cafb4e0dcac3747212a9..5bd7621f13ff5c503a55a4e57ada5b5e5678a451 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-43,6
+43,7
@@
#include <linux/file.h>
#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/file.h>
#include <linux/uaccess.h>
#include <linux/slab.h>
+#include <linux/err.h>
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/ringbuffer/vfs.h"
#include "wrapper/ringbuffer/backend.h"
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/ringbuffer/vfs.h"
#include "wrapper/ringbuffer/backend.h"
@@
-540,9
+541,11
@@
unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
if (finalized)
mask |= POLLHUP;
if (finalized)
mask |= POLLHUP;
+ mutex_lock(&stream->metadata_cache->lock);
if (stream->metadata_cache->metadata_written >
stream->metadata_out)
mask |= POLLIN;
if (stream->metadata_cache->metadata_written >
stream->metadata_out)
mask |= POLLIN;
+ mutex_unlock(&stream->metadata_cache->lock);
}
return mask;
}
return mask;
@@
-912,8
+915,9
@@
int lttng_abi_create_event(struct file *channel_file,
* will stay invariant for the rest of the session.
*/
event = lttng_event_create(channel, event_param, NULL, NULL);
* will stay invariant for the rest of the session.
*/
event = lttng_event_create(channel, event_param, NULL, NULL);
- if (!event) {
- ret = -EINVAL;
+ WARN_ON_ONCE(!event);
+ if (IS_ERR(event)) {
+ ret = PTR_ERR(event);
goto event_error;
}
event_file->private_data = event;
goto event_error;
}
event_file->private_data = event;
@@
-1194,8
+1198,8
@@
int lttng_metadata_channel_release(struct inode *inode, struct file *file)
struct lttng_channel *channel = file->private_data;
if (channel) {
struct lttng_channel *channel = file->private_data;
if (channel) {
- lttng_metadata_channel_destroy(channel);
fput(channel->session->file);
fput(channel->session->file);
+ lttng_metadata_channel_destroy(channel);
}
return 0;
}
return 0;
@@
-1345,7
+1349,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
struct lib_ring_buffer *buf = filp->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
struct lib_ring_buffer *buf = filp->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
-
struct lttng_channel *lttng_chan = channel_get_private(chan)
;
+
const struct lttng_channel_ops *ops = chan->backend.priv_ops
;
int ret;
if (atomic_read(&chan->record_disabled))
int ret;
if (atomic_read(&chan->record_disabled))
@@
-1356,9
+1360,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+ ret = ops->timestamp_begin(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1367,9
+1369,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+ ret = ops->timestamp_end(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1378,9
+1378,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t ed;
{
uint64_t ed;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+ ret = ops->events_discarded(config, buf, &ed);
if (ret < 0)
goto error;
return put_u64(ed, arg);
if (ret < 0)
goto error;
return put_u64(ed, arg);
@@
-1389,9
+1387,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t cs;
{
uint64_t cs;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->content_size(config, buf, &cs);
+ ret = ops->content_size(config, buf, &cs);
if (ret < 0)
goto error;
return put_u64(cs, arg);
if (ret < 0)
goto error;
return put_u64(cs, arg);
@@
-1400,9
+1396,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t ps;
{
uint64_t ps;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->packet_size(config, buf, &ps);
+ ret = ops->packet_size(config, buf, &ps);
if (ret < 0)
goto error;
return put_u64(ps, arg);
if (ret < 0)
goto error;
return put_u64(ps, arg);
@@
-1411,9
+1405,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t si;
{
uint64_t si;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->stream_id(config, buf, &si);
+ ret = ops->stream_id(config, buf, &si);
if (ret < 0)
goto error;
return put_u64(si, arg);
if (ret < 0)
goto error;
return put_u64(si, arg);
@@
-1422,9
+1414,7
@@
static long lttng_stream_ring_buffer_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->current_timestamp(config, buf, &ts);
+ ret = ops->current_timestamp(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1445,7
+1435,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
struct lib_ring_buffer *buf = filp->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
struct lib_ring_buffer *buf = filp->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
-
struct lttng_channel *lttng_chan = channel_get_private(chan)
;
+
const struct lttng_channel_ops *ops = chan->backend.priv_ops
;
int ret;
if (atomic_read(&chan->record_disabled))
int ret;
if (atomic_read(&chan->record_disabled))
@@
-1456,9
+1446,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->timestamp_begin(config, buf, &ts);
+ ret = ops->timestamp_begin(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1467,9
+1455,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->timestamp_end(config, buf, &ts);
+ ret = ops->timestamp_end(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1478,9
+1464,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t ed;
{
uint64_t ed;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->events_discarded(config, buf, &ed);
+ ret = ops->events_discarded(config, buf, &ed);
if (ret < 0)
goto error;
return put_u64(ed, arg);
if (ret < 0)
goto error;
return put_u64(ed, arg);
@@
-1489,9
+1473,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t cs;
{
uint64_t cs;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->content_size(config, buf, &cs);
+ ret = ops->content_size(config, buf, &cs);
if (ret < 0)
goto error;
return put_u64(cs, arg);
if (ret < 0)
goto error;
return put_u64(cs, arg);
@@
-1500,9
+1482,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t ps;
{
uint64_t ps;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->packet_size(config, buf, &ps);
+ ret = ops->packet_size(config, buf, &ps);
if (ret < 0)
goto error;
return put_u64(ps, arg);
if (ret < 0)
goto error;
return put_u64(ps, arg);
@@
-1511,9
+1491,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t si;
{
uint64_t si;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->stream_id(config, buf, &si);
+ ret = ops->stream_id(config, buf, &si);
if (ret < 0)
goto error;
return put_u64(si, arg);
if (ret < 0)
goto error;
return put_u64(si, arg);
@@
-1522,9
+1500,7
@@
static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
{
uint64_t ts;
{
uint64_t ts;
- if (!lttng_chan->ops)
- goto error;
- ret = lttng_chan->ops->current_timestamp(config, buf, &ts);
+ ret = ops->current_timestamp(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
if (ret < 0)
goto error;
return put_u64(ts, arg);
@@
-1581,7
+1557,8
@@
error:
return ret;
}
return ret;
}
-void __exit lttng_abi_exit(void)
+/* No __exit annotation because used by init error path too. */
+void lttng_abi_exit(void)
{
if (lttng_proc_dentry)
remove_proc_entry("lttng", NULL);
{
if (lttng_proc_dentry)
remove_proc_entry("lttng", NULL);
This page took
0.026073 seconds
and
4
git commands to generate.