projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: close wait_fd on kernel tracing
[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 0de73443e1bee5c51549e608d20b1548cb007257..d9850144bacf975d405164d071bd0353327470de 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-34,7
+34,9
@@
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
+#include <common/pipe.h>
#include <common/relayd/relayd.h>
#include <common/relayd/relayd.h>
+#include <common/utils.h>
#include "kernel-consumer.h"
#include "kernel-consumer.h"
@@
-132,7
+134,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;
@@
-164,7
+168,8
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
}
case LTTNG_CONSUMER_ADD_STREAM:
{
}
case LTTNG_CONSUMER_ADD_STREAM:
{
- int fd, stream_pipe;
+ int fd;
+ struct lttng_pipe *stream_pipe;
struct consumer_relayd_sock_pair *relayd = NULL;
struct lttng_consumer_stream *new_stream;
struct lttng_consumer_channel *channel;
struct consumer_relayd_sock_pair *relayd = NULL;
struct lttng_consumer_stream *new_stream;
struct lttng_consumer_channel *channel;
@@
-259,7
+264,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);
@@
-282,18
+289,16
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
/* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
/* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
- stream_pipe = ctx->consumer_metadata_pipe
[1]
;
+ stream_pipe = ctx->consumer_metadata_pipe;
} else {
} else {
- stream_pipe = ctx->consumer_data_pipe
[1]
;
+ stream_pipe = ctx->consumer_data_pipe;
}
}
- do {
- ret = write(stream_pipe, &new_stream, sizeof(new_stream));
- } while (ret < 0 && errno == EINTR);
+ ret = lttng_pipe_write(stream_pipe, &new_stream, sizeof(new_stream));
if (ret < 0) {
if (ret < 0) {
-
PERRO
R("Consumer write %s stream to pipe %d",
+
ER
R("Consumer write %s stream to pipe %d",
new_stream->metadata_flag ? "metadata" : "data",
new_stream->metadata_flag ? "metadata" : "data",
-
stream_pipe
);
+
lttng_pipe_get_writefd(stream_pipe)
);
consumer_del_stream(new_stream, NULL);
goto end_nosignal;
}
consumer_del_stream(new_stream, NULL);
goto end_nosignal;
}
@@
-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.025862 seconds
and
4
git commands to generate.