projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: propagate archive id to the consumer daemon on stream creation
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index cbad61144b1d1ec391cf1649a85672751d1311be..cb5743fad626ba7a47e8130487ad94efa2172b07 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-147,7
+147,8
@@
static struct lttng_consumer_channel *allocate_channel(uint64_t session_id,
*/
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
struct lttng_consumer_channel *channel,
*/
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
struct lttng_consumer_channel *channel,
- struct lttng_consumer_local_data *ctx, int *_alloc_ret)
+ struct lttng_consumer_local_data *ctx, int *_alloc_ret,
+ uint64_t trace_archive_id)
{
int alloc_ret;
struct lttng_consumer_stream *stream = NULL;
{
int alloc_ret;
struct lttng_consumer_stream *stream = NULL;
@@
-166,7
+167,8
@@
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
cpu,
&alloc_ret,
channel->type,
cpu,
&alloc_ret,
channel->type,
- channel->monitor);
+ channel->monitor,
+ trace_archive_id);
if (stream == NULL) {
switch (alloc_ret) {
case -ENOENT:
if (stream == NULL) {
switch (alloc_ret) {
case -ENOENT:
@@
-267,7
+269,8
@@
end:
* Return 0 on success else a negative value.
*/
static int create_ust_streams(struct lttng_consumer_channel *channel,
* Return 0 on success else a negative value.
*/
static int create_ust_streams(struct lttng_consumer_channel *channel,
- struct lttng_consumer_local_data *ctx)
+ struct lttng_consumer_local_data *ctx,
+ uint64_t trace_archive_id)
{
int ret, cpu = 0;
struct ustctl_consumer_stream *ustream;
{
int ret, cpu = 0;
struct ustctl_consumer_stream *ustream;
@@
-298,7
+301,8
@@
static int create_ust_streams(struct lttng_consumer_channel *channel,
}
/* Allocate consumer stream object. */
}
/* Allocate consumer stream object. */
- stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret);
+ stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret,
+ trace_archive_id);
if (!stream) {
goto error_alloc;
}
if (!stream) {
goto error_alloc;
}
@@
-407,9
+411,7
@@
error_shm_open:
return -1;
}
return -1;
}
-static int open_ust_stream_fd(struct lttng_consumer_channel *channel,
- struct ustctl_consumer_channel_attr *attr,
- int cpu)
+static int open_ust_stream_fd(struct lttng_consumer_channel *channel, int cpu)
{
char shm_path[PATH_MAX];
int ret;
{
char shm_path[PATH_MAX];
int ret;
@@
-464,7
+466,7
@@
static int create_ust_channel(struct lttng_consumer_channel *channel,
goto error_alloc;
}
for (i = 0; i < nr_stream_fds; i++) {
goto error_alloc;
}
for (i = 0; i < nr_stream_fds; i++) {
- stream_fds[i] = open_ust_stream_fd(channel,
attr,
i);
+ stream_fds[i] = open_ust_stream_fd(channel, i);
if (stream_fds[i] < 0) {
ret = -1;
goto error_open;
if (stream_fds[i] < 0) {
ret = -1;
goto error_open;
@@
-641,9
+643,10
@@
error:
* Return 0 on success or else, a negative value is returned and the channel
* MUST be destroyed by consumer_del_channel().
*/
* Return 0 on success or else, a negative value is returned and the channel
* MUST be destroyed by consumer_del_channel().
*/
-static int ask_channel(struct lttng_consumer_local_data *ctx,
int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
struct lttng_consumer_channel *channel,
struct lttng_consumer_channel *channel,
- struct ustctl_consumer_channel_attr *attr)
+ struct ustctl_consumer_channel_attr *attr,
+ uint64_t trace_archive_id)
{
int ret;
{
int ret;
@@
-684,7
+687,7
@@
static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
}
/* Open all streams for this channel. */
}
/* Open all streams for this channel. */
- ret = create_ust_streams(channel, ctx);
+ ret = create_ust_streams(channel, ctx
, trace_archive_id
);
if (ret < 0) {
goto end;
}
if (ret < 0) {
goto end;
}
@@
-988,7
+991,8
@@
end:
* Returns 0 on success, < 0 on error
*/
static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
* Returns 0 on success, < 0 on error
*/
static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
- struct lttng_consumer_local_data *ctx)
+ struct lttng_consumer_local_data *ctx,
+ uint64_t trace_archive_id)
{
int ret = 0;
struct lttng_consumer_channel *metadata_channel;
{
int ret = 0;
struct lttng_consumer_channel *metadata_channel;
@@
-1028,7
+1032,7
@@
static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
* The metadata stream is NOT created in no monitor mode when the channel
* is created on a sessiond ask channel command.
*/
* The metadata stream is NOT created in no monitor mode when the channel
* is created on a sessiond ask channel command.
*/
- ret = create_ust_streams(metadata_channel, ctx);
+ ret = create_ust_streams(metadata_channel, ctx
, trace_archive_id
);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-1083,7
+1087,8
@@
error:
* Returns 0 on success, < 0 on error
*/
static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
* Returns 0 on success, < 0 on error
*/
static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
- uint64_t nb_packets_per_stream, struct lttng_consumer_local_data *ctx)
+ uint64_t nb_packets_per_stream,
+ struct lttng_consumer_local_data *ctx)
{
int ret;
unsigned use_relayd = 0;
{
int ret;
unsigned use_relayd = 0;
@@
-1494,7
+1499,8
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
health_code_update();
- ret = ask_channel(ctx, sock, channel, &attr);
+ ret = ask_channel(ctx, channel, &attr,
+ msg.u.ask_channel.trace_archive_id);
if (ret < 0) {
goto end_channel_error;
}
if (ret < 0) {
goto end_channel_error;
}
@@
-1749,7
+1755,8
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
ret = snapshot_metadata(msg.u.snapshot_channel.key,
msg.u.snapshot_channel.pathname,
msg.u.snapshot_channel.relayd_id,
ret = snapshot_metadata(msg.u.snapshot_channel.key,
msg.u.snapshot_channel.pathname,
msg.u.snapshot_channel.relayd_id,
- ctx);
+ ctx,
+ msg.u.snapshot_channel.trace_archive_id);
if (ret < 0) {
ERR("Snapshot metadata failed");
ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
if (ret < 0) {
ERR("Snapshot metadata failed");
ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
@@
-3120,7
+3127,7
@@
int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
request.key = channel->key;
DBG("Sending metadata request to sessiond, session id %" PRIu64
request.key = channel->key;
DBG("Sending metadata request to sessiond, session id %" PRIu64
- ", per-pid %" PRIu64 ", app UID %u and channe
k
key %" PRIu64,
+ ", per-pid %" PRIu64 ", app UID %u and channe
l
key %" PRIu64,
request.session_id, request.session_id_per_pid, request.uid,
request.key);
request.session_id, request.session_id_per_pid, request.uid,
request.key);
This page took
0.027363 seconds
and
5
git commands to generate.