mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
168 lines
5.4 KiB
C++
168 lines
5.4 KiB
C++
/* Copyright (C) 2012-2014 Kentoku Shiba
|
|
|
|
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 */
|
|
|
|
#define MYSQL_SERVER 1
|
|
#include <my_global.h>
|
|
#include "mysql_version.h"
|
|
#if MYSQL_VERSION_ID < 50500
|
|
#include "mysql_priv.h"
|
|
#include <mysql/plugin.h>
|
|
#else
|
|
#include "sql_priv.h"
|
|
#include "probes_mysql.h"
|
|
#include "sql_class.h"
|
|
#include "sql_partition.h"
|
|
#include "sql_show.h"
|
|
#endif
|
|
#include "spd_db_include.h"
|
|
#include "spd_include.h"
|
|
#include "spd_table.h"
|
|
|
|
extern pthread_mutex_t spider_mem_calc_mutex;
|
|
|
|
extern const char *spider_alloc_func_name[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern const char *spider_alloc_file_name[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern ulong spider_alloc_line_no[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern ulonglong spider_total_alloc_mem[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern longlong spider_current_alloc_mem[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern ulonglong spider_alloc_mem_count[SPIDER_MEM_CALC_LIST_NUM];
|
|
extern ulonglong spider_free_mem_count[SPIDER_MEM_CALC_LIST_NUM];
|
|
|
|
static struct st_mysql_storage_engine spider_i_s_info =
|
|
{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION };
|
|
|
|
static ST_FIELD_INFO spider_i_s_alloc_mem_fields_info[] =
|
|
{
|
|
{"ID", 10, MYSQL_TYPE_LONG, 0, MY_I_S_UNSIGNED, "id", SKIP_OPEN_TABLE},
|
|
{"FUNC_NAME", 64, MYSQL_TYPE_STRING, 0,
|
|
MY_I_S_MAYBE_NULL, "func_name", SKIP_OPEN_TABLE},
|
|
{"FILE_NAME", 64, MYSQL_TYPE_STRING, 0,
|
|
MY_I_S_MAYBE_NULL, "file_name", SKIP_OPEN_TABLE},
|
|
{"LINE_NO", 10, MYSQL_TYPE_LONG, 0,
|
|
MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "line_no", SKIP_OPEN_TABLE},
|
|
{"TOTAL_ALLOC_MEM", 20, MYSQL_TYPE_LONGLONG, 0,
|
|
MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "total_alloc_mem", SKIP_OPEN_TABLE},
|
|
{"CURRENT_ALLOC_MEM", 20, MYSQL_TYPE_LONGLONG, 0,
|
|
MY_I_S_MAYBE_NULL, "current_alloc_mem", SKIP_OPEN_TABLE},
|
|
{"ALLOC_MEM_COUNT", 20, MYSQL_TYPE_LONGLONG, 0,
|
|
MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "alloc_mem_count", SKIP_OPEN_TABLE},
|
|
{"FREE_MEM_COUNT", 20, MYSQL_TYPE_LONGLONG, 0,
|
|
MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "free_mem_count", SKIP_OPEN_TABLE},
|
|
{NULL, 0, MYSQL_TYPE_STRING, 0, 0, NULL, 0}
|
|
};
|
|
|
|
static int spider_i_s_alloc_mem_fill_table(
|
|
THD *thd,
|
|
TABLE_LIST *tables,
|
|
COND *cond
|
|
) {
|
|
uint roop_count;
|
|
TABLE *table = tables->table;
|
|
DBUG_ENTER("spider_i_s_alloc_mem_fill_table");
|
|
for (roop_count = 0; roop_count < SPIDER_MEM_CALC_LIST_NUM; roop_count++)
|
|
{
|
|
table->field[0]->store(roop_count, TRUE);
|
|
if (spider_alloc_func_name[roop_count])
|
|
{
|
|
table->field[1]->set_notnull();
|
|
table->field[2]->set_notnull();
|
|
table->field[3]->set_notnull();
|
|
table->field[4]->set_notnull();
|
|
table->field[5]->set_notnull();
|
|
table->field[6]->set_notnull();
|
|
table->field[7]->set_notnull();
|
|
table->field[1]->store(spider_alloc_func_name[roop_count],
|
|
strlen(spider_alloc_func_name[roop_count]), system_charset_info);
|
|
table->field[2]->store(spider_alloc_file_name[roop_count],
|
|
strlen(spider_alloc_file_name[roop_count]), system_charset_info);
|
|
table->field[3]->store(spider_alloc_line_no[roop_count], TRUE);
|
|
pthread_mutex_lock(&spider_mem_calc_mutex);
|
|
table->field[4]->store(spider_total_alloc_mem[roop_count], TRUE);
|
|
table->field[5]->store(spider_current_alloc_mem[roop_count], FALSE);
|
|
table->field[6]->store(spider_alloc_mem_count[roop_count], TRUE);
|
|
table->field[7]->store(spider_free_mem_count[roop_count], TRUE);
|
|
pthread_mutex_unlock(&spider_mem_calc_mutex);
|
|
} else {
|
|
table->field[1]->set_null();
|
|
table->field[2]->set_null();
|
|
table->field[3]->set_null();
|
|
table->field[4]->set_null();
|
|
table->field[5]->set_null();
|
|
table->field[6]->set_null();
|
|
table->field[7]->set_null();
|
|
}
|
|
if (schema_table_store_record(thd, table))
|
|
{
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
static int spider_i_s_alloc_mem_init(
|
|
void *p
|
|
) {
|
|
ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *) p;
|
|
DBUG_ENTER("spider_i_s_alloc_mem_init");
|
|
schema->fields_info = spider_i_s_alloc_mem_fields_info;
|
|
schema->fill_table = spider_i_s_alloc_mem_fill_table;
|
|
schema->idx_field1 = 0;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
static int spider_i_s_alloc_mem_deinit(
|
|
void *p
|
|
) {
|
|
DBUG_ENTER("spider_i_s_alloc_mem_deinit");
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
struct st_mysql_plugin spider_i_s_alloc_mem =
|
|
{
|
|
MYSQL_INFORMATION_SCHEMA_PLUGIN,
|
|
&spider_i_s_info,
|
|
"SPIDER_ALLOC_MEM",
|
|
"Kentoku Shiba",
|
|
"Spider memory allocating viewer",
|
|
PLUGIN_LICENSE_GPL,
|
|
spider_i_s_alloc_mem_init,
|
|
spider_i_s_alloc_mem_deinit,
|
|
0x0001,
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
#if MYSQL_VERSION_ID >= 50600
|
|
0,
|
|
#endif
|
|
};
|
|
|
|
#ifdef MARIADB_BASE_VERSION
|
|
struct st_maria_plugin spider_i_s_alloc_mem_maria =
|
|
{
|
|
MYSQL_INFORMATION_SCHEMA_PLUGIN,
|
|
&spider_i_s_info,
|
|
"SPIDER_ALLOC_MEM",
|
|
"Kentoku Shiba",
|
|
"Spider memory allocating viewer",
|
|
PLUGIN_LICENSE_GPL,
|
|
spider_i_s_alloc_mem_init,
|
|
spider_i_s_alloc_mem_deinit,
|
|
0x0100,
|
|
NULL,
|
|
NULL,
|
|
"1.0",
|
|
MariaDB_PLUGIN_MATURITY_GAMMA,
|
|
};
|
|
#endif
|