Most of the changes here remove a double PERROR which is done by the
transport layer. So we notify in the debug message to understand where
the transport error was.
Also, don't print an error if the relayd is not found. This is possible
if the relayd dies so an error here is useless to the common user but
useful as a debug statement.
Signed-off-by: David Goulet <dgoulet@efficios.com>
ret = lttcomm_recv_unix_sock(sock->fd, &reply, sizeof(reply));
if (ret < 0) {
ret = lttcomm_recv_unix_sock(sock->fd, &reply, sizeof(reply));
if (ret < 0) {
- PERROR("recv consumer status msg");
+ /* The above call will print a PERROR on error. */
+ DBG("Fail to receive status reply on sock %d", sock->fd);
ret = 0;
} else {
ret = -reply.ret_code;
ret = 0;
} else {
ret = -reply.ret_code;
- ERR("Consumer ret code %d", reply.ret_code);
+ DBG("Consumer ret code %d", reply.ret_code);
ret = lttcomm_send_fds_unix_sock(sock->fd, fds, nb_fd);
if (ret < 0) {
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);
ret = lttcomm_send_unix_sock(sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
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);
ret = lttcomm_send_unix_sock(sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
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);
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) {
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);
ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
if (ret < 0) {
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;
}
pthread_mutex_unlock(socket->lock);
goto error;
}
ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code));
if (ret < 0) {
ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code));
if (ret < 0) {
- PERROR("recv consumer data pending status");
+ /* 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;
}
pthread_mutex_unlock(socket->lock);
goto error;
}
- DBG("Consumer data pending ret %d", ret_code);
+ DBG("Consumer data is %s pending for session id %u",
+ ret_code == 1 ? "" : "NOT", id);
/* Get relayd reference if exists. */
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
/* Get relayd reference if exists. */
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
- ERR("Unable to find relayd %" PRIu64, index);
+ DBG("Unable to find relayd %" PRIu64, index);
ret_code = LTTNG_ERR_NO_CONSUMER;
}
ret_code = LTTNG_ERR_NO_CONSUMER;
}
/* Get relayd reference if exists. */
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
/* Get relayd reference if exists. */
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
- ERR("Unable to find relayd %" PRIu64, index);
+ DBG("Unable to find relayd %" PRIu64, index);
ret_code = LTTNG_ERR_NO_CONSUMER;
}
ret_code = LTTNG_ERR_NO_CONSUMER;
}