projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: leftover use of channel fd as identifier
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 8892e76dc144f7963be7813647df05e5f9006da1..158a12a3633fa54100c81d0f5179b6c2c9d9c68e 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-34,6
+34,12
@@
#include "kern-modules.h"
#include "utils.h"
#include "kern-modules.h"
#include "utils.h"
+/*
+ * Key used to reference a channel between the sessiond and the consumer. This
+ * is only read and updated with the session_list lock held.
+ */
+static uint64_t next_kernel_channel_key;
+
/*
* Add context on a kernel channel.
*
/*
* Add context on a kernel channel.
*
@@
-169,8
+175,10
@@
int kernel_create_channel(struct ltt_kernel_session *session,
cds_list_add(&lkc->list, &session->channel_list.head);
session->channel_count++;
lkc->session = session;
cds_list_add(&lkc->list, &session->channel_list.head);
session->channel_count++;
lkc->session = session;
+ lkc->key = ++next_kernel_channel_key;
- DBG("Kernel channel %s created (fd: %d)", lkc->channel->name, lkc->fd);
+ DBG("Kernel channel %s created (fd: %d, key: %" PRIu64 ")",
+ lkc->channel->name, lkc->fd, lkc->key);
return 0;
return 0;
@@
-291,7
+299,8
@@
int kernel_disable_channel(struct ltt_kernel_channel *chan)
}
chan->enabled = 0;
}
chan->enabled = 0;
- DBG("Kernel channel %s disabled (fd: %d)", chan->channel->name, chan->fd);
+ DBG("Kernel channel %s disabled (fd: %d, key: %" PRIu64 ")",
+ chan->channel->name, chan->fd, chan->key);
return 0;
return 0;
@@
-315,7
+324,8
@@
int kernel_enable_channel(struct ltt_kernel_channel *chan)
}
chan->enabled = 1;
}
chan->enabled = 1;
- DBG("Kernel channel %s enabled (fd: %d)", chan->channel->name, chan->fd);
+ DBG("Kernel channel %s enabled (fd: %d, key: %" PRIu64 ")",
+ chan->channel->name, chan->fd, chan->key);
return 0;
return 0;
@@
-814,38
+824,38
@@
error:
/*
* Get kernel version and validate it.
*/
/*
* Get kernel version and validate it.
*/
-int kernel_validate_version(int tracer_fd)
+int kernel_validate_version(int tracer_fd,
+ struct lttng_kernel_tracer_version *version,
+ struct lttng_kernel_tracer_abi_version *abi_version)
{
int ret;
{
int ret;
- struct lttng_kernel_tracer_version version;
- struct lttng_kernel_tracer_abi_version abi_version;
- ret = kernctl_tracer_version(tracer_fd,
&
version);
+ ret = kernctl_tracer_version(tracer_fd, version);
if (ret < 0) {
ERR("Failed to retrieve the lttng-modules version");
goto error;
}
/* Validate version */
if (ret < 0) {
ERR("Failed to retrieve the lttng-modules version");
goto error;
}
/* Validate version */
- if (version
.
major != VERSION_MAJOR) {
+ if (version
->
major != VERSION_MAJOR) {
ERR("Kernel tracer major version (%d) is not compatible with lttng-tools major version (%d)",
ERR("Kernel tracer major version (%d) is not compatible with lttng-tools major version (%d)",
- version
.
major, VERSION_MAJOR);
+ version
->
major, VERSION_MAJOR);
goto error_version;
}
goto error_version;
}
- ret = kernctl_tracer_abi_version(tracer_fd,
&
abi_version);
+ ret = kernctl_tracer_abi_version(tracer_fd, abi_version);
if (ret < 0) {
ERR("Failed to retrieve lttng-modules ABI version");
goto error;
}
if (ret < 0) {
ERR("Failed to retrieve lttng-modules ABI version");
goto error;
}
- if (abi_version
.
major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
+ if (abi_version
->
major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
- abi_version
.major, abi_version.
minor,
+ abi_version
->major, abi_version->
minor,
LTTNG_MODULES_ABI_MAJOR_VERSION);
goto error;
}
DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
LTTNG_MODULES_ABI_MAJOR_VERSION);
goto error;
}
DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
- version
.major, version.
minor,
- abi_version
.major, abi_version.
minor);
+ version
->major, version->
minor,
+ abi_version
->major, abi_version->
minor);
return 0;
error_version:
return 0;
error_version:
@@
-1029,7
+1039,7
@@
int kernel_snapshot_record(struct ltt_kernel_session *ksess,
/* For each channel, ask the consumer to snapshot it. */
cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
/* For each channel, ask the consumer to snapshot it. */
cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
- ret = consumer_snapshot_channel(socket, chan->
fd
, output, 0,
+ ret = consumer_snapshot_channel(socket, chan->
key
, output, 0,
ksess->uid, ksess->gid,
DEFAULT_KERNEL_TRACE_DIR, wait,
nb_packets_per_stream);
ksess->uid, ksess->gid,
DEFAULT_KERNEL_TRACE_DIR, wait,
nb_packets_per_stream);
This page took
0.068459 seconds
and
4
git commands to generate.