mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-13 02:39:37 +00:00
Merge with develop
This commit is contained in:
commit
ec58c0bc95
1 changed files with 8 additions and 8 deletions
|
@ -27,8 +27,8 @@
|
|||
bool EnableStlAllocatorChecker = true;
|
||||
NLMISC_VARIABLE(bool, EnableStlAllocatorChecker, "Enable stl allocator tests");
|
||||
|
||||
uintptr_t StlAllocatorMaxFree= 0;
|
||||
NLMISC_VARIABLE(uintptr_t,StlAllocatorMaxFree,"When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered");
|
||||
uint64 StlAllocatorMaxFree = 0;
|
||||
NLMISC_VARIABLE(uint64, StlAllocatorMaxFree, "When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered");
|
||||
|
||||
// setup a 'max iterations' value of 3GBytes/ sizeof(void*) (32bit)
|
||||
// => this is equivalent to the total addressable memory space under linux
|
||||
|
@ -79,7 +79,7 @@ void testStlMemoryAllocator(const char* state)
|
|||
if (p==NULL)
|
||||
{
|
||||
uintptr_t numIterations = MaxIterations - counter;
|
||||
StlAllocatorMaxFree= std::max(numIterations,StlAllocatorMaxFree);
|
||||
StlAllocatorMaxFree = std::max((uint64)numIterations, StlAllocatorMaxFree);
|
||||
signal(SIGSEGV, NULL);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue