diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-04-13 09:30:57 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-04-13 09:30:57 -0300 |
| commit | a9ee85b9fc2d4e3faa466e9c3062cd41315f8456 (patch) | |
| tree | e45187575c9f0397c5d717780b61adf5b3976a62 /src/nvim/lib | |
| parent | 0248c75bc190ec2fbc8f3af3d61f771e76d628d6 (diff) | |
| parent | 2d104f14dbd2c60a30e9e1e0fef098b39db087db (diff) | |
| download | rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.tar.gz rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.tar.bz2 rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.zip | |
Merge PR #2415 'Use jemalloc instead of libc allocator'
Diffstat (limited to 'src/nvim/lib')
| -rw-r--r-- | src/nvim/lib/khash.h | 2 | ||||
| -rw-r--r-- | src/nvim/lib/klist.h | 6 | ||||
| -rw-r--r-- | src/nvim/lib/kvec.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h index c9198e048c..96e7ea6df0 100644 --- a/src/nvim/lib/khash.h +++ b/src/nvim/lib/khash.h @@ -181,7 +181,7 @@ typedef khint_t khiter_t; #define krealloc(P,Z) xrealloc(P,Z) #endif #ifndef kfree -#define kfree(P) free(P) +#define kfree(P) xfree(P) #endif static const double __ac_HASH_UPPER = 0.77; diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h index f8dc7d4c43..7df809f07b 100644 --- a/src/nvim/lib/klist.h +++ b/src/nvim/lib/klist.h @@ -44,9 +44,9 @@ static inline void kmp_destroy_##name(kmp_##name##_t *mp) { \ size_t k; \ for (k = 0; k < mp->n; ++k) { \ - kmpfree_f(mp->buf[k]); free(mp->buf[k]); \ + kmpfree_f(mp->buf[k]); xfree(mp->buf[k]); \ } \ - free(mp->buf); free(mp); \ + xfree(mp->buf); xfree(mp); \ } \ static inline kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \ ++mp->cnt; \ @@ -95,7 +95,7 @@ kmp_free(name, kl->mp, p); \ kmp_free(name, kl->mp, p); \ kmp_destroy(name, kl->mp); \ - free(kl); \ + xfree(kl); \ } \ static inline kltype_t *kl_pushp_##name(kl_##name##_t *kl) { \ kl1_##name *q, *p = kmp_alloc(name, kl->mp); \ diff --git a/src/nvim/lib/kvec.h b/src/nvim/lib/kvec.h index 982b5d6f1c..0466cb229c 100644 --- a/src/nvim/lib/kvec.h +++ b/src/nvim/lib/kvec.h @@ -55,7 +55,7 @@ int main() { #define kvec_t(type) struct { size_t size, capacity; type *items; } #define kv_init(v) ((v).size = (v).capacity = 0, (v).items = 0) -#define kv_destroy(v) free((v).items) +#define kv_destroy(v) xfree((v).items) #define kv_A(v, i) ((v).items[(i)]) #define kv_pop(v) ((v).items[--(v).size]) #define kv_size(v) ((v).size) |