projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relayd add_stream command handle tracefile rotation
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index ca1e98be1f359dc08dfba8a41d3c61832ad23d9f..2cf9ac1a894bfe7d35f31b038fa44e3343ce8e4a 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-35,6
+35,7
@@
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
#include <common/relayd/relayd.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
#include <common/relayd/relayd.h>
+#include <common/utils.h>
#include "kernel-consumer.h"
#include "kernel-consumer.h"
@@
-132,7
+133,9
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
msg.u.channel.session_id, msg.u.channel.pathname,
msg.u.channel.name, msg.u.channel.uid, msg.u.channel.gid,
new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
msg.u.channel.session_id, msg.u.channel.pathname,
msg.u.channel.name, msg.u.channel.uid, msg.u.channel.gid,
- msg.u.channel.relayd_id, msg.u.channel.output);
+ msg.u.channel.relayd_id, msg.u.channel.output,
+ msg.u.channel.tracefile_size,
+ msg.u.channel.tracefile_count);
if (new_channel == NULL) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
goto end_nosignal;
if (new_channel == NULL) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
goto end_nosignal;
@@
-153,12
+156,12
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
if (ctx->on_recv_channel != NULL) {
ret = ctx->on_recv_channel(new_channel);
if (ret == 0) {
if (ctx->on_recv_channel != NULL) {
ret = ctx->on_recv_channel(new_channel);
if (ret == 0) {
- consumer_add_channel(new_channel);
+ consumer_add_channel(new_channel
, ctx
);
} else if (ret < 0) {
goto end_nosignal;
}
} else {
} else if (ret < 0) {
goto end_nosignal;
}
} else {
- consumer_add_channel(new_channel);
+ consumer_add_channel(new_channel
, ctx
);
}
goto end_nosignal;
}
}
goto end_nosignal;
}
@@
-259,7
+262,9
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
ret = relayd_add_stream(&relayd->control_sock,
new_stream->name, new_stream->chan->pathname,
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
ret = relayd_add_stream(&relayd->control_sock,
new_stream->name, new_stream->chan->pathname,
- &new_stream->relayd_stream_id);
+ &new_stream->relayd_stream_id,
+ new_stream->chan->tracefile_size,
+ new_stream->chan->tracefile_count);
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
if (ret < 0) {
consumer_del_stream(new_stream, NULL);
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
if (ret < 0) {
consumer_del_stream(new_stream, NULL);
@@
-501,26
+506,19
@@
end:
int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
{
int ret;
int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
{
int ret;
- char full_path[PATH_MAX];
assert(stream);
assert(stream);
- ret = snprintf(full_path, sizeof(full_path), "%s/%s",
- stream->chan->pathname, stream->name);
- if (ret < 0) {
- PERROR("snprintf on_recv_stream");
- goto error;
- }
-
- /* Opening the tracefile in write mode */
+ /* Don't create anything if this is set for streaming. */
if (stream->net_seq_idx == (uint64_t) -1ULL) {
if (stream->net_seq_idx == (uint64_t) -1ULL) {
- ret = run_as_open(full_path, O_WRONLY | O_CREAT | O_TRUNC,
- S_IRWXU|S_IRWXG|S_IRWXO, stream->uid, stream->gid);
+ ret = utils_create_stream_file(stream->chan->pathname, stream->name,
+ stream->chan->tracefile_size, stream->tracefile_count_current,
+ stream->uid, stream->gid);
if (ret < 0) {
if (ret < 0) {
- PERROR("open kernel stream path %s", full_path);
goto error;
}
stream->out_fd = ret;
goto error;
}
stream->out_fd = ret;
+ stream->tracefile_size_current = 0;
}
if (stream->output == LTTNG_EVENT_MMAP) {
}
if (stream->output == LTTNG_EVENT_MMAP) {
This page took
0.027481 seconds
and
5
git commands to generate.