mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
323 lines
7.4 KiB
C
323 lines
7.4 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 (my_isdigit(system_charset_info,c))
|
|
return c - '0';
|
|
l = my_tolower(system_charset_info,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 (my_isspace(system_charset_info,*buf++))
|
|
/* empty */;
|
|
|
|
while (my_isspace(system_charset_info,*buf++))
|
|
/* empty - 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;
|
|
/* skip space */
|
|
while (my_isspace(system_charset_info,*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;
|
|
}
|