mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: shctx: Remove redundant arg from free_block callback

Browse Source 
The free_block callback does not get called on blocks that are not row
heads anymore so we don't need too shared_block parameters.
This commit is contained in:
Remi Tricot-Le Breton 2023-11-16 17:38:26 +01:00 committed by William Lallemand
parent 48f81ec09d
commit 4fe6c1365d
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/shctx-t.h
View File

@ -50,7 +50,7 @@ struct shared_context {
struct list avail; /* list for active and free blocks */
unsigned int nbav; /* number of available blocks */
unsigned int max_obj_size; /* maximum object size (in bytes). */
void (*free_block)(struct shared_block *first, struct shared_block *block, void *data);
void (*free_block)(struct shared_block *first, void *data);
void (*reserve_finish)(struct shared_context *shctx);
void *cb_data;
short int block_size;

4
src/cache.c
View File

@ -983,9 +983,9 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
}
static void cache_free_blocks(struct shared_block *first, struct shared_block *block, void *data)
static void cache_free_blocks(struct shared_block *first, void *data)
{
struct cache_entry *object = (struct cache_entry *)block->data;
struct cache_entry *object = (struct cache_entry *)first->data;
struct cache *cache = (struct cache *)data;
struct cache_tree *cache_tree;

2
src/shctx.c
View File

@ -81,7 +81,7 @@ struct shared_block *shctx_row_reserve_hot(struct shared_context *shctx,
/* release callback */
if (block->len && shctx->free_block)
shctx->free_block(block, block, shctx->cb_data);
shctx->free_block(block, shctx->cb_data);
block->len = 0;
if (ret) {

10
src/ssl_sock.c
View File

@ -4206,13 +4206,11 @@ ssl_sock_initial_ctx(struct bind_conf *bind_conf)
}
static inline void sh_ssl_sess_free_blocks(struct shared_block *first, struct shared_block *block, void *data)
static inline void sh_ssl_sess_free_blocks(struct shared_block *first, void *data)
{
if (first == block) {
struct sh_ssl_sess_hdr *sh_ssl_sess = (struct sh_ssl_sess_hdr *)first->data;
if (first->len > 0)
sh_ssl_sess_tree_delete(sh_ssl_sess);
}
struct sh_ssl_sess_hdr *sh_ssl_sess = (struct sh_ssl_sess_hdr *)first->data;
if (first->len > 0)
sh_ssl_sess_tree_delete(sh_ssl_sess);
}
/* return first block from sh_ssl_sess */