return ret;
}
+/*
+ * Receive command from session daemon and process it.
+ *
+ * Return 1 on success else a negative value or 0.
+ */
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
int sock, struct pollfd *consumer_sockpoll)
{
ret = lttcomm_recv_unix_sock(sock, &msg, sizeof(msg));
if (ret != sizeof(msg)) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
+ if (ret > 0) {
+ ret = -1;
+ }
return ret;
}
if (msg.cmd_type == LTTNG_CONSUMER_STOP) {
ret = consumer_send_status_msg(sock, ret_code);
if (ret < 0) {
/* Somehow, the session daemon is not responding anymore. */
- goto end_nosignal;
+ goto error_fatal;
}
DBG("consumer_add_channel %" PRIu64, msg.u.channel.channel_key);
new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
msg.u.channel.name, msg.u.channel.uid, msg.u.channel.gid,
msg.u.channel.relayd_id, msg.u.channel.output,
msg.u.channel.tracefile_size,
- msg.u.channel.tracefile_count);
+ msg.u.channel.tracefile_count,
+ msg.u.channel.monitor);
if (new_channel == NULL) {
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
goto end_nosignal;
}
/* If we received an error in add_channel, we need to report it. */
- if (ret != 0) {
- consumer_send_status_msg(sock, ret);
+ if (ret < 0) {
+ ret = consumer_send_status_msg(sock, ret);
+ if (ret < 0) {
+ goto error_fatal;
+ }
goto end_nosignal;
}
/* First send a status message before receiving the fds. */
ret = consumer_send_status_msg(sock, ret_code);
- if (ret < 0 || ret_code != LTTNG_OK) {
+ if (ret < 0) {
+ /*
+ * Somehow, the session daemon is not responding
+ * anymore.
+ */
+ goto error_fatal;
+ }
+ if (ret_code != LTTNG_OK) {
/*
- * Somehow, the session daemon is not responding anymore or the
- * channel was not found.
+ * Channel was not found.
*/
goto end_nosignal;
}
new_stream->chan = channel;
new_stream->wait_fd = fd;
+ /*
+ * We've just assigned the channel to the stream so increment the
+ * refcount right now.
+ */
+ uatomic_inc(&new_stream->chan->refcount);
+
/*
* The buffer flush is done on the session daemon side for the kernel
* so no need for the stream "hangup_flush_done" variable to be
}
}
+ /* Do not monitor this stream. */
+ if (!channel->monitor) {
+ DBG("Kernel consumer add stream %s in no monitor mode with"
+ "relayd id %" PRIu64, new_stream->name,
+ new_stream->relayd_stream_id);
+ break;
+ }
+
/* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
stream_pipe = ctx->consumer_metadata_pipe;
ret = consumer_send_status_msg(sock, ret_code);
if (ret < 0) {
/* Somehow, the session daemon is not responding anymore. */
- goto end_nosignal;
+ goto error_fatal;
}
goto end_nosignal;
ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
if (ret < 0) {
PERROR("send data pending ret code");
+ goto error_fatal;
}
/*
*/
break;
}
+ case LTTNG_CONSUMER_SNAPSHOT_CHANNEL:
+ {
+ ret = consumer_send_status_msg(sock, ret_code);
+ if (ret < 0) {
+ /* Somehow, the session daemon is not responding anymore. */
+ goto end_nosignal;
+ }
+ break;
+ }
default:
goto end_nosignal;
}
* shutdown during the recv() or send() call.
*/
return 1;
+
+error_fatal:
+ rcu_read_unlock();
+ /* This will issue a consumer stop. */
+ return -1;
}
/*
assert(stream);
- /* Don't create anything if this is set for streaming. */
- if (stream->net_seq_idx == (uint64_t) -1ULL) {
+ /*
+ * Don't create anything if this is set for streaming or should not be
+ * monitored.
+ */
+ if (stream->net_seq_idx == (uint64_t) -1ULL && stream->chan->monitor) {
ret = utils_create_stream_file(stream->chan->pathname, stream->name,
stream->chan->tracefile_size, stream->tracefile_count_current,
stream->uid, stream->gid);