uint64_t metadata_id;
struct consumer_relayd_sock_pair *relayd = NULL;
+ /* RCU lock for the relayd pointer */
+ rcu_read_lock();
+
/* Flag that the current stream if set for network streaming. */
if (stream->net_seq_idx != -1) {
relayd = consumer_find_relayd(stream->net_seq_idx);
if (relayd == NULL) {
+ ERR("Cannot find relay for network stream\n");
goto end;
}
}
do {
ret = write(outfd, (void *) &metadata_id,
sizeof(stream->relayd_stream_id));
- if (ret < 0) {
- PERROR("write metadata stream id");
- written = ret;
- goto end;
- }
- } while (errno == EINTR);
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0) {
+ PERROR("write metadata stream id");
+ written = ret;
+ goto end;
+ }
DBG("Metadata stream id %zu written before data",
stream->relayd_stream_id);
}
}
while (len > 0) {
- ret = write(outfd, stream->mmap_base + mmap_offset, len);
+ do {
+ ret = write(outfd, stream->mmap_base + mmap_offset, len);
+ } while (ret < 0 && errno == EINTR);
if (ret < 0) {
- if (errno == EINTR) {
- /* restart the interrupted system call */
- continue;
- } else {
- PERROR("Error in file write");
- if (written == 0) {
- written = ret;
- }
- goto end;
+ PERROR("Error in file write");
+ if (written == 0) {
+ written = ret;
}
+ goto end;
} else if (ret > len) {
PERROR("ret %ld > len %lu", ret, len);
written += ret;
if (relayd && stream->metadata_flag) {
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
}
+ rcu_read_unlock();
return written;
}
return -ENOENT;
}
+ /* relayd need RCU read-side lock */
+ rcu_read_lock();
+
switch (msg.cmd_type) {
case LTTNG_CONSUMER_ADD_RELAYD_SOCKET:
{
*/
do {
ret = write(ctx->consumer_poll_pipe[1], "", 1);
- } while (ret == -1UL && errno == EINTR);
+ } while (ret < 0 && errno == EINTR);
end_nosignal:
+ rcu_read_unlock();
return 0;
}