diff options
| author | Oran Agra <oran@redislabs.com> | 2021-10-18 12:45:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 12:45:11 +0300 |
| commit | c4b4b6c06b0562740d214d0df467b2ba40396ffc (patch) | |
| tree | ccd9a5e688f16311edefdacb63994976f8c6f687 /deps/jemalloc/include/jemalloc/internal/tsd_tls.h | |
| parent | 276b460ea9554f79109eb9a234a847a2520cf4c2 (diff) | |
| parent | 85737e674552bafefb6beb9a37531645e5d2178b (diff) | |
| download | redis-c4b4b6c06b0562740d214d0df467b2ba40396ffc.tar.gz | |
Merge pull request #9623 from yoav-steinberg/upgrade_jemalloc_5.2.1
Upgraded to jemalloc 5.2.1 from 5.1.0.
Cherry picked all relevant fixes (by diffing our 5.1.0 to upstream 5.10 and finding relevant commits).
Details of what was done:
[cherry-picked] fd7d51c 2021-05-03 Resolve nonsense static analysis warnings (Oran Agra)
[cherry-picked] 448c435 2020-09-29 Fix compilation warnings in Lua and jemalloc dependencies (#7785) (YoongHM)
[skipped - already in upstream] 9216b96 2020-09-21 Fix compilation warning in jemalloc's malloc_vsnprintf (#7789) (YoongHM)
[cherry-picked] 88d71f4 2020-05-20 fix a rare active defrag edge case bug leading to stagnation (Oran Agra)
[skipped - already in upstream] 2fec7d9 2019-05-30 Jemalloc: Avoid blocking on background thread lock for stats.
[cherry-picked] 920158e 2018-07-11 Active defrag fixes for 32bit builds (again) (Oran Agra)
[cherry-picked] e8099ca 2018-06-26 add defrag hint support into jemalloc 5 (Oran Agra)
[re-done] 4e729fc 2018-05-24 Generate configure for Jemalloc. (antirez)
Additionally had to do this:
7727cc2 2021-10-10 Fix defrag to support sharded bins in arena (added in v5.2.1) (Yoav Steinberg)
When reviewing please look at all except the first commit which is just replacing 5.1.0 with 5.2.1 sources.
Also I think we should merge this without squashing to preserve the changes we did to to jemalloc.
Diffstat (limited to 'deps/jemalloc/include/jemalloc/internal/tsd_tls.h')
| -rw-r--r-- | deps/jemalloc/include/jemalloc/internal/tsd_tls.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/jemalloc/include/jemalloc/internal/tsd_tls.h b/deps/jemalloc/include/jemalloc/internal/tsd_tls.h index 0de64b7b8..7d6c805be 100644 --- a/deps/jemalloc/include/jemalloc/internal/tsd_tls.h +++ b/deps/jemalloc/include/jemalloc/internal/tsd_tls.h @@ -3,7 +3,9 @@ #endif #define JEMALLOC_INTERNAL_TSD_TLS_H -extern __thread tsd_t tsd_tls; +#define JEMALLOC_TSD_TYPE_ATTR(type) __thread type JEMALLOC_TLS_MODEL + +extern JEMALLOC_TSD_TYPE_ATTR(tsd_t) tsd_tls; extern pthread_key_t tsd_tsd; extern bool tsd_booted; @@ -39,8 +41,7 @@ tsd_get_allocates(void) { /* Get/set. */ JEMALLOC_ALWAYS_INLINE tsd_t * -tsd_get(UNUSED bool init) { - assert(tsd_booted); +tsd_get(bool init) { return &tsd_tls; } |