RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-19 12:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "MINOR: chunks: Make sure trash_size is only set once."

Browse Source 
This reverts commit 1c3b83242d.

It was made only to silence the thread sanitizer but ends up creating a
bug. Indeed, if "tune.bufsize" is in the global section, the trash_size
value is not updated anymore and the trash becomes smaller than a buffer!

Let's stop trying to fix the thread sanitizer reports, they are invalid,
and trying to fix them actually introduces bugs where there were none.

See GH issue #117 for more context. No backport is needed.
This commit is contained in:
Willy Tarreau 2019-06-07 15:33:06 +02:00
parent 1c3b83242d
commit e18616168f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chunk.c
View File

@ -68,9 +68,8 @@ struct buffer *get_trash_chunk(void)
*/
static int alloc_trash_buffers(int bufsize)
{
int old = 0;
chunk_init(&trash, my_realloc2(trash.area, bufsize), bufsize);
HA_ATOMIC_CAS(&trash_size, &old, bufsize);
trash_size = bufsize;
trash_buf1 = (char *)my_realloc2(trash_buf1, bufsize);
trash_buf2 = (char *)my_realloc2(trash_buf2, bufsize);
return trash.area && trash_buf1 && trash_buf2;