DBG("consumer_add_stream %s (%d,%d)", msg.u.stream.path_name,
fds[0], fds[1]);
assert(msg.u.stream.output == LTTNG_EVENT_MMAP);
- new_stream = consumer_allocate_stream(msg.u.stream.channel_key,
+ new_stream = consumer_allocate_stream(msg.u.channel.channel_key,
msg.u.stream.stream_key,
fds[0], fds[1],
msg.u.stream.state,
}
case LTTNG_CONSUMER_UPDATE_STREAM:
{
+ return -ENOSYS;
+#if 0
if (ctx->on_update_stream != NULL) {
ret = ctx->on_update_stream(msg.u.stream.stream_key, msg.u.stream.state);
if (ret == 0) {
consumer_change_stream_state(msg.u.stream.stream_key,
msg.u.stream.state);
}
+#endif
break;
}
default:
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)
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;
/* 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,
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) {
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;
}