|
|
|
@ -3997,35 +3997,31 @@ extern "C" { |
|
|
|
static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) |
|
|
|
{ |
|
|
|
THD *thd= current_thd; |
|
|
|
/* If thread specific memory */ |
|
|
|
if (likely(is_thread_specific)) |
|
|
|
|
|
|
|
if (likely(is_thread_specific)) /* If thread specific memory */ |
|
|
|
{ |
|
|
|
if (mysqld_server_initialized || thd) |
|
|
|
{ |
|
|
|
/*
|
|
|
|
THD may not be set if we are called from my_net_init() before THD |
|
|
|
thread has started. |
|
|
|
However, this should never happen, so better to assert and |
|
|
|
fix this. |
|
|
|
*/ |
|
|
|
DBUG_ASSERT(thd); |
|
|
|
if (thd) |
|
|
|
{ |
|
|
|
DBUG_PRINT("info", ("memory_used: %lld size: %lld", |
|
|
|
(longlong) thd->status_var.local_memory_used, |
|
|
|
size)); |
|
|
|
thd->status_var.local_memory_used+= size; |
|
|
|
DBUG_ASSERT((longlong) thd->status_var.local_memory_used >= 0); |
|
|
|
} |
|
|
|
} |
|
|
|
/*
|
|
|
|
When thread specfic is set, both mysqld_server_initialized and thd |
|
|
|
must be set |
|
|
|
*/ |
|
|
|
DBUG_ASSERT(mysqld_server_initialized && thd); |
|
|
|
|
|
|
|
DBUG_PRINT("info", ("thd memory_used: %lld size: %lld", |
|
|
|
(longlong) thd->status_var.local_memory_used, |
|
|
|
size)); |
|
|
|
thd->status_var.local_memory_used+= size; |
|
|
|
DBUG_ASSERT((longlong) thd->status_var.local_memory_used >= 0); |
|
|
|
} |
|
|
|
else if (likely(thd)) |
|
|
|
{ |
|
|
|
DBUG_PRINT("info", ("global thd memory_used: %lld size: %lld", |
|
|
|
(longlong) thd->status_var.global_memory_used, |
|
|
|
size)); |
|
|
|
thd->status_var.global_memory_used+= size; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
// workaround for gcc 4.2.4-1ubuntu4 -fPIE (from DEB_BUILD_HARDENING=1)
|
|
|
|
int64 volatile * volatile ptr=&global_status_var.global_memory_used; |
|
|
|
my_atomic_add64_explicit(ptr, size, MY_MEMORY_ORDER_RELAXED); |
|
|
|
update_global_memory_status(size); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -4066,6 +4062,22 @@ rpl_make_log_name(const char *opt, |
|
|
|
DBUG_RETURN(NULL); |
|
|
|
} |
|
|
|
|
|
|
|
/* We have to setup my_malloc_size_cb_func early to catch all mallocs */ |
|
|
|
|
|
|
|
static int init_early_variables() |
|
|
|
{ |
|
|
|
if (pthread_key_create(&THR_THD, NULL)) |
|
|
|
{ |
|
|
|
fprintf(stderr, "Fatal error: Can't create thread-keys\n"); |
|
|
|
return 1; |
|
|
|
} |
|
|
|
set_current_thd(0); |
|
|
|
set_malloc_size_cb(my_malloc_size_cb_func); |
|
|
|
global_status_var.global_memory_used= 0; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static int init_common_variables() |
|
|
|
{ |
|
|
|
umask(((~my_umask) & 0666)); |
|
|
|
@ -4077,16 +4089,12 @@ static int init_common_variables() |
|
|
|
connection_errors_peer_addr= 0; |
|
|
|
my_decimal_set_zero(&decimal_zero); // set decimal_zero constant;
|
|
|
|
|
|
|
|
if (pthread_key_create(&THR_THD,NULL) || |
|
|
|
pthread_key_create(&THR_MALLOC,NULL)) |
|
|
|
if (pthread_key_create(&THR_MALLOC,NULL)) |
|
|
|
{ |
|
|
|
sql_print_error("Can't create thread-keys"); |
|
|
|
return 1; |
|
|
|
} |
|
|
|
|
|
|
|
set_current_thd(0); |
|
|
|
set_malloc_size_cb(my_malloc_size_cb_func); |
|
|
|
|
|
|
|
init_libstrings(); |
|
|
|
tzset(); // Set tzname
|
|
|
|
|
|
|
|
@ -5184,6 +5192,9 @@ static int init_server_components() |
|
|
|
init_global_table_stats(); |
|
|
|
init_global_index_stats(); |
|
|
|
|
|
|
|
/* It's now safe to use thread specific memory */ |
|
|
|
mysqld_server_initialized= 1; |
|
|
|
|
|
|
|
/* Allow storage engine to give real error messages */ |
|
|
|
if (ha_init_errors()) |
|
|
|
DBUG_RETURN(1); |
|
|
|
@ -5544,6 +5555,9 @@ int mysqld_main(int argc, char **argv) |
|
|
|
sf_leaking_memory= 1; // no safemalloc memory leak reports if we exit early
|
|
|
|
mysqld_server_started= mysqld_server_initialized= 0; |
|
|
|
|
|
|
|
if (init_early_variables()) |
|
|
|
exit(1); |
|
|
|
|
|
|
|
#ifdef HAVE_NPTL
|
|
|
|
ld_assume_kernel_is_set= (getenv("LD_ASSUME_KERNEL") != 0); |
|
|
|
#endif
|
|
|
|
@ -5846,9 +5860,6 @@ int mysqld_main(int argc, char **argv) |
|
|
|
if (Events::init((THD*) 0, opt_noacl || opt_bootstrap)) |
|
|
|
unireg_abort(1); |
|
|
|
|
|
|
|
/* It's now safe to use thread specific memory */ |
|
|
|
mysqld_server_initialized= 1; |
|
|
|
|
|
|
|
if (WSREP_ON) |
|
|
|
{ |
|
|
|
if (opt_bootstrap) |
|
|
|
@ -8260,15 +8271,16 @@ static int show_default_keycache(THD *thd, SHOW_VAR *var, char *buff, |
|
|
|
|
|
|
|
|
|
|
|
static int show_memory_used(THD *thd, SHOW_VAR *var, char *buff, |
|
|
|
struct system_status_var *status_var, |
|
|
|
enum enum_var_type scope) |
|
|
|
{ |
|
|
|
var->type= SHOW_LONGLONG; |
|
|
|
var->value= buff; |
|
|
|
if (scope == OPT_GLOBAL) |
|
|
|
*(longlong*) buff= (global_status_var.local_memory_used + |
|
|
|
global_status_var.global_memory_used); |
|
|
|
*(longlong*) buff= (status_var->global_memory_used + |
|
|
|
status_var->local_memory_used); |
|
|
|
else |
|
|
|
*(longlong*) buff= thd->status_var.local_memory_used; |
|
|
|
*(longlong*) buff= status_var->local_memory_used; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
|
|
|
|
@ -8697,7 +8709,9 @@ static int mysql_init_variables(void) |
|
|
|
prepared_stmt_count= 0; |
|
|
|
mysqld_unix_port= opt_mysql_tmpdir= my_bind_addr_str= NullS; |
|
|
|
bzero((uchar*) &mysql_tmpdir_list, sizeof(mysql_tmpdir_list)); |
|
|
|
bzero((char *) &global_status_var, sizeof(global_status_var)); |
|
|
|
/* Clear all except global_memory_used */ |
|
|
|
bzero((char*) &global_status_var, offsetof(STATUS_VAR, |
|
|
|
last_cleared_system_status_var)); |
|
|
|
opt_large_pages= 0; |
|
|
|
opt_super_large_pages= 0; |
|
|
|
#if defined(ENABLED_DEBUG_SYNC)
|
|
|
|
@ -9931,6 +9945,7 @@ void refresh_status(THD *thd) |
|
|
|
|
|
|
|
/* Reset thread's status variables */ |
|
|
|
thd->set_status_var_init(); |
|
|
|
thd->status_var.global_memory_used= 0; |
|
|
|
bzero((uchar*) &thd->org_status_var, sizeof(thd->org_status_var)); |
|
|
|
thd->start_bytes_received= 0; |
|
|
|
|
|
|
|
|
Monty
10 years ago