Project

General

Profile

Download (3.79 KB)

Bug #429 » bug429.diff

David Goulet, 01/23/2013 04:28 PM

View differences:

src/common/consumer.c
struct pollfd *consumer_sockpoll, struct lttcomm_sock *relayd_sock,
unsigned int sessiond_id)
{
int fd = -1, ret = -1, relayd_created = 0;
int fd = -1, ret = -1, relayd_created = 0, sock_created = 0;
enum lttng_error_code ret_code = LTTNG_OK;
struct consumer_relayd_sock_pair *relayd;
......
/* Assign new file descriptor */
relayd->control_sock.fd = fd;
/* Flag that we have successfully created a socket with a valid fd. */
sock_created = 1;
/*
* Create a session on the relayd and store the returned id. Lock the
......
/* Assign new file descriptor */
relayd->data_sock.fd = fd;
/* Flag that we have successfully created a socket with a valid fd. */
sock_created = 1;
break;
default:
ERR("Unknown relayd socket type (%d)", sock_type);
......
}
if (relayd_created) {
/* We just want to cleanup. Ignore ret value. */
(void) relayd_close(&relayd->control_sock);
(void) relayd_close(&relayd->data_sock);
if (sock_created) {
/* We just want to close the fd for cleanup. Ignore ret value. */
(void) relayd_close(&relayd->control_sock);
(void) relayd_close(&relayd->data_sock);
}
free(relayd);
}
src/common/relayd/relayd.c
/*
* Close relayd socket with an allocated lttcomm_sock.
*
* If no socket operations are found, simply return 0 meaning that everything
* is fine. Without operations, the socket can not possibly be opened or used.
* This is possible if the socket was allocated but not created. However, the
* caller could simply use it to store a valid file descriptor for instance
* passed over a Unix socket and call this to cleanup but still without a valid
* ops pointer.
*
* Return the close returned value. On error, a negative value is usually
* returned back from close(2).
*/
int relayd_close(struct lttcomm_sock *sock)
{
int ret;
/* Code flow error. Safety net. */
assert(sock);
/* An invalid fd is fine, return success. */
if (sock->fd < 0) {
ret = 0;
goto end;
}
DBG3("Relayd closing socket %d", sock->fd);
return sock->ops->close(sock);
if (sock->ops) {
ret = sock->ops->close(sock);
} else {
/* Default call if no specific ops found. */
ret = close(sock->fd);
if (ret < 0) {
PERROR("relayd_close default close");
}
}
end:
return ret;
}
/*
(2-2/2)