diff options
| author | Qi Wang <interwq@gwu.edu> | 2017-06-22 16:18:30 -0700 |
|---|---|---|
| committer | Qi Wang <interwq@gmail.com> | 2017-06-23 13:27:53 -0700 |
| commit | 425463a4465043f5f1ccb7f4b257e31ad95b1ed6 (patch) | |
| tree | 16ebcb7782fd4d43fbbfff58f499db497caa5a1a /include | |
| parent | d6eb8ac8f30745b06744ad5cb2988a392c4448cd (diff) | |
| download | platform_external_jemalloc_new-425463a4465043f5f1ccb7f4b257e31ad95b1ed6.tar.gz platform_external_jemalloc_new-425463a4465043f5f1ccb7f4b257e31ad95b1ed6.tar.bz2 platform_external_jemalloc_new-425463a4465043f5f1ccb7f4b257e31ad95b1ed6.zip | |
Check arena in current context in pre_reentrancy.
Diffstat (limited to 'include')
| -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 854fb1e2..24ea4162 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) { |