mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +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.
237 lines
6.5 KiB
C++
237 lines
6.5 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 */
|
|
|
|
/* readline for batch mode */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include "my_readline.h"
|
|
|
|
static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
|
|
ulong max_size);
|
|
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str);
|
|
static size_t fill_buffer(LINE_BUFFER *buffer);
|
|
static char *intern_read_line(LINE_BUFFER *buffer, ulong *out_length, bool *truncated);
|
|
|
|
|
|
LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
|
|
{
|
|
LINE_BUFFER *line_buff;
|
|
if (!(line_buff=(LINE_BUFFER*)
|
|
my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
|
|
return 0;
|
|
if (init_line_buffer(line_buff,my_fileno(file),IO_SIZE,max_size))
|
|
{
|
|
my_free(line_buff);
|
|
return 0;
|
|
}
|
|
return line_buff;
|
|
}
|
|
|
|
|
|
char *batch_readline(LINE_BUFFER *line_buff, bool *truncated)
|
|
{
|
|
char *pos;
|
|
ulong out_length;
|
|
DBUG_ASSERT(truncated != NULL);
|
|
|
|
if (!(pos=intern_read_line(line_buff,&out_length, truncated)))
|
|
return 0;
|
|
if (out_length && pos[out_length-1] == '\n')
|
|
if (--out_length && pos[out_length-1] == '\r') /* Remove '\n' */
|
|
out_length--; /* Remove '\r' */
|
|
line_buff->read_length=out_length;
|
|
pos[out_length]=0;
|
|
return pos;
|
|
}
|
|
|
|
|
|
void batch_readline_end(LINE_BUFFER *line_buff)
|
|
{
|
|
if (line_buff)
|
|
{
|
|
my_free(line_buff->buffer);
|
|
my_free(line_buff);
|
|
}
|
|
}
|
|
|
|
|
|
LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str)
|
|
{
|
|
if (!line_buff)
|
|
if (!(line_buff=(LINE_BUFFER*)
|
|
my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
|
|
return 0;
|
|
if (init_line_buffer_from_string(line_buff,str))
|
|
{
|
|
my_free(line_buff);
|
|
return 0;
|
|
}
|
|
return line_buff;
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
Functions to handle buffered readings of lines from a stream
|
|
******************************************************************************/
|
|
|
|
static bool
|
|
init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
|
|
{
|
|
buffer->file=file;
|
|
buffer->bufread=size;
|
|
buffer->max_size=max_buffer;
|
|
if (!(buffer->buffer = (char*) my_malloc(buffer->bufread+1,
|
|
MYF(MY_WME | MY_FAE))))
|
|
return 1;
|
|
buffer->end_of_line=buffer->end=buffer->buffer;
|
|
buffer->buffer[0]=0; /* For easy start test */
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
init_line_buffer_from_string can be called on the same buffer
|
|
several times. the resulting buffer will contain a
|
|
concatenation of all strings separated by spaces
|
|
*/
|
|
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str)
|
|
{
|
|
uint old_length=(uint)(buffer->end - buffer->buffer);
|
|
uint length= (uint) strlen(str);
|
|
if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line=
|
|
(char*) my_realloc((uchar*) buffer->buffer, old_length+length+2,
|
|
MYF(MY_FAE|MY_ALLOW_ZERO_PTR))))
|
|
return 1;
|
|
buffer->end= buffer->buffer + old_length;
|
|
if (old_length)
|
|
buffer->end[-1]=' ';
|
|
memcpy(buffer->end, str, length);
|
|
buffer->end[length]= '\n';
|
|
buffer->end[length+1]= 0;
|
|
buffer->end+= length+1;
|
|
buffer->eof=1;
|
|
buffer->max_size=1;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill the buffer retaining the last n bytes at the beginning of the
|
|
newly filled buffer (for backward context). Returns the number of new
|
|
bytes read from disk.
|
|
*/
|
|
|
|
static size_t fill_buffer(LINE_BUFFER *buffer)
|
|
{
|
|
size_t read_count;
|
|
uint bufbytes= (uint) (buffer->end - buffer->start_of_line);
|
|
|
|
if (buffer->eof)
|
|
return 0; /* Everything read */
|
|
|
|
/* See if we need to grow the buffer. */
|
|
|
|
for (;;)
|
|
{
|
|
uint start_offset=(uint) (buffer->start_of_line - buffer->buffer);
|
|
read_count=(buffer->bufread - bufbytes)/IO_SIZE;
|
|
if ((read_count*=IO_SIZE))
|
|
break;
|
|
if (buffer->bufread * 2 > buffer->max_size)
|
|
{
|
|
/*
|
|
So we must grow the buffer but we cannot due to the max_size limit.
|
|
Return 0 w/o setting buffer->eof to signal this condition.
|
|
*/
|
|
return 0;
|
|
}
|
|
buffer->bufread *= 2;
|
|
if (!(buffer->buffer = (char*) my_realloc(buffer->buffer,
|
|
buffer->bufread+1,
|
|
MYF(MY_WME | MY_FAE))))
|
|
return (uint) -1;
|
|
buffer->start_of_line=buffer->buffer+start_offset;
|
|
buffer->end=buffer->buffer+bufbytes;
|
|
}
|
|
|
|
/* Shift stuff down. */
|
|
if (buffer->start_of_line != buffer->buffer)
|
|
{
|
|
bmove(buffer->buffer,buffer->start_of_line,(uint) bufbytes);
|
|
buffer->end=buffer->buffer+bufbytes;
|
|
}
|
|
|
|
/* Read in new stuff. */
|
|
if ((read_count= my_read(buffer->file, (uchar*) buffer->end, read_count,
|
|
MYF(MY_WME))) == MY_FILE_ERROR)
|
|
return (size_t) -1;
|
|
|
|
DBUG_PRINT("fill_buff", ("Got %lu bytes", (ulong) read_count));
|
|
|
|
if (!read_count)
|
|
{
|
|
buffer->eof = 1;
|
|
/* Kludge to pretend every nonempty file ends with a newline. */
|
|
if (bufbytes && buffer->end[-1] != '\n')
|
|
{
|
|
read_count = 1;
|
|
*buffer->end = '\n';
|
|
}
|
|
}
|
|
buffer->end_of_line=(buffer->start_of_line=buffer->buffer)+bufbytes;
|
|
buffer->end+=read_count;
|
|
*buffer->end=0; /* Sentinel */
|
|
return read_count;
|
|
}
|
|
|
|
|
|
|
|
char *intern_read_line(LINE_BUFFER *buffer, ulong *out_length, bool *truncated)
|
|
{
|
|
char *pos;
|
|
size_t length;
|
|
DBUG_ENTER("intern_read_line");
|
|
|
|
buffer->start_of_line=buffer->end_of_line;
|
|
for (;;)
|
|
{
|
|
pos=buffer->end_of_line;
|
|
while (*pos != '\n' && *pos)
|
|
pos++;
|
|
if (pos == buffer->end)
|
|
{
|
|
/*
|
|
fill_buffer() can return 0 either on EOF in which case we abort
|
|
or when the internal buffer has hit the size limit. In the latter case
|
|
return what we have read so far and signal string truncation.
|
|
*/
|
|
if (!(length=fill_buffer(buffer)) || length == (uint) -1)
|
|
{
|
|
if (buffer->eof)
|
|
DBUG_RETURN(0);
|
|
}
|
|
else
|
|
continue;
|
|
pos--; /* break line here */
|
|
*truncated= 1;
|
|
}
|
|
else
|
|
*truncated= 0;
|
|
buffer->end_of_line=pos+1;
|
|
*out_length=(ulong) (pos + 1 - buffer->eof - buffer->start_of_line);
|
|
DBUG_RETURN(buffer->start_of_line);
|
|
}
|
|
}
|