projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Use MAX_RT_PRIO offset in sched_wakeup_template
[lttng-modules.git]
/
lttng-abi.c
diff --git
a/lttng-abi.c
b/lttng-abi.c
index d4c5ea0fc8938d1d31b6639357546b24a5d19ffa..3572e58ef8f64e948680c63d05cf1c23280d2821 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-130,10
+130,6
@@
int lttng_abi_tracepoint_list(void)
if (ret < 0)
goto open_error;
fd_install(file_fd, tracepoint_list_file);
if (ret < 0)
goto open_error;
fd_install(file_fd, tracepoint_list_file);
- if (file_fd < 0) {
- ret = file_fd;
- goto fd_error;
- }
return file_fd;
open_error:
return file_fd;
open_error:
@@
-174,10
+170,6
@@
int lttng_abi_syscall_list(void)
if (ret < 0)
goto open_error;
fd_install(file_fd, syscall_list_file);
if (ret < 0)
goto open_error;
fd_install(file_fd, syscall_list_file);
- if (file_fd < 0) {
- ret = file_fd;
- goto fd_error;
- }
return file_fd;
open_error:
return file_fd;
open_error:
@@
-240,6
+232,8
@@
long lttng_abi_add_context(struct file *file,
return lttng_add_procname_to_ctx(ctx);
case LTTNG_KERNEL_CONTEXT_HOSTNAME:
return lttng_add_hostname_to_ctx(ctx);
return lttng_add_procname_to_ctx(ctx);
case LTTNG_KERNEL_CONTEXT_HOSTNAME:
return lttng_add_hostname_to_ctx(ctx);
+ case LTTNG_KERNEL_CONTEXT_CPU_ID:
+ return lttng_add_cpu_id_to_ctx(ctx);
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-620,9
+614,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;
@@
-920,7
+916,6
@@
int lttng_abi_open_metadata_stream(struct file *channel_file)
metadata_stream->priv = buf;
stream_priv = metadata_stream;
metadata_stream->transport = channel->transport;
metadata_stream->priv = buf;
stream_priv = metadata_stream;
metadata_stream->transport = channel->transport;
- mutex_init(&metadata_stream->lock);
/*
* Since life-time of metadata cache differs from that of
/*
* Since life-time of metadata cache differs from that of
@@
-1283,8
+1278,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;
This page took
0.025452 seconds
and
4
git commands to generate.