kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: stream_interface: pass connection instead of fd in sock_ops

Browse Source 
The sock_ops I/O callbacks made use of an FD till now. This has become
inappropriate and the struct connection is much more useful. It also
fixes the race condition introduced by previous change.
This commit is contained in:
Willy Tarreau 2012-07-23 18:53:03 +02:00 committed by Willy Tarreau
parent fd31e53139
commit 239d7189fc
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/proto_tcp.h
View File

@ -31,7 +31,7 @@ int tcp_bind_socket(int fd, int flags, struct sockaddr_storage *local, struct so
void tcpv4_add_listener(struct listener *listener);
void tcpv6_add_listener(struct listener *listener);
int tcp_connect_server(struct stream_interface *si);
int tcp_connect_probe(int fd);
int tcp_connect_probe(struct connection *conn);
int tcp_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int tcp_inspect_request(struct session *s, struct buffer *req, int an_bit);

4
include/types/stream_interface.h
View File

@ -114,8 +114,8 @@ struct sock_ops {
void (*shutw)(struct stream_interface *); /* shutw function */
void (*chk_rcv)(struct stream_interface *); /* chk_rcv function */
void (*chk_snd)(struct stream_interface *); /* chk_snd function */
int (*read)(int fd); /* read callback after poll() */
int (*write)(int fd); /* write callback after poll() */
int (*read)(struct connection *conn); /* read callback after poll() */
int (*write)(struct connection *conn); /* write callback after poll() */
void (*close)(struct connection *); /* close the data channel on the connection */
};

6
src/connection.c
View File

@ -38,14 +38,14 @@ int conn_fd_handler(int fd)
goto leave;
if (fdtab[fd].ev & (FD_POLL_IN | FD_POLL_HUP | FD_POLL_ERR))
if (!conn->data->read(fd))
if (!conn->data->read(conn))
ret |= FD_WAIT_READ;
if (conn->flags & CO_FL_ERROR)
goto leave;
if (fdtab[fd].ev & (FD_POLL_OUT | FD_POLL_ERR))
if (!conn->data->write(fd))
if (!conn->data->write(conn))
ret |= FD_WAIT_WRITE;
if (conn->flags & CO_FL_ERROR)
@ -55,7 +55,7 @@ int conn_fd_handler(int fd)
/* still waiting for a connection to establish and no data to
* send in order to probe it ? Then let's retry the connect().
*/
if (!tcp_connect_probe(fd))
if (!tcp_connect_probe(conn))
ret |= FD_WAIT_WRITE;
}

4
src/proto_tcp.c
View File

@ -524,9 +524,9 @@ int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir)
* once the connection is established. It returns zero if it needs some polling
* before being called again.
*/
int tcp_connect_probe(int fd)
int tcp_connect_probe(struct connection *conn)
{
struct connection *conn = fdtab[fd].owner;
int fd = conn->t.sock.fd;
struct stream_interface *si = container_of(conn, struct stream_interface, conn);
struct buffer *b = si->ob;
int retval = 0;

19
src/sock_raw.c
View File

@ -42,8 +42,8 @@
#include <types/global.h>
/* main event functions used to move data between sockets and buffers */
static int sock_raw_read(int fd);
static int sock_raw_write(int fd);
static int sock_raw_read(struct connection *conn);
static int sock_raw_write(struct connection *conn);
static void sock_raw_data_finish(struct stream_interface *si);
static void sock_raw_shutr(struct stream_interface *si);
static void sock_raw_shutw(struct stream_interface *si);
@ -226,9 +226,9 @@ static int sock_raw_splice_in(struct buffer *b, struct stream_interface *si)
* able to read more data without polling first. Returns non-zero
* otherwise.
*/
static int sock_raw_read(int fd)
static int sock_raw_read(struct connection *conn)
{
struct connection *conn = fdtab[fd].owner;
int fd = conn->t.sock.fd;
struct stream_interface *si = container_of(conn, struct stream_interface, conn);
struct buffer *b = si->ib;
int ret, max, retval, cur_read;
@ -240,9 +240,6 @@ static int sock_raw_read(int fd)
retval = 1;
if (!conn)
goto out_wakeup;
/* stop immediately on errors. Note that we DON'T want to stop on
* POLL_ERR, as the poller might report a write error while there
* are still data available in the recv buffer. This typically
@ -631,9 +628,9 @@ static int sock_raw_write_loop(struct stream_interface *si, struct buffer *b)
* It returns 0 if the caller needs to poll before calling it again, otherwise
* non-zero.
*/
static int sock_raw_write(int fd)
static int sock_raw_write(struct connection *conn)
{
struct connection *conn = fdtab[fd].owner;
int fd = conn->t.sock.fd;
struct stream_interface *si = container_of(conn, struct stream_interface, conn);
struct buffer *b = si->ob;
int retval = 1;
@ -642,10 +639,6 @@ static int sock_raw_write(int fd)
fprintf(stderr,"sock_raw_write : fd=%d, owner=%p\n", fd, fdtab[fd].owner);
#endif
retval = 1;
if (!conn)
goto out_wakeup;
if (conn->flags & CO_FL_ERROR)
goto out_error;