mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
a10ae35328
Essentially, the problem is that safemalloc is excruciatingly slow as it checks all allocated blocks for overrun at each memory management primitive, yielding a almost exponential slowdown for the memory management functions (malloc, realloc, free). The overrun check basically consists of verifying some bytes of a block for certain magic keys, which catches some simple forms of overrun. Another minor problem is violation of aliasing rules and that its own internal list of blocks is prone to corruption. Another issue with safemalloc is rather the maintenance cost as the tool has a significant impact on the server code. Given the magnitude of memory debuggers available nowadays, especially those that are provided with the platform malloc implementation, maintenance of a in-house and largely obsolete memory debugger becomes a burden that is not worth the effort due to its slowness and lack of support for detecting more common forms of heap corruption. Since there are third-party tools that can provide the same functionality at a lower or comparable performance cost, the solution is to simply remove safemalloc. Third-party tools can provide the same functionality at a lower or comparable performance cost. The removal of safemalloc also allows a simplification of the malloc wrappers, removing quite a bit of kludge: redefinition of my_malloc, my_free and the removal of the unused second argument of my_free. Since free() always check whether the supplied pointer is null, redudant checks are also removed. Also, this patch adds unit testing for my_malloc and moves my_realloc implementation into the same file as the other memory allocation primitives.
152 lines
4.7 KiB
C
152 lines
4.7 KiB
C
/* Copyright (C) 2000-2002, 2004 MySQL AB
|
|
|
|
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; version 2 of the License.
|
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* functions on blocks; Keys and records are saved in blocks */
|
|
|
|
#include "heapdef.h"
|
|
|
|
/*
|
|
Find record according to record-position.
|
|
|
|
The record is located by factoring position number pos into (p_0, p_1, ...)
|
|
such that
|
|
pos = SUM_i(block->level_info[i].records_under_level * p_i)
|
|
{p_0, p_1, ...} serve as indexes to descend the blocks tree.
|
|
*/
|
|
|
|
uchar *hp_find_block(HP_BLOCK *block, ulong pos)
|
|
{
|
|
reg1 int i;
|
|
reg3 HP_PTRS *ptr; /* block base ptr */
|
|
|
|
for (i=block->levels-1, ptr=block->root ; i > 0 ; i--)
|
|
{
|
|
ptr=(HP_PTRS*)ptr->blocks[pos/block->level_info[i].records_under_level];
|
|
pos%=block->level_info[i].records_under_level;
|
|
}
|
|
return (uchar*) ptr+ pos*block->recbuffer;
|
|
}
|
|
|
|
|
|
/*
|
|
Get one new block-of-records. Alloc ptr to block if needed
|
|
|
|
SYNOPSIS
|
|
hp_get_new_block()
|
|
block HP_BLOCK tree-like block
|
|
alloc_length OUT Amount of memory allocated from the heap
|
|
|
|
Interrupts are stopped to allow ha_panic in interrupts
|
|
RETURN
|
|
0 OK
|
|
1 Out of memory
|
|
*/
|
|
|
|
int hp_get_new_block(HP_BLOCK *block, size_t *alloc_length)
|
|
{
|
|
reg1 uint i,j;
|
|
HP_PTRS *root;
|
|
|
|
for (i=0 ; i < block->levels ; i++)
|
|
if (block->level_info[i].free_ptrs_in_block)
|
|
break;
|
|
|
|
/*
|
|
Allocate space for leaf block plus space for upper level blocks up to
|
|
first level that has a free slot to put the pointer.
|
|
In some cases we actually allocate more then we need:
|
|
Consider e.g. a situation where we have one level 1 block and one level 0
|
|
block, the level 0 block is full and this function is called. We only
|
|
need a leaf block in this case. Nevertheless, we will get here with i=1
|
|
and will also allocate sizeof(HP_PTRS) for non-leaf block and will never
|
|
use this space.
|
|
This doesn't add much overhead - with current values of sizeof(HP_PTRS)
|
|
and my_default_record_cache_size we get about 1/128 unused memory.
|
|
*/
|
|
*alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer;
|
|
if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))
|
|
return 1;
|
|
|
|
if (i == 0)
|
|
{
|
|
block->levels=1;
|
|
block->root=block->level_info[0].last_blocks=root;
|
|
}
|
|
else
|
|
{
|
|
dont_break(); /* Dont allow SIGHUP or SIGINT */
|
|
if ((uint) i == block->levels)
|
|
{
|
|
/* Adding a new level on top of the existing ones. */
|
|
block->levels=i+1;
|
|
/*
|
|
Use first allocated HP_PTRS as a top-level block. Put the current
|
|
block tree into the first slot of a new top-level block.
|
|
*/
|
|
block->level_info[i].free_ptrs_in_block=HP_PTRS_IN_NOD-1;
|
|
((HP_PTRS**) root)[0]= block->root;
|
|
block->root=block->level_info[i].last_blocks= root++;
|
|
}
|
|
/* Occupy the free slot we've found at level i */
|
|
block->level_info[i].last_blocks->
|
|
blocks[HP_PTRS_IN_NOD - block->level_info[i].free_ptrs_in_block--]=
|
|
(uchar*) root;
|
|
|
|
/* Add a block subtree with each node having one left-most child */
|
|
for (j=i-1 ; j >0 ; j--)
|
|
{
|
|
block->level_info[j].last_blocks= root++;
|
|
block->level_info[j].last_blocks->blocks[0]=(uchar*) root;
|
|
block->level_info[j].free_ptrs_in_block=HP_PTRS_IN_NOD-1;
|
|
}
|
|
|
|
/*
|
|
root now points to last (block->records_in_block* block->recbuffer)
|
|
allocated bytes. Use it as a leaf block.
|
|
*/
|
|
block->level_info[0].last_blocks= root;
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* free all blocks under level */
|
|
|
|
uchar *hp_free_level(HP_BLOCK *block, uint level, HP_PTRS *pos, uchar *last_pos)
|
|
{
|
|
int i,max_pos;
|
|
uchar *next_ptr;
|
|
|
|
if (level == 1)
|
|
next_ptr=(uchar*) pos+block->recbuffer;
|
|
else
|
|
{
|
|
max_pos= (block->level_info[level-1].last_blocks == pos) ?
|
|
HP_PTRS_IN_NOD - block->level_info[level-1].free_ptrs_in_block :
|
|
HP_PTRS_IN_NOD;
|
|
|
|
next_ptr=(uchar*) (pos+1);
|
|
for (i=0 ; i < max_pos ; i++)
|
|
next_ptr=hp_free_level(block,level-1,
|
|
(HP_PTRS*) pos->blocks[i],next_ptr);
|
|
}
|
|
if ((uchar*) pos != last_pos)
|
|
{
|
|
my_free(pos);
|
|
return last_pos;
|
|
}
|
|
return next_ptr; /* next memory position */
|
|
}
|