mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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.
151 lines
3.6 KiB
C
151 lines
3.6 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 */
|
|
|
|
#include <my_global.h>
|
|
#ifdef HAVE_OPENSSL
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include "mysql.h"
|
|
#include "errmsg.h"
|
|
#include <my_dir.h>
|
|
#include <my_getopt.h>
|
|
#include <signal.h>
|
|
#include <violite.h>
|
|
|
|
const char *VER="0.2";
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
const char *default_dbug_option="d:t:O,/tmp/viotest-ssl.trace";
|
|
#endif
|
|
|
|
void
|
|
fatal_error(const char *r)
|
|
{
|
|
perror(r);
|
|
exit(0);
|
|
}
|
|
|
|
void
|
|
print_usage()
|
|
{
|
|
printf("viossl-test: testing SSL virtual IO. Usage:\n");
|
|
printf("viossl-test server-key server-cert client-key client-cert [CAfile] [CApath]\n");
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
char* server_key = 0;
|
|
char* server_cert = 0;
|
|
char* client_key = 0;
|
|
char* client_cert = 0;
|
|
char* ca_file = 0;
|
|
char* ca_path = 0;
|
|
int child_pid,sv[2];
|
|
struct st_VioSSLAcceptorFd* ssl_acceptor=0;
|
|
struct st_VioSSLConnectorFd* ssl_connector=0;
|
|
Vio* client_vio=0;
|
|
Vio* server_vio=0;
|
|
MY_INIT(argv[0]);
|
|
DBUG_PROCESS(argv[0]);
|
|
DBUG_PUSH(default_dbug_option);
|
|
|
|
if (argc<5)
|
|
{
|
|
print_usage();
|
|
return 1;
|
|
}
|
|
|
|
server_key = argv[1];
|
|
server_cert = argv[2];
|
|
client_key = argv[3];
|
|
client_cert = argv[4];
|
|
if (argc>5)
|
|
ca_file = argv[5];
|
|
if (argc>6)
|
|
ca_path = argv[6];
|
|
printf("Server key/cert : %s/%s\n", server_key, server_cert);
|
|
printf("Client key/cert : %s/%s\n", client_key, client_cert);
|
|
if (ca_file!=0)
|
|
printf("CAfile : %s\n", ca_file);
|
|
if (ca_path!=0)
|
|
printf("CApath : %s\n", ca_path);
|
|
|
|
|
|
if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
|
|
fatal_error("socketpair");
|
|
|
|
ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file,
|
|
ca_path);
|
|
ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file,
|
|
ca_path);
|
|
|
|
client_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
|
|
client_vio->sd = sv[0];
|
|
sslconnect(ssl_connector,client_vio);
|
|
server_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
|
|
server_vio->sd = sv[1];
|
|
sslaccept(ssl_acceptor,server_vio);
|
|
|
|
printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
|
|
|
|
child_pid = fork();
|
|
if (child_pid==-1)
|
|
{
|
|
my_free(ssl_acceptor);
|
|
my_free(ssl_connector);
|
|
fatal_error("fork");
|
|
}
|
|
if (child_pid==0)
|
|
{
|
|
/* child, therefore, client */
|
|
char xbuf[100];
|
|
int r = vio_ssl_read(client_vio,xbuf, sizeof(xbuf));
|
|
if (r<=0) {
|
|
my_free(ssl_acceptor);
|
|
my_free(ssl_connector);
|
|
fatal_error("client:SSL_read");
|
|
}
|
|
xbuf[r] = 0;
|
|
printf("client:got %s\n", xbuf);
|
|
my_free(client_vio);
|
|
my_free(ssl_acceptor);
|
|
my_free(ssl_connector);
|
|
sleep(1);
|
|
}
|
|
else
|
|
{
|
|
const char* s = "Huhuhuh";
|
|
int r = vio_ssl_write(server_vio,(uchar*)s, strlen(s));
|
|
if (r<=0) {
|
|
my_free(ssl_acceptor);
|
|
my_free(ssl_connector);
|
|
fatal_error("server:SSL_write");
|
|
}
|
|
my_free(server_vio);
|
|
my_free(ssl_acceptor);
|
|
my_free(ssl_connector);
|
|
sleep(1);
|
|
}
|
|
return 0;
|
|
}
|
|
#else /* HAVE_OPENSSL */
|
|
|
|
int main() {
|
|
return 0;
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|