mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
70aa7424c4
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree. BUILD/SETUP.sh: Added -DPEDANTIC_SAFEMALLOC as standard debug option Docs/manual.texi: Changes for new version. client/mysql.cc: Fixed default value for rehash cleanup client/mysqladmin.c: Cleanup client/mysqlbinlog.cc: cleanup client/mysqldump.c: Cleanup client/mysqlmanager-pwgen.c: Cleanup client/mysqlmanagerc.c: Cleanup client/mysqltest.c: Cleanup dbug/dbug.c: Cleanup extra/resolve_stack_dump.c: Cleanup & Simple optimizations include/ft_global.h: Cleanup include/my_alloc.h: Cleanup include/my_global.h: Cleanup include/my_sys.h: Cleanup include/myisam.h: Cleanup libmysql/libmysql.c: Cleanup libmysql/manager.c: Cleanup myisam/ft_boolean_search.c: Cleanup myisam/ft_dump.c: Change strcpy -> strmov myisam/ft_eval.c: Cleanup myisam/ft_nlq_search.c: Cleanup myisam/ft_test1.c: strncpy -> strnmov myisam/ft_update.c: Cleanup myisam/mi_static.c: Cleanup myisam/mi_test2.c: Cleanup myisam/mi_write.c: Cleanup mysys/mf_fn_ext.c: Cleanup mysys/mf_iocache.c: Cleanup mysys/mf_iocache2.c: Cleanup mysys/my_getopt.c: Cleanup mysys/my_read.c: Cleanup mysys/my_thr_init.c: Cleanup mysys/queues.c: Cleanup mysys/safemalloc.c: Cleanup sql/field.cc: Indentation cleanups sql/ha_berkeley.cc: Indentation cleanups sql/ha_myisam.cc: Cleanup sql/item.h: Indentation cleanups sql/item_cmpfunc.cc: Indentation cleanups sql/item_create.cc: cleanup sql/item_func.cc: Cleanup sql/item_func.h: Indentation cleanups sql/item_strfunc.cc: Indentation cleanups sql/item_sum.cc: Indentation cleanups sql/item_timefunc.cc: Indentation cleanups sql/lock.cc: Indentation cleanups sql/log.cc: Cleanup strnmov -> strmake sql/log_event.cc: Cleanup + optimizations Fixed memory leak Added missing pthread_mutex_unlock() (On error condition) sql/log_event.h: Indentation and comment cleanup Merged #ifdef's into common blocks for better readability sql/mini_client.cc: Indentation cleanup sql/mysql_priv.h: Cleanup Changed int function to bool sql/mysqld.cc: Indentation and comment cleanup sql/net_pkg.cc: Indentation cleanup sql/net_serv.cc: Changed int function -> bool sql/nt_servc.cc: Cleanup sql/opt_range.cc: Indentation cleanup sql/repl_failsafe.cc: Cleanup + simple optimization strnmov -> strmake sql/slave.cc: strnmov -> strmake Cleanups sql/slave.h: Cleanup sql/sql_acl.cc: Indentation and DBUG_PRINT cleanup Changed WITH MAX... to not use = sql/sql_base.cc: Indentation cleanup sql/sql_cache.cc: Indentation cleanup sql/sql_class.cc: Indentation cleanup sql/sql_class.h: Renamed some struct slots sql/sql_delete.cc: Indentation cleanup sql/sql_handler.cc: Indentation cleanup sql/sql_insert.cc: Use new slot names. sql/sql_lex.cc: Indentation cleanup sql/sql_lex.h: Indentation cleanup sql/sql_load.cc: Indentation cleanup sql/sql_parse.cc: Indentation cleanup Removed not used check from LOCK TABLES sql/sql_repl.cc: strnmov -> strmake sql/sql_repl.h: Removed test if file is included (We want to know if it's included twice to avoid this) sql/sql_select.cc: Indentation cleanup sql/sql_show.cc: Indentation cleanup sql/sql_string.cc: Indentation cleanup sql/sql_table.cc: Indentation cleanup sql/sql_union.cc: Use renamed struct slot sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Removed = after GRANT ... MAX_ to make the syntax uniform sql/table.cc: Indentation cleanup sql/table.h: Indentation cleanup sql/time.cc: Indentation cleanup sql/udf_example.cc: Indentation cleanup sql/unireg.cc: strnmov -> strmake tests/grant.pl: Added test for LOCK TABLES tools/mysqlmanager.c: Cleanup fopen() -> my_fopen() vio/viosocket.c: DBUG_PRINT cleanups vio/viosslfactories.c: Indentation cleanup Checking of results from malloc() Fixed possible memory leak BitKeeper/etc/ignore: Added scripts/mysql_secure_installation to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
320 lines
7.3 KiB
C
320 lines
7.3 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/* Resolve numeric stack dump produced by mysqld 3.23.30 and later
|
|
versions into symbolic names. By Sasha Pachev <sasha@mysql.com>
|
|
*/
|
|
|
|
#define DONT_USE_RAID
|
|
#include <my_global.h>
|
|
#include <m_ctype.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <mysql_version.h>
|
|
#include <errno.h>
|
|
#include <my_getopt.h>
|
|
|
|
#define INIT_SYM_TABLE 4096
|
|
#define INC_SYM_TABLE 4096
|
|
#define MAX_SYM_SIZE 128
|
|
#define DUMP_VERSION "1.4"
|
|
#define HEX_INVALID (uchar)255
|
|
|
|
typedef ulong my_long_addr_t ; /* at some point, we need to fix configure
|
|
* to define this for us
|
|
*/
|
|
|
|
typedef struct sym_entry
|
|
{
|
|
char symbol[MAX_SYM_SIZE];
|
|
uchar* addr;
|
|
} SYM_ENTRY;
|
|
|
|
|
|
static char* dump_fname = 0, *sym_fname = 0;
|
|
static DYNAMIC_ARRAY sym_table; /* how do you like this , static DYNAMIC ? */
|
|
static FILE* fp_dump, *fp_sym = 0, *fp_out;
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"help", 'h', "Display this help and exit.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"version", 'V', "Output version information and exit.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"symbols-file", 's', "Use specified symbols file.", (gptr*) &sym_fname,
|
|
(gptr*) &sym_fname, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"numeric-dump-file", 'n', "Read the dump from specified file.",
|
|
(gptr*) &dump_fname, (gptr*) &dump_fname, 0, GET_STR, REQUIRED_ARG,
|
|
0, 0, 0, 0, 0, 0},
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
|
|
static void verify_sort();
|
|
|
|
static void print_version(void)
|
|
{
|
|
printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname,DUMP_VERSION,
|
|
MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
|
|
}
|
|
|
|
static void usage()
|
|
{
|
|
print_version();
|
|
printf("MySQL AB, by Sasha Pachev\n");
|
|
printf("This software comes with ABSOLUTELY NO WARRANTY\n\n");
|
|
printf("Resolve numeric stack strace dump into symbols.\n\n");
|
|
printf("Usage: %s [OPTIONS] symbols-file [numeric-dump-file]\n",
|
|
my_progname);
|
|
my_print_help(my_long_options);
|
|
my_print_variables(my_long_options);
|
|
printf("\n\
|
|
The symbols-file should include the output from: 'nm --numeric-sort mysqld'.\n\
|
|
The numeric-dump-file should contain a numeric stack trace from mysqld.\n\
|
|
If the numeric-dump-file is not given, the stack trace is read from stdin.\n");
|
|
}
|
|
|
|
|
|
|
|
static void die(const char* fmt, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
fprintf(stderr, "%s: ", my_progname);
|
|
vfprintf(stderr, fmt, args);
|
|
fprintf(stderr, "\n");
|
|
va_end(args);
|
|
exit(1);
|
|
}
|
|
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
char *argument __attribute__((unused)))
|
|
{
|
|
switch(optid) {
|
|
case 'V':
|
|
print_version();
|
|
exit(0);
|
|
case '?':
|
|
usage();
|
|
exit(0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int parse_args(int argc, char **argv)
|
|
{
|
|
int ho_error;
|
|
|
|
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
|
|
exit(ho_error);
|
|
|
|
/*
|
|
The following code is to make the command compatible with the old
|
|
version that required one to use the -n and -s options
|
|
*/
|
|
|
|
if (argc == 2)
|
|
{
|
|
sym_fname= argv[0];
|
|
dump_fname= argv[1];
|
|
}
|
|
else if (argc == 1)
|
|
{
|
|
if (!sym_fname)
|
|
sym_fname = argv[0];
|
|
else if (!dump_fname)
|
|
dump_fname = argv[0];
|
|
else
|
|
{
|
|
usage();
|
|
exit(1);
|
|
}
|
|
}
|
|
else if (argc != 0 || !sym_fname)
|
|
{
|
|
usage();
|
|
exit(1);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void open_files()
|
|
{
|
|
fp_out = stdout;
|
|
fp_dump = stdin;
|
|
|
|
if (dump_fname && !(fp_dump = my_fopen(dump_fname, O_RDONLY, MYF(MY_WME))))
|
|
die("Could not open %s", dump_fname);
|
|
/* if name not given, assume stdin*/
|
|
|
|
if (!sym_fname)
|
|
die("Please run nm --numeric-sort on mysqld binary that produced stack \
|
|
trace dump and specify the path to it with -s or --symbols-file");
|
|
if (!(fp_sym = my_fopen(sym_fname, O_RDONLY, MYF(MY_WME))))
|
|
die("Could not open %s", sym_fname);
|
|
|
|
}
|
|
|
|
static uchar hex_val(char c)
|
|
{
|
|
uchar l;
|
|
if (isdigit(c))
|
|
return c - '0';
|
|
l = tolower(c);
|
|
if (l < 'a' || l > 'f')
|
|
return HEX_INVALID;
|
|
return (uchar)10 + ((uchar)c - (uchar)'a');
|
|
}
|
|
|
|
static my_long_addr_t read_addr(char** buf)
|
|
{
|
|
uchar c;
|
|
char* p = *buf;
|
|
my_long_addr_t addr = 0;
|
|
|
|
while((c = hex_val(*p++)) != HEX_INVALID)
|
|
addr = (addr << 4) + c;
|
|
|
|
*buf = p;
|
|
return addr;
|
|
}
|
|
|
|
static int init_sym_entry(SYM_ENTRY* se, char* buf)
|
|
{
|
|
char* p, *p_end;
|
|
se->addr = (uchar*)read_addr(&buf);
|
|
|
|
if (!se->addr)
|
|
return -1;
|
|
while (isspace(*buf++)) ;
|
|
|
|
while (isspace(*buf++)) ; /* skip more space */
|
|
--buf;
|
|
/* now we are on the symbol */
|
|
for (p = se->symbol, p_end = se->symbol + sizeof(se->symbol) - 1;
|
|
*buf != '\n' && *buf && p < p_end; ++buf,++p)
|
|
*p = *buf;
|
|
*p = 0;
|
|
if (!strcmp(se->symbol, "gcc2_compiled."))
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
static void init_sym_table()
|
|
{
|
|
char buf[512];
|
|
if (my_init_dynamic_array(&sym_table, sizeof(SYM_ENTRY), INIT_SYM_TABLE,
|
|
INC_SYM_TABLE))
|
|
die("Failed in my_init_dynamic_array() -- looks like out of memory problem");
|
|
|
|
while (fgets(buf, sizeof(buf), fp_sym))
|
|
{
|
|
SYM_ENTRY se;
|
|
if (init_sym_entry(&se, buf))
|
|
continue;
|
|
if (insert_dynamic(&sym_table, (gptr)&se))
|
|
die("insert_dynamic() failed - looks like we are out of memory");
|
|
}
|
|
|
|
verify_sort();
|
|
}
|
|
|
|
static void clean_up()
|
|
{
|
|
delete_dynamic(&sym_table);
|
|
}
|
|
|
|
static void verify_sort()
|
|
{
|
|
uint i;
|
|
uchar* last = 0;
|
|
|
|
for (i = 0; i < sym_table.elements; i++)
|
|
{
|
|
SYM_ENTRY se;
|
|
get_dynamic(&sym_table, (gptr)&se, i);
|
|
if (se.addr < last)
|
|
die("sym table does not appear to be sorted, did you forget \
|
|
--numeric-sort arg to nm? trouble addr = %p, last = %p", se.addr, last);
|
|
last = se.addr;
|
|
}
|
|
}
|
|
|
|
|
|
static SYM_ENTRY* resolve_addr(uchar* addr, SYM_ENTRY* se)
|
|
{
|
|
uint i;
|
|
get_dynamic(&sym_table, (gptr)se, 0);
|
|
if (addr < se->addr)
|
|
return 0;
|
|
|
|
for (i = 1; i < sym_table.elements; i++)
|
|
{
|
|
get_dynamic(&sym_table, (gptr)se, i);
|
|
if (addr < se->addr)
|
|
{
|
|
get_dynamic(&sym_table, (gptr)se, i - 1);
|
|
return se;
|
|
}
|
|
}
|
|
|
|
return se;
|
|
}
|
|
|
|
|
|
static void do_resolve()
|
|
{
|
|
char buf[1024], *p;
|
|
while (fgets(buf, sizeof(buf), fp_dump))
|
|
{
|
|
p = buf;
|
|
while(isspace(*p))
|
|
++p;
|
|
|
|
if (*p++ == '0' && *p++ == 'x')
|
|
{
|
|
SYM_ENTRY se ;
|
|
uchar* addr = (uchar*)read_addr(&p);
|
|
if (resolve_addr(addr, &se))
|
|
fprintf(fp_out, "%p %s + %d\n", addr, se.symbol,
|
|
(int) (addr - se.addr));
|
|
else
|
|
fprintf(fp_out, "%p (?)\n", addr);
|
|
|
|
}
|
|
else
|
|
{
|
|
fputs(buf, fp_out);
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
MY_INIT(argv[0]);
|
|
parse_args(argc, argv);
|
|
open_files();
|
|
init_sym_table();
|
|
do_resolve();
|
|
clean_up();
|
|
return 0;
|
|
}
|