assert(sock);
ret = lttcomm_recv_unix_sock(sock->fd, &reply, sizeof(reply));
- if (ret < 0) {
- PERROR("recv consumer status msg");
+ if (ret <= 0) {
+ if (ret == 0) {
+ /* Orderly shutdown. Don't return 0 which means success. */
+ ret = -1;
+ }
+ /* The above call will print a PERROR on error. */
+ DBG("Fail to receive status reply on sock %d", sock->fd);
goto end;
}
ret = 0;
} else {
ret = -reply.ret_code;
- ERR("Consumer ret code %d", reply.ret_code);
+ DBG("Consumer ret code %d", reply.ret_code);
}
end:
/* Putting back the HT pointer and start copying socket(s). */
output->socks = tmp_ht_ptr;
+ rcu_read_lock();
cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
/* Create new socket object. */
copy_sock = consumer_allocate_socket(socket->fd);
if (copy_sock == NULL) {
+ rcu_read_unlock();
goto malloc_error;
}
copy_sock->lock = socket->lock;
consumer_add_socket(copy_sock, output);
}
+ rcu_read_unlock();
error:
return output;
ret = lttcomm_send_fds_unix_sock(sock->fd, fds, nb_fd);
if (ret < 0) {
- PERROR("send consumer fds");
+ /* The above call will print a PERROR on error. */
+ DBG("Error when sending consumer fds on sock %d", sock->fd);
goto error;
}
ret = lttcomm_send_unix_sock(sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
- PERROR("send consumer channel");
+ /* The above call will print a PERROR on error. */
+ DBG("Error when sending consumer channel on sock %d", sock->fd);
goto error;
}
ret = lttcomm_send_unix_sock(sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
- PERROR("send consumer stream");
+ /* The above call will print a PERROR on error. */
+ DBG("Error when sending consumer stream on sock %d", sock->fd);
goto error;
}
DBG3("Sending relayd sock info to consumer on %d", consumer_sock->fd);
ret = lttcomm_send_unix_sock(consumer_sock->fd, &msg, sizeof(msg));
if (ret < 0) {
- PERROR("send consumer relayd socket info");
+ /* The above call will print a PERROR on error. */
+ DBG("Error when sending relayd sockets on sock %d", sock->fd);
goto error;
}
DBG3("Consumer data pending for id %u", id);
/* Send command for each consumer */
+ rcu_read_lock();
cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
node.node) {
/* Code flow error */
ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
if (ret < 0) {
- PERROR("send consumer data pending command");
+ /* The above call will print a PERROR on error. */
+ DBG("Error on consumer is data pending on sock %d", socket->fd);
pthread_mutex_unlock(socket->lock);
- goto error;
+ goto error_unlock;
}
/*
*/
ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code));
- if (ret < 0) {
- PERROR("recv consumer data pending status");
+ if (ret <= 0) {
+ if (ret == 0) {
+ /* Orderly shutdown. Don't return 0 which means success. */
+ ret = -1;
+ }
+ /* The above call will print a PERROR on error. */
+ DBG("Error on recv consumer is data pending on sock %d", socket->fd);
pthread_mutex_unlock(socket->lock);
- goto error;
+ goto error_unlock;
}
pthread_mutex_unlock(socket->lock);
break;
}
}
+ rcu_read_unlock();
- DBG("Consumer data pending ret %d", ret_code);
+ DBG("Consumer data is %s pending for session id %u",
+ ret_code == 1 ? "" : "NOT", id);
return ret_code;
-error:
+error_unlock:
+ rcu_read_unlock();
return -1;
}