mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
088e2395f1
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c
420 lines
12 KiB
C
420 lines
12 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
/* Routines to handle mallocing of results which will be freed the same time */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#undef EXTRA_DEBUG
|
|
#define EXTRA_DEBUG
|
|
|
|
|
|
/*
|
|
Initialize memory root
|
|
|
|
SYNOPSIS
|
|
init_alloc_root()
|
|
mem_root - memory root to initialize
|
|
block_size - size of chunks (blocks) used for memory allocation
|
|
(It is external size of chunk i.e. it should include
|
|
memory required for internal structures, thus it
|
|
should be no less than ALLOC_ROOT_MIN_BLOCK_SIZE)
|
|
pre_alloc_size - if non-0, then size of block that should be
|
|
pre-allocated during memory root initialization.
|
|
|
|
DESCRIPTION
|
|
This function prepares memory root for further use, sets initial size of
|
|
chunk for memory allocation and pre-allocates first block if specified.
|
|
Altough error can happen during execution of this function if
|
|
pre_alloc_size is non-0 it won't be reported. Instead it will be
|
|
reported as error in first alloc_root() on this memory root.
|
|
*/
|
|
|
|
void init_alloc_root(MEM_ROOT *mem_root, size_t block_size,
|
|
size_t pre_alloc_size __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("init_alloc_root");
|
|
DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root));
|
|
|
|
mem_root->free= mem_root->used= mem_root->pre_alloc= 0;
|
|
mem_root->min_malloc= 32;
|
|
mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
|
|
mem_root->error_handler= 0;
|
|
mem_root->block_num= 4; /* We shift this with >>2 */
|
|
mem_root->first_block_usage= 0;
|
|
|
|
#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))
|
|
if (pre_alloc_size)
|
|
{
|
|
if ((mem_root->free= mem_root->pre_alloc=
|
|
(USED_MEM*) my_malloc(pre_alloc_size+ ALIGN_SIZE(sizeof(USED_MEM)),
|
|
MYF(0))))
|
|
{
|
|
mem_root->free->size= pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM));
|
|
mem_root->free->left= pre_alloc_size;
|
|
mem_root->free->next= 0;
|
|
}
|
|
}
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSIS
|
|
reset_root_defaults()
|
|
mem_root memory root to change defaults of
|
|
block_size new value of block size. Must be greater or equal
|
|
than ALLOC_ROOT_MIN_BLOCK_SIZE (this value is about
|
|
68 bytes and depends on platform and compilation flags)
|
|
pre_alloc_size new size of preallocated block. If not zero,
|
|
must be equal to or greater than block size,
|
|
otherwise means 'no prealloc'.
|
|
DESCRIPTION
|
|
Function aligns and assigns new value to block size; then it tries to
|
|
reuse one of existing blocks as prealloc block, or malloc new one of
|
|
requested size. If no blocks can be reused, all unused blocks are freed
|
|
before allocation.
|
|
*/
|
|
|
|
void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
|
|
size_t pre_alloc_size __attribute__((unused)))
|
|
{
|
|
DBUG_ASSERT(alloc_root_inited(mem_root));
|
|
|
|
mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
|
|
#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))
|
|
if (pre_alloc_size)
|
|
{
|
|
size_t size= pre_alloc_size + ALIGN_SIZE(sizeof(USED_MEM));
|
|
if (!mem_root->pre_alloc || mem_root->pre_alloc->size != size)
|
|
{
|
|
USED_MEM *mem, **prev= &mem_root->free;
|
|
/*
|
|
Free unused blocks, so that consequent calls
|
|
to reset_root_defaults won't eat away memory.
|
|
*/
|
|
while (*prev)
|
|
{
|
|
mem= *prev;
|
|
if (mem->size == size)
|
|
{
|
|
/* We found a suitable block, no need to do anything else */
|
|
mem_root->pre_alloc= mem;
|
|
return;
|
|
}
|
|
if (mem->left + ALIGN_SIZE(sizeof(USED_MEM)) == mem->size)
|
|
{
|
|
/* remove block from the list and free it */
|
|
*prev= mem->next;
|
|
my_free(mem, MYF(0));
|
|
}
|
|
else
|
|
prev= &mem->next;
|
|
}
|
|
/* Allocate new prealloc block and add it to the end of free list */
|
|
if ((mem= (USED_MEM *) my_malloc(size, MYF(0))))
|
|
{
|
|
mem->size= size;
|
|
mem->left= pre_alloc_size;
|
|
mem->next= *prev;
|
|
*prev= mem_root->pre_alloc= mem;
|
|
}
|
|
else
|
|
{
|
|
mem_root->pre_alloc= 0;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
#endif
|
|
mem_root->pre_alloc= 0;
|
|
}
|
|
|
|
|
|
void *alloc_root(MEM_ROOT *mem_root, size_t length)
|
|
{
|
|
#if defined(HAVE_purify) && defined(EXTRA_DEBUG)
|
|
reg1 USED_MEM *next;
|
|
DBUG_ENTER("alloc_root");
|
|
DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root));
|
|
|
|
DBUG_ASSERT(alloc_root_inited(mem_root));
|
|
|
|
length+=ALIGN_SIZE(sizeof(USED_MEM));
|
|
if (!(next = (USED_MEM*) my_malloc(length,MYF(MY_WME))))
|
|
{
|
|
if (mem_root->error_handler)
|
|
(*mem_root->error_handler)();
|
|
DBUG_RETURN((uchar*) 0); /* purecov: inspected */
|
|
}
|
|
next->next= mem_root->used;
|
|
next->size= length;
|
|
mem_root->used= next;
|
|
DBUG_PRINT("exit",("ptr: 0x%lx", (long) (((char*) next)+
|
|
ALIGN_SIZE(sizeof(USED_MEM)))));
|
|
DBUG_RETURN((uchar*) (((char*) next)+ALIGN_SIZE(sizeof(USED_MEM))));
|
|
#else
|
|
size_t get_size, block_size;
|
|
uchar* point;
|
|
reg1 USED_MEM *next= 0;
|
|
reg2 USED_MEM **prev;
|
|
DBUG_ENTER("alloc_root");
|
|
DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root));
|
|
DBUG_ASSERT(alloc_root_inited(mem_root));
|
|
|
|
length= ALIGN_SIZE(length);
|
|
if ((*(prev= &mem_root->free)) != NULL)
|
|
{
|
|
if ((*prev)->left < length &&
|
|
mem_root->first_block_usage++ >= ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP &&
|
|
(*prev)->left < ALLOC_MAX_BLOCK_TO_DROP)
|
|
{
|
|
next= *prev;
|
|
*prev= next->next; /* Remove block from list */
|
|
next->next= mem_root->used;
|
|
mem_root->used= next;
|
|
mem_root->first_block_usage= 0;
|
|
}
|
|
for (next= *prev ; next && next->left < length ; next= next->next)
|
|
prev= &next->next;
|
|
}
|
|
if (! next)
|
|
{ /* Time to alloc new block */
|
|
block_size= mem_root->block_size * (mem_root->block_num >> 2);
|
|
get_size= length+ALIGN_SIZE(sizeof(USED_MEM));
|
|
get_size= max(get_size, block_size);
|
|
|
|
if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME))))
|
|
{
|
|
if (mem_root->error_handler)
|
|
(*mem_root->error_handler)();
|
|
return((void*) 0); /* purecov: inspected */
|
|
}
|
|
mem_root->block_num++;
|
|
next->next= *prev;
|
|
next->size= get_size;
|
|
next->left= get_size-ALIGN_SIZE(sizeof(USED_MEM));
|
|
*prev=next;
|
|
}
|
|
|
|
point= (uchar*) ((char*) next+ (next->size-next->left));
|
|
/*TODO: next part may be unneded due to mem_root->first_block_usage counter*/
|
|
if ((next->left-= length) < mem_root->min_malloc)
|
|
{ /* Full block */
|
|
*prev= next->next; /* Remove block from list */
|
|
next->next= mem_root->used;
|
|
mem_root->used= next;
|
|
mem_root->first_block_usage= 0;
|
|
}
|
|
DBUG_PRINT("exit",("ptr: 0x%lx", (ulong) point));
|
|
DBUG_RETURN((void*) point);
|
|
#endif
|
|
}
|
|
|
|
|
|
/*
|
|
Allocate many pointers at the same time.
|
|
|
|
DESCRIPTION
|
|
ptr1, ptr2, etc all point into big allocated memory area.
|
|
|
|
SYNOPSIS
|
|
multi_alloc_root()
|
|
root Memory root
|
|
ptr1, length1 Multiple arguments terminated by a NULL pointer
|
|
ptr2, length2 ...
|
|
...
|
|
NULL
|
|
|
|
RETURN VALUE
|
|
A pointer to the beginning of the allocated memory block
|
|
in case of success or NULL if out of memory.
|
|
*/
|
|
|
|
void *multi_alloc_root(MEM_ROOT *root, ...)
|
|
{
|
|
va_list args;
|
|
char **ptr, *start, *res;
|
|
size_t tot_length, length;
|
|
DBUG_ENTER("multi_alloc_root");
|
|
|
|
va_start(args, root);
|
|
tot_length= 0;
|
|
while ((ptr= va_arg(args, char **)))
|
|
{
|
|
length= va_arg(args, uint);
|
|
tot_length+= ALIGN_SIZE(length);
|
|
}
|
|
va_end(args);
|
|
|
|
if (!(start= (char*) alloc_root(root, tot_length)))
|
|
DBUG_RETURN(0); /* purecov: inspected */
|
|
|
|
va_start(args, root);
|
|
res= start;
|
|
while ((ptr= va_arg(args, char **)))
|
|
{
|
|
*ptr= res;
|
|
length= va_arg(args, uint);
|
|
res+= ALIGN_SIZE(length);
|
|
}
|
|
va_end(args);
|
|
DBUG_RETURN((void*) start);
|
|
}
|
|
|
|
#define TRASH_MEM(X) TRASH(((char*)(X) + ((X)->size-(X)->left)), (X)->left)
|
|
|
|
/* Mark all data in blocks free for reusage */
|
|
|
|
static inline void mark_blocks_free(MEM_ROOT* root)
|
|
{
|
|
reg1 USED_MEM *next;
|
|
reg2 USED_MEM **last;
|
|
|
|
/* iterate through (partially) free blocks, mark them free */
|
|
last= &root->free;
|
|
for (next= root->free; next; next= *(last= &next->next))
|
|
{
|
|
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
|
|
TRASH_MEM(next);
|
|
}
|
|
|
|
/* Combine the free and the used list */
|
|
*last= next=root->used;
|
|
|
|
/* now go through the used blocks and mark them free */
|
|
for (; next; next= next->next)
|
|
{
|
|
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
|
|
TRASH_MEM(next);
|
|
}
|
|
|
|
/* Now everything is set; Indicate that nothing is used anymore */
|
|
root->used= 0;
|
|
root->first_block_usage= 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Deallocate everything used by alloc_root or just move
|
|
used blocks to free list if called with MY_USED_TO_FREE
|
|
|
|
SYNOPSIS
|
|
free_root()
|
|
root Memory root
|
|
MyFlags Flags for what should be freed:
|
|
|
|
MY_MARK_BLOCKS_FREED Don't free blocks, just mark them free
|
|
MY_KEEP_PREALLOC If this is not set, then free also the
|
|
preallocated block
|
|
|
|
NOTES
|
|
One can call this function either with root block initialised with
|
|
init_alloc_root() or with a bzero()-ed block.
|
|
It's also safe to call this multiple times with the same mem_root.
|
|
*/
|
|
|
|
void free_root(MEM_ROOT *root, myf MyFlags)
|
|
{
|
|
reg1 USED_MEM *next,*old;
|
|
DBUG_ENTER("free_root");
|
|
DBUG_PRINT("enter",("root: 0x%lx flags: %u", (long) root, (uint) MyFlags));
|
|
|
|
if (MyFlags & MY_MARK_BLOCKS_FREE)
|
|
{
|
|
mark_blocks_free(root);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
if (!(MyFlags & MY_KEEP_PREALLOC))
|
|
root->pre_alloc=0;
|
|
|
|
for (next=root->used; next ;)
|
|
{
|
|
old=next; next= next->next ;
|
|
if (old != root->pre_alloc)
|
|
my_free(old,MYF(0));
|
|
}
|
|
for (next=root->free ; next ;)
|
|
{
|
|
old=next; next= next->next;
|
|
if (old != root->pre_alloc)
|
|
my_free(old,MYF(0));
|
|
}
|
|
root->used=root->free=0;
|
|
if (root->pre_alloc)
|
|
{
|
|
root->free=root->pre_alloc;
|
|
root->free->left=root->pre_alloc->size-ALIGN_SIZE(sizeof(USED_MEM));
|
|
TRASH_MEM(root->pre_alloc);
|
|
root->free->next=0;
|
|
}
|
|
root->block_num= 4;
|
|
root->first_block_usage= 0;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Find block that contains an object and set the pre_alloc to it
|
|
*/
|
|
|
|
void set_prealloc_root(MEM_ROOT *root, char *ptr)
|
|
{
|
|
USED_MEM *next;
|
|
for (next=root->used; next ; next=next->next)
|
|
{
|
|
if ((char*) next <= ptr && (char*) next + next->size > ptr)
|
|
{
|
|
root->pre_alloc=next;
|
|
return;
|
|
}
|
|
}
|
|
for (next=root->free ; next ; next=next->next)
|
|
{
|
|
if ((char*) next <= ptr && (char*) next + next->size > ptr)
|
|
{
|
|
root->pre_alloc=next;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
char *strdup_root(MEM_ROOT *root, const char *str)
|
|
{
|
|
return strmake_root(root, str, strlen(str));
|
|
}
|
|
|
|
|
|
char *strmake_root(MEM_ROOT *root, const char *str, size_t len)
|
|
{
|
|
char *pos;
|
|
if ((pos=alloc_root(root,len+1)))
|
|
{
|
|
memcpy(pos,str,len);
|
|
pos[len]=0;
|
|
}
|
|
return pos;
|
|
}
|
|
|
|
|
|
void *memdup_root(MEM_ROOT *root, const void *str, size_t len)
|
|
{
|
|
char *pos;
|
|
if ((pos=alloc_root(root,len)))
|
|
memcpy(pos,str,len);
|
|
return pos;
|
|
}
|