mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
f56dd32bf7
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. client/mysqldump.c: Pass my_free directly as its signature is compatible with the callback type -- which wasn't the case for free_table_ent.
226 lines
5.7 KiB
C
226 lines
5.7 KiB
C
/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
|
|
|
|
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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include <errno.h>
|
|
#include "mysys_err.h"
|
|
|
|
static void make_ftype(char * to,int flag);
|
|
|
|
/*
|
|
Open a file as stream
|
|
|
|
SYNOPSIS
|
|
my_fopen()
|
|
FileName Path-name of file
|
|
Flags Read | write | append | trunc (like for open())
|
|
MyFlags Flags for handling errors
|
|
|
|
RETURN
|
|
0 Error
|
|
# File handler
|
|
*/
|
|
|
|
FILE *my_fopen(const char *filename, int flags, myf MyFlags)
|
|
{
|
|
FILE *fd;
|
|
char type[5];
|
|
DBUG_ENTER("my_fopen");
|
|
DBUG_PRINT("my",("Name: '%s' flags: %d MyFlags: %d",
|
|
filename, flags, MyFlags));
|
|
|
|
make_ftype(type,flags);
|
|
|
|
#ifdef _WIN32
|
|
fd= my_win_fopen(filename, type);
|
|
#else
|
|
fd= fopen(filename, type);
|
|
#endif
|
|
if (fd != 0)
|
|
{
|
|
/*
|
|
The test works if MY_NFILE < 128. The problem is that fileno() is char
|
|
on some OS (SUNOS). Actually the filename save isn't that important
|
|
so we can ignore if this doesn't work.
|
|
*/
|
|
|
|
int filedesc= my_fileno(fd);
|
|
if ((uint)filedesc >= my_file_limit)
|
|
{
|
|
thread_safe_increment(my_stream_opened,&THR_LOCK_open);
|
|
DBUG_RETURN(fd); /* safeguard */
|
|
}
|
|
mysql_mutex_lock(&THR_LOCK_open);
|
|
if ((my_file_info[filedesc].name= (char*)
|
|
my_strdup(filename,MyFlags)))
|
|
{
|
|
my_stream_opened++;
|
|
my_file_total_opened++;
|
|
my_file_info[filedesc].type= STREAM_BY_FOPEN;
|
|
mysql_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
|
|
DBUG_RETURN(fd);
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_open);
|
|
(void) my_fclose(fd,MyFlags);
|
|
my_errno=ENOMEM;
|
|
}
|
|
else
|
|
my_errno=errno;
|
|
DBUG_PRINT("error",("Got error %d on open",my_errno));
|
|
if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
|
|
my_error((flags & O_RDONLY) || (flags == O_RDONLY ) ? EE_FILENOTFOUND :
|
|
EE_CANTCREATEFILE,
|
|
MYF(ME_BELL+ME_WAITTANG), filename, my_errno);
|
|
DBUG_RETURN((FILE*) 0);
|
|
} /* my_fopen */
|
|
|
|
|
|
/* Close a stream */
|
|
|
|
/* Close a stream */
|
|
int my_fclose(FILE *fd, myf MyFlags)
|
|
{
|
|
int err,file;
|
|
DBUG_ENTER("my_fclose");
|
|
DBUG_PRINT("my",("stream: 0x%lx MyFlags: %d", (long) fd, MyFlags));
|
|
|
|
mysql_mutex_lock(&THR_LOCK_open);
|
|
file= my_fileno(fd);
|
|
#ifndef _WIN32
|
|
err= fclose(fd);
|
|
#else
|
|
err= my_win_fclose(fd);
|
|
#endif
|
|
if(err < 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(file),errno);
|
|
}
|
|
else
|
|
my_stream_opened--;
|
|
if ((uint) file < my_file_limit && my_file_info[file].type != UNOPEN)
|
|
{
|
|
my_file_info[file].type = UNOPEN;
|
|
my_free(my_file_info[file].name);
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_RETURN(err);
|
|
} /* my_fclose */
|
|
|
|
|
|
/* Make a stream out of a file handle */
|
|
/* Name may be 0 */
|
|
|
|
FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags)
|
|
{
|
|
FILE *fd;
|
|
char type[5];
|
|
DBUG_ENTER("my_fdopen");
|
|
DBUG_PRINT("my",("Fd: %d Flags: %d MyFlags: %d",
|
|
Filedes, Flags, MyFlags));
|
|
|
|
make_ftype(type,Flags);
|
|
#ifdef _WIN32
|
|
fd= my_win_fdopen(Filedes, type);
|
|
#else
|
|
fd= fdopen(Filedes, type);
|
|
#endif
|
|
if (!fd)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_CANT_OPEN_STREAM, MYF(ME_BELL+ME_WAITTANG),errno);
|
|
}
|
|
else
|
|
{
|
|
mysql_mutex_lock(&THR_LOCK_open);
|
|
my_stream_opened++;
|
|
if ((uint) Filedes < (uint) my_file_limit)
|
|
{
|
|
if (my_file_info[Filedes].type != UNOPEN)
|
|
{
|
|
my_file_opened--; /* File is opened with my_open ! */
|
|
}
|
|
else
|
|
{
|
|
my_file_info[Filedes].name= my_strdup(name,MyFlags);
|
|
}
|
|
my_file_info[Filedes].type = STREAM_BY_FDOPEN;
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_open);
|
|
}
|
|
|
|
DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
|
|
DBUG_RETURN(fd);
|
|
} /* my_fdopen */
|
|
|
|
|
|
/*
|
|
Make a fopen() typestring from a open() type bitmap
|
|
|
|
SYNOPSIS
|
|
make_ftype()
|
|
to String for fopen() is stored here
|
|
flag Flag used by open()
|
|
|
|
IMPLEMENTATION
|
|
This routine attempts to find the best possible match
|
|
between a numeric option and a string option that could be
|
|
fed to fopen. There is not a 1 to 1 mapping between the two.
|
|
|
|
NOTE
|
|
On Unix, O_RDONLY is usually 0
|
|
|
|
MAPPING
|
|
r == O_RDONLY
|
|
w == O_WRONLY|O_TRUNC|O_CREAT
|
|
a == O_WRONLY|O_APPEND|O_CREAT
|
|
r+ == O_RDWR
|
|
w+ == O_RDWR|O_TRUNC|O_CREAT
|
|
a+ == O_RDWR|O_APPEND|O_CREAT
|
|
*/
|
|
|
|
static void make_ftype(register char * to, register int flag)
|
|
{
|
|
/* check some possible invalid combinations */
|
|
DBUG_ASSERT((flag & (O_TRUNC | O_APPEND)) != (O_TRUNC | O_APPEND));
|
|
DBUG_ASSERT((flag & (O_WRONLY | O_RDWR)) != (O_WRONLY | O_RDWR));
|
|
|
|
if ((flag & (O_RDONLY|O_WRONLY)) == O_WRONLY)
|
|
*to++= (flag & O_APPEND) ? 'a' : 'w';
|
|
else if (flag & O_RDWR)
|
|
{
|
|
/* Add '+' after theese */
|
|
if (flag & (O_TRUNC | O_CREAT))
|
|
*to++= 'w';
|
|
else if (flag & O_APPEND)
|
|
*to++= 'a';
|
|
else
|
|
*to++= 'r';
|
|
*to++= '+';
|
|
}
|
|
else
|
|
*to++= 'r';
|
|
|
|
#if FILE_BINARY /* If we have binary-files */
|
|
if (flag & FILE_BINARY)
|
|
*to++='b';
|
|
#endif
|
|
*to='\0';
|
|
} /* make_ftype */
|