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

MEDIUM: threads/buffers: Define and register per-thread init/deinit functions

Browse Source 
For now, only the swap_buffer is handled in these functions. Moreover,
swap_buffer has been changed to be a thread-local variable.
This commit is contained in:
Christopher Faulet 2017-08-29 14:43:04 +02:00 committed by Willy Tarreau
parent dc628a3a76
commit ba39f23a9d
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/buffer.c
View File

@ -37,7 +37,20 @@ struct list buffer_wq = LIST_HEAD_INIT(buffer_wq);
/* this buffer is always the same size as standard buffers and is used for /* this buffer is always the same size as standard buffers and is used for
* swapping data inside a buffer. * swapping data inside a buffer.
*/ */
static char *swap_buffer = NULL; static THREAD_LOCAL char *swap_buffer = NULL;
static int init_buffer_per_thread()
{
swap_buffer = calloc(1, global.tune.bufsize);
if (swap_buffer == NULL)
return 0;
return 1;
}
static void deinit_buffer_per_thread()
{
free(swap_buffer); swap_buffer = NULL;
}
/* perform minimal intializations, report 0 in case of error, 1 if OK. */ /* perform minimal intializations, report 0 in case of error, 1 if OK. */
int init_buffer() int init_buffer()
@ -65,16 +78,19 @@ int init_buffer()
pool_free2(pool2_buffer, buffer); pool_free2(pool2_buffer, buffer);
swap_buffer = calloc(1, global.tune.bufsize); if (global.nbthread > 1) {
if (swap_buffer == NULL) hap_register_per_thread_init(init_buffer_per_thread);
return 0; hap_register_per_thread_deinit(deinit_buffer_per_thread);
}
else if (!init_buffer_per_thread())
return 0;
return 1; return 1;
} }
void deinit_buffer() void deinit_buffer()
{ {
free(swap_buffer); swap_buffer = NULL; deinit_buffer_per_thread();
pool_destroy2(pool2_buffer); pool_destroy2(pool2_buffer);
} }