mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-19 00:51:37 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: session: simplify receive buffer allocator to only use the channel

Browse Source 
Now that we can get the session from the channel, let's simplify the
prototype of session_alloc_recv_buffer() to only require the channel.
Both the caller and the function are now simplified.
This commit is contained in:
Willy Tarreau 2014-12-28 13:09:02 +01:00
parent d5ccfa3fc5
commit 78955f4c8b
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/session.h
View File

@ -60,7 +60,7 @@ void __session_offer_buffers(int rqlimit);
static inline void session_offer_buffers();
int session_alloc_work_buffer(struct session *s);
void session_release_buffers(struct session *s);
int session_alloc_recv_buffer(struct session *s, struct buffer **buf);
int session_alloc_recv_buffer(struct channel *chn);
/* sets the stick counter's entry pointer */
static inline void stkctr_set_entry(struct stkctr *stkctr, struct stksess *entry)

4
src/hlua.c
View File

@ -1440,7 +1440,7 @@ static int hlua_socket_write_yield(struct lua_State *L,int status, lua_KContext
* the request buffer if its not required.
*/
if (socket->s->req.buf->size == 0) {
if (!session_alloc_recv_buffer(socket->s, &socket->s->req.buf)) {
if (!session_alloc_recv_buffer(&socket->s->req)) {
socket->s->si[0].flags |= SI_FL_WAIT_ROOM;
goto hlua_socket_write_yield_return;
}
@ -2324,7 +2324,7 @@ __LJMP static int hlua_channel_send_yield(lua_State *L, int status, lua_KContext
* the request buffer if its not required.
*/
if (chn->chn->buf->size == 0) {
if (!session_alloc_recv_buffer(chn->s, &chn->chn->buf)) {
if (!session_alloc_recv_buffer(chn->chn)) {
chn_prod(chn->chn)->flags |= SI_FL_WAIT_ROOM;
WILL_LJMP(hlua_yieldk(L, 0, 0, hlua_channel_send_yield, TICK_ETERNITY, 0));
}

24
src/session.c
View File

@ -670,24 +670,26 @@ static void session_free(struct session *s)
}
}
/* Allocates a single buffer for session <s>, but only if it's guaranteed that
* it's not the last available buffer. To be called at the beginning of recv()
* callbacks to ensure that the required buffers are properly allocated. If the
* buffer is the session's request buffer, an extra control is made so that we
* always keep <tune.buffers.reserved> buffers available after this allocation.
* In all circumstances we leave at least 2 buffers so that any later call from
* process_session() has a chance to succeed. The response buffer is not bound
* to this control. Returns 0 in case of failure, non-zero otherwise.
/* Allocates a receive buffer for channel <chn>, but only if it's guaranteed
* that it's not the last available buffer or it's the response buffer. Unless
* the buffer is the response buffer, an extra control is made so that we always
* keep <tune.buffers.reserved> buffers available after this allocation. To be
* called at the beginning of recv() callbacks to ensure that the required
* buffers are properly allocated. Returns 0 in case of failure, non-zero
* otherwise.
*/
int session_alloc_recv_buffer(struct session *s, struct buffer **buf)
int session_alloc_recv_buffer(struct channel *chn)
{
struct session *s;
struct buffer *b;
int margin = 0;
if (buf == &s->req.buf)
if (!(chn->flags & CF_ISRESP))
margin = global.tune.reserved_bufs;
b = b_alloc_margin(buf, margin);
s = chn_sess(chn);
b = b_alloc_margin(&chn->buf, margin);
if (b)
return 1;

2
src/stream_interface.c
View File

@ -1185,7 +1185,7 @@ static void si_conn_recv_cb(struct connection *conn)
}
/* now we'll need a buffer */
if (!session_alloc_recv_buffer(si_sess(si), &ic->buf)) {
if (!session_alloc_recv_buffer(ic)) {
si->flags |= SI_FL_WAIT_ROOM;
goto end_recv;
}