diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 09:45:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 09:45:47 +0300 |
| commit | 28c20fc3934b404cbce8a9181ae536803abf9444 (patch) | |
| tree | c806fcbda8c7ee3430f56c0f55109257f413bc6d /intern | |
| parent | 9f66d0028774315b60c29a64a54bf0e3c1fe16ec (diff) | |
Memory allocator: use lockfree calls internally
Was already used in some areas.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_lockfree_impl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index 4c6ba0cb256..9575375d90a 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -171,7 +171,7 @@ void *MEM_lockfree_dupallocN(const void *vmemh) void *newp = NULL; if (vmemh) { MemHead *memh = MEMHEAD_FROM_PTR(vmemh); - const size_t prev_size = MEM_allocN_len(vmemh); + const size_t prev_size = MEM_lockfree_allocN_len(vmemh); if (UNLIKELY(MEMHEAD_IS_MMAP(memh))) { newp = MEM_lockfree_mapallocN(prev_size, "dupli_mapalloc"); } @@ -196,7 +196,7 @@ void *MEM_lockfree_reallocN_id(void *vmemh, size_t len, const char *str) if (vmemh) { MemHead *memh = MEMHEAD_FROM_PTR(vmemh); - size_t old_len = MEM_allocN_len(vmemh); + size_t old_len = MEM_lockfree_allocN_len(vmemh); if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) { newp = MEM_lockfree_mallocN(len, "realloc"); @@ -235,7 +235,7 @@ void *MEM_lockfree_recallocN_id(void *vmemh, size_t len, const char *str) if (vmemh) { MemHead *memh = MEMHEAD_FROM_PTR(vmemh); - size_t old_len = MEM_allocN_len(vmemh); + size_t old_len = MEM_lockfree_allocN_len(vmemh); if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) { newp = MEM_lockfree_mallocN(len, "recalloc"); |