projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add and support the new hash table library
[lttng-tools.git]
/
liblttng-ustconsumer
/
lttng-ustconsumer.c
diff --git
a/liblttng-ustconsumer/lttng-ustconsumer.c
b/liblttng-ustconsumer/lttng-ustconsumer.c
index f938d3548d9e8ed4ef049333efe1fc1aa16d1a0c..26e680a9cd757d6bc5974dda20d6a30df3ccb9b2 100644
(file)
--- a/
liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/
liblttng-ustconsumer/lttng-ustconsumer.c
@@
-33,6
+33,7
@@
#include <lttng/lttng-ustconsumer.h>
#include <lttng/ust-ctl.h>
#include <lttngerr.h>
#include <lttng/lttng-ustconsumer.h>
#include <lttng/ust-ctl.h>
#include <lttngerr.h>
+#include <runas.h>
extern struct lttng_consumer_global_data consumer_data;
extern int consumer_poll_timeout;
extern struct lttng_consumer_global_data consumer_data;
extern int consumer_poll_timeout;
@@
-215,7
+216,9
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
msg.u.stream.state,
msg.u.stream.mmap_len,
msg.u.stream.output,
msg.u.stream.state,
msg.u.stream.mmap_len,
msg.u.stream.output,
- msg.u.stream.path_name);
+ msg.u.stream.path_name,
+ msg.u.stream.uid,
+ msg.u.stream.gid);
if (new_stream == NULL) {
lttng_consumer_send_error(ctx, CONSUMERD_OUTFD_ERROR);
goto end;
if (new_stream == NULL) {
lttng_consumer_send_error(ctx, CONSUMERD_OUTFD_ERROR);
goto end;
@@
-287,6
+290,7
@@
int lttng_ustconsumer_allocate_channel(struct lttng_consumer_channel *chan)
void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
{
ustctl_flush_buffer(stream->chan->handle, stream->buf, 0);
void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
{
ustctl_flush_buffer(stream->chan->handle, stream->buf, 0);
+ stream->hangup_flush_done = 1;
}
void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
}
void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
@@
-343,12
+347,14
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
stream->wait_fd, stream->key);
/* We can consume the 1 byte written into the wait_fd by UST */
stream->wait_fd, stream->key);
/* We can consume the 1 byte written into the wait_fd by UST */
- do {
- readlen = read(stream->wait_fd, &dummy, 1);
- } while (readlen == -1 && errno == -EINTR);
- if (readlen == -1) {
- ret = readlen;
- goto end;
+ if (!stream->hangup_flush_done) {
+ do {
+ readlen = read(stream->wait_fd, &dummy, 1);
+ } while (readlen == -1 && errno == -EINTR);
+ if (readlen == -1) {
+ ret = readlen;
+ goto end;
+ }
}
buf = stream->buf;
}
buf = stream->buf;
@@
-356,7
+362,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
/* Get the next subbuffer */
err = ustctl_get_next_subbuf(handle, buf);
if (err != 0) {
/* Get the next subbuffer */
err = ustctl_get_next_subbuf(handle, buf);
if (err != 0) {
- ret =
errno;
+ ret =
-ret; /* ustctl_get_next_subbuf returns negative, caller expect positive. */
/*
* This is a debug message even for single-threaded consumer,
* because poll() have more relaxed criterions than get subbuf,
/*
* This is a debug message even for single-threaded consumer,
* because poll() have more relaxed criterions than get subbuf,
@@
-370,11
+376,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
assert(stream->output == LTTNG_EVENT_MMAP);
/* read the used subbuffer size */
err = ustctl_get_padded_subbuf_size(handle, buf, &len);
assert(stream->output == LTTNG_EVENT_MMAP);
/* read the used subbuffer size */
err = ustctl_get_padded_subbuf_size(handle, buf, &len);
- if (err != 0) {
- ret = errno;
- perror("Getting sub-buffer len failed.");
- goto end;
- }
+ assert(err == 0);
/* write the subbuffer to the tracefile */
ret = lttng_consumer_on_read_subbuffer_mmap(ctx, stream, len);
if (ret < 0) {
/* write the subbuffer to the tracefile */
ret = lttng_consumer_on_read_subbuffer_mmap(ctx, stream, len);
if (ret < 0) {
@@
-385,16
+387,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
ERR("Error writing to tracefile");
}
err = ustctl_put_next_subbuf(handle, buf);
ERR("Error writing to tracefile");
}
err = ustctl_put_next_subbuf(handle, buf);
- if (err != 0) {
- ret = errno;
- if (errno == EFAULT) {
- perror("Error in unreserving sub buffer\n");
- } else if (errno == EIO) {
- /* Should never happen with newer LTTng versions */
- perror("Reader has been pushed by the writer, last sub-buffer corrupted.");
- }
- goto end;
- }
+ assert(err == 0);
end:
return ret;
}
end:
return ret;
}
@@
-405,8
+398,10
@@
int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
/* Opening the tracefile in write mode */
if (stream->path_name != NULL) {
/* Opening the tracefile in write mode */
if (stream->path_name != NULL) {
- ret = open(stream->path_name,
- O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO);
+ ret = open_run_as(stream->path_name,
+ O_WRONLY|O_CREAT|O_TRUNC,
+ S_IRWXU|S_IRWXG|S_IRWXO,
+ stream->uid, stream->gid);
if (ret < 0) {
ERR("Opening %s", stream->path_name);
perror("open");
if (ret < 0) {
ERR("Opening %s", stream->path_name);
perror("open");
This page took
0.025081 seconds
and
4
git commands to generate.