diff options
| author | Jason Evans <jasone@canonware.com> | 2017-07-02 00:44:01 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2017-07-02 00:44:01 (GMT) |
| commit | 896ed3a8b3f41998d4fb4d625d30ac63ef2d51fb (patch) | |
| tree | b335c987c7861f6934b860e14587676208aeee48 /include/jemalloc/internal/jemalloc_internal_inlines_a.h | |
| parent | 5018fe3f0979b7f9db9930accdf7ee31071fd703 (diff) | |
| parent | 284edf02b0de3231357497cf0367f6f64ab07cd8 (diff) | |
| download | jemalloc-5.0.1.zip jemalloc-5.0.1.tar.gz jemalloc-5.0.1.tar.bz2 | |
Merge branch 'dev'5.0.1
Diffstat (limited to 'include/jemalloc/internal/jemalloc_internal_inlines_a.h')
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_inlines_a.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_a.h b/include/jemalloc/internal/jemalloc_internal_inlines_a.h index 854fb1e..24ea416 100644 --- a/include/jemalloc/internal/jemalloc_internal_inlines_a.h +++ b/include/jemalloc/internal/jemalloc_internal_inlines_a.h @@ -146,7 +146,10 @@ tcache_get(tsd_t *tsd) { } static inline void -pre_reentrancy(tsd_t *tsd) { +pre_reentrancy(tsd_t *tsd, arena_t *arena) { + /* arena is the current context. Reentry from a0 is not allowed. */ + assert(arena != arena_get(tsd_tsdn(tsd), 0, false)); + bool fast = tsd_fast(tsd); ++*tsd_reentrancy_levelp_get(tsd); if (fast) { |