mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: htx: rename htx_append_blk_value() to htx_add_data_atonce()

Browse Source 
This function is now dedicated to data blocks, and we'll soon need to
access it from outside in a rare few cases. Let's rename it and export
it.
This commit is contained in:
Willy Tarreau 2019-05-28 10:23:46 +02:00
parent 692c1d07f9
commit d4908fa465
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/htx.h
View File

@ -185,6 +185,7 @@ struct htx_blk *htx_add_header(struct htx *htx, const struct ist name, const str
struct htx_blk *htx_add_blk_type_size(struct htx *htx, enum htx_blk_type type, uint32_t blksz); struct htx_blk *htx_add_blk_type_size(struct htx *htx, enum htx_blk_type type, uint32_t blksz);
struct htx_blk *htx_add_all_headers(struct htx *htx, const struct http_hdr *hdrs); struct htx_blk *htx_add_all_headers(struct htx *htx, const struct http_hdr *hdrs);
struct htx_blk *htx_add_endof(struct htx *htx, enum htx_blk_type type); struct htx_blk *htx_add_endof(struct htx *htx, enum htx_blk_type type);
struct htx_blk *htx_add_data_atonce(struct htx *htx, const struct ist data);
struct htx_blk *htx_add_data(struct htx *htx, const struct ist data); struct htx_blk *htx_add_data(struct htx *htx, const struct ist data);
struct htx_blk *htx_add_trailer(struct htx *htx, const struct ist tlr); struct htx_blk *htx_add_trailer(struct htx *htx, const struct ist tlr);
struct htx_blk *htx_add_data_before(struct htx *htx, const struct htx_blk *ref, const struct ist data); struct htx_blk *htx_add_data_before(struct htx *htx, const struct htx_blk *ref, const struct ist data);

20
src/htx.c
View File

@ -347,13 +347,13 @@ struct htx_ret htx_drain(struct htx *htx, uint32_t count)
} }
/* Tries to append data to the last inserted block, if the type matches and if /* Tries to append data to the last inserted block, if the type matches and if
* there is enough non-wrapping space. Only DATA content can be appended. If the * there is enough space to take it all. If the space wraps, the buffer is
* append fails, a new block is inserted. If an error occurred, NULL is * defragmented and a new block is inserted. If an error occurred, NULL is
* returned. Otherwise, on success, the updated block (or the new one) is * returned. Otherwise, on success, the updated block (or the new one) is
* returned. * returned. Due to its nature this function can be expensive and should be
* avoided whenever possible.
*/ */
static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type type, struct htx_blk *htx_add_data_atonce(struct htx *htx, const struct ist data)
const struct ist data)
{ {
struct htx_blk *blk, *tailblk, *headblk, *frtblk; struct htx_blk *blk, *tailblk, *headblk, *frtblk;
struct ist v; struct ist v;
@ -366,10 +366,6 @@ static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type t
if (data.len > htx_free_data_space(htx)) if (data.len > htx_free_data_space(htx))
return NULL; return NULL;
/* Append only DATA */
if (type != HTX_BLK_DATA)
goto add_new_block;
/* get the tail and head block */ /* get the tail and head block */
tailblk = htx_get_tail_blk(htx); tailblk = htx_get_tail_blk(htx);
headblk = htx_get_head_blk(htx); headblk = htx_get_head_blk(htx);
@ -378,7 +374,7 @@ static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type t
/* Don't try to append data if the last inserted block is not of the /* Don't try to append data if the last inserted block is not of the
* same type */ * same type */
if (type != htx_get_blk_type(tailblk)) if (htx_get_blk_type(tailblk) != HTX_BLK_DATA)
goto add_new_block; goto add_new_block;
/* /*
@ -412,7 +408,7 @@ static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type t
add_new_block: add_new_block:
/* FIXME: check tlr.len (< 256MB) */ /* FIXME: check tlr.len (< 256MB) */
blk = htx_add_blk(htx, type, data.len); blk = htx_add_blk(htx, HTX_BLK_DATA, data.len);
if (!blk) if (!blk)
return NULL; return NULL;
@ -766,7 +762,7 @@ struct htx_blk *htx_add_endof(struct htx *htx, enum htx_blk_type type)
*/ */
struct htx_blk *htx_add_data(struct htx *htx, const struct ist data) struct htx_blk *htx_add_data(struct htx *htx, const struct ist data)
{ {
return htx_append_blk_value(htx, HTX_BLK_DATA, data); return htx_add_data_atonce(htx, data);
} }
/* Adds an HTX block of type TLR in <htx>. It returns the new block on /* Adds an HTX block of type TLR in <htx>. It returns the new block on