diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-16 11:10:55 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-16 11:10:55 +0000 |
| commit | 75929a97332565c3b987986f35652b6d5d275d3c (patch) | |
| tree | 6c24378eef62b4381033b9615d247f5934fc0342 /include/jemalloc/internal/ctl.h | |
| parent | 5b5d97b42e84c2ac417271c3fab6fc282496a335 (diff) | |
| download | jemalloc-75929a97332565c3b987986f35652b6d5d275d3c.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-dev' into merge"
Revert due to random ART crashes seen.
This reverts commit 5b5d97b42e84c2ac417271c3fab6fc282496a335.
Change-Id: I62a784301fded7ee853b182d172be46bb32bded7
Diffstat (limited to 'include/jemalloc/internal/ctl.h')
| -rw-r--r-- | include/jemalloc/internal/ctl.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/jemalloc/internal/ctl.h b/include/jemalloc/internal/ctl.h index 751c14b..2d301bf 100644 --- a/include/jemalloc/internal/ctl.h +++ b/include/jemalloc/internal/ctl.h @@ -34,7 +34,6 @@ struct ctl_arena_stats_s { bool initialized; unsigned nthreads; const char *dss; - ssize_t lg_dirty_mult; size_t pactive; size_t pdirty; arena_stats_t astats; @@ -47,15 +46,17 @@ struct ctl_arena_stats_s { malloc_bin_stats_t bstats[NBINS]; malloc_large_stats_t *lstats; /* nlclasses elements. */ - malloc_huge_stats_t *hstats; /* nhclasses elements. */ }; struct ctl_stats_s { size_t allocated; size_t active; - size_t metadata; - size_t resident; size_t mapped; + struct { + size_t current; /* stats_chunks.curchunks */ + uint64_t total; /* stats_chunks.nchunks */ + size_t high; /* stats_chunks.highchunks */ + } chunks; unsigned narenas; ctl_arena_stats_t *arenas; /* (narenas + 1) elements. */ }; |