Sergey Sharybin
4bd4037276
Release builds will now use lock-free allocator by
default without any internal locks happening.
MemHead is also reduces to as minimum as it's possible.
It still need to be size_t stored in a MemHead in order
to make us keep track on memory we're requesting from
the system, not memory which system is allocating. This
is probably also faster than using a malloc's usable
size function.
Lock-free guarded allocator will say you whether all
the blocks were freed, but wouldn't give you a list
of unfreed blocks list. To have such a list use a
--debug or --debug-memory command line arguments.
Debug builds does have the same behavior as release
builds. This is so tools like valgrind are not
screwed up by guarded allocator as they're currently
are.
--
svn merge -r59941:59942 -r60072:60073 -r60093:60094 \
-r60095:60096 ^/branches/soc-2013-depsgraph_mt
96 lines
4.1 KiB
C
96 lines
4.1 KiB
C
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): Brecht Van Lommel
|
|
* Campbell Barton
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file guardedalloc/intern/mallocn.c
|
|
* \ingroup MEM
|
|
*
|
|
* Guarded memory allocation, and boundary-write detection.
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
/* to ensure strict conversions */
|
|
#include "../../source/blender/blenlib/BLI_strict_flags.h"
|
|
|
|
#include "mallocn_intern.h"
|
|
|
|
size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len;
|
|
void (*MEM_freeN)(void *vmemh) = MEM_lockfree_freeN;
|
|
void *(*MEM_dupallocN)(const void *vmemh) = MEM_lockfree_dupallocN;
|
|
void *(*MEM_reallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_reallocN_id;
|
|
void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id;;
|
|
void *(*MEM_callocN)(size_t len, const char *str) = MEM_lockfree_callocN;
|
|
void *(*MEM_mallocN)(size_t len, const char *str) = MEM_lockfree_mallocN;
|
|
void *(*MEM_mapallocN)(size_t len, const char *str) = MEM_lockfree_mapallocN;
|
|
void (*MEM_printmemlist_pydict)(void) = MEM_lockfree_printmemlist_pydict;
|
|
void (*MEM_printmemlist)(void) = MEM_lockfree_printmemlist;
|
|
void (*MEM_callbackmemlist)(void (*func)(void *)) = MEM_lockfree_callbackmemlist;
|
|
void (*MEM_printmemlist_stats)(void) = MEM_lockfree_printmemlist_stats;
|
|
void (*MEM_set_error_callback)(void (*func)(const char *)) = MEM_lockfree_set_error_callback;
|
|
bool (*MEM_check_memory_integrity)(void) = MEM_lockfree_check_memory_integrity;
|
|
void (*MEM_set_lock_callback)(void (*lock)(void), void (*unlock)(void)) = MEM_lockfree_set_lock_callback;
|
|
void (*MEM_set_memory_debug)(void) = MEM_lockfree_set_memory_debug;
|
|
uintptr_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use;
|
|
uintptr_t (*MEM_get_mapped_memory_in_use)(void) = MEM_lockfree_get_mapped_memory_in_use;
|
|
unsigned int (*MEM_get_memory_blocks_in_use)(void) = MEM_lockfree_get_memory_blocks_in_use;
|
|
void (*MEM_reset_peak_memory)(void) = MEM_lockfree_reset_peak_memory;
|
|
uintptr_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory;
|
|
|
|
#ifndef NDEBUG
|
|
const char *(*MEM_name_ptr)(void *vmemh) = MEM_lockfree_name_ptr;
|
|
#endif
|
|
|
|
void MEM_use_guarded_allocator(void)
|
|
{
|
|
MEM_allocN_len = MEM_guarded_allocN_len;
|
|
MEM_freeN = MEM_guarded_freeN;
|
|
MEM_dupallocN = MEM_guarded_dupallocN;
|
|
MEM_reallocN_id = MEM_guarded_reallocN_id;
|
|
MEM_recallocN_id = MEM_guarded_recallocN_id;;
|
|
MEM_callocN = MEM_guarded_callocN;
|
|
MEM_mallocN = MEM_guarded_mallocN;
|
|
MEM_mapallocN = MEM_guarded_mapallocN;
|
|
MEM_printmemlist_pydict = MEM_guarded_printmemlist_pydict;
|
|
MEM_printmemlist = MEM_guarded_printmemlist;
|
|
MEM_callbackmemlist = MEM_guarded_callbackmemlist;
|
|
MEM_printmemlist_stats = MEM_guarded_printmemlist_stats;
|
|
MEM_set_error_callback = MEM_guarded_set_error_callback;
|
|
MEM_check_memory_integrity = MEM_guarded_check_memory_integrity;
|
|
MEM_set_lock_callback = MEM_guarded_set_lock_callback;
|
|
MEM_set_memory_debug = MEM_guarded_set_memory_debug;
|
|
MEM_get_memory_in_use = MEM_guarded_get_memory_in_use;
|
|
MEM_get_mapped_memory_in_use = MEM_guarded_get_mapped_memory_in_use;
|
|
MEM_get_memory_blocks_in_use = MEM_guarded_get_memory_blocks_in_use;
|
|
MEM_reset_peak_memory = MEM_guarded_reset_peak_memory;
|
|
MEM_get_peak_memory = MEM_guarded_get_peak_memory;
|
|
|
|
#ifndef NDEBUG
|
|
MEM_name_ptr = MEM_guarded_name_ptr;
|
|
#endif
|
|
}
|