diff options
Diffstat (limited to 'storage/perfschema/table_threads.cc')
| -rw-r--r-- | storage/perfschema/table_threads.cc | 275 |
1 files changed, 214 insertions, 61 deletions
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc index 541ba860386..91300d6b67e 100644 --- a/storage/perfschema/table_threads.cc +++ b/storage/perfschema/table_threads.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. 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 @@ -13,14 +13,10 @@ along with this program; if not, write to the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -/** - @file storage/perfschema/table_threads.cc - Table THREADS (implementation). -*/ - #include "my_global.h" #include "my_pthread.h" #include "table_threads.h" +#include "sql_parse.h" #include "pfs_instr_class.h" #include "pfs_instr.h" @@ -34,29 +30,85 @@ static const TABLE_FIELD_TYPE field_types[]= { NULL, 0} }, { + { C_STRING_WITH_LEN("NAME") }, + { C_STRING_WITH_LEN("varchar(128)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("TYPE") }, + { C_STRING_WITH_LEN("varchar(10)") }, + { NULL, 0} + }, + { { C_STRING_WITH_LEN("PROCESSLIST_ID") }, { C_STRING_WITH_LEN("int(11)") }, { NULL, 0} }, { - { C_STRING_WITH_LEN("NAME") }, - { C_STRING_WITH_LEN("varchar(128)") }, + { C_STRING_WITH_LEN("PROCESSLIST_USER") }, + { C_STRING_WITH_LEN("varchar(16)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_HOST") }, + { C_STRING_WITH_LEN("varchar(60)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_DB") }, + { C_STRING_WITH_LEN("varchar(64)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_COMMAND") }, + { C_STRING_WITH_LEN("varchar(16)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_TIME") }, + { C_STRING_WITH_LEN("bigint(20)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_STATE") }, + { C_STRING_WITH_LEN("varchar(64)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PROCESSLIST_INFO") }, + { C_STRING_WITH_LEN("longtext") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("PARENT_THREAD_ID") }, + { C_STRING_WITH_LEN("int(11)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("ROLE") }, + { C_STRING_WITH_LEN("varchar(64)") }, + { NULL, 0} + }, + { + { C_STRING_WITH_LEN("INSTRUMENTED") }, + { C_STRING_WITH_LEN("enum(\'YES\',\'NO\')") }, { NULL, 0} } }; TABLE_FIELD_DEF table_threads::m_field_def= -{ 3, field_types }; +{ 14, field_types }; PFS_engine_table_share table_threads::m_share= { { C_STRING_WITH_LEN("threads") }, - &pfs_readonly_acl, + &pfs_updatable_acl, &table_threads::create, NULL, /* write_row */ NULL, /* delete_all_rows */ + NULL, /* get_row_count */ 1000, /* records */ sizeof(PFS_simple_index), /* ref length */ &m_table_lock, @@ -64,58 +116,16 @@ table_threads::m_share= false /* checked */ }; -PFS_engine_table* table_threads::create(void) +PFS_engine_table* table_threads::create() { return new table_threads(); } table_threads::table_threads() - : PFS_engine_table(&m_share, &m_pos), - m_row_exists(false), m_pos(0), m_next_pos(0) + : cursor_by_thread(& m_share), + m_row_exists(false) {} -void table_threads::reset_position(void) -{ - m_pos.m_index= 0; - m_next_pos.m_index= 0; -} - -int table_threads::rnd_next(void) -{ - PFS_thread *pfs; - - for (m_pos.set_at(&m_next_pos); - m_pos.m_index < thread_max; - m_pos.next()) - { - pfs= &thread_array[m_pos.m_index]; - if (pfs->m_lock.is_populated()) - { - make_row(pfs); - m_next_pos.set_after(&m_pos); - return 0; - } - } - - return HA_ERR_END_OF_FILE; -} - -int table_threads::rnd_pos(const void *pos) -{ - PFS_thread *pfs; - - set_position(pos); - DBUG_ASSERT(m_pos.m_index < thread_max); - pfs= &thread_array[m_pos.m_index]; - if (pfs->m_lock.is_populated()) - { - make_row(pfs); - return 0; - } - - return HA_ERR_RECORD_DELETED; -} - void table_threads::make_row(PFS_thread *pfs) { pfs_lock lock; @@ -131,11 +141,40 @@ void table_threads::make_row(PFS_thread *pfs) return; m_row.m_thread_internal_id= pfs->m_thread_internal_id; + m_row.m_parent_thread_internal_id= pfs->m_parent_thread_internal_id; m_row.m_thread_id= pfs->m_thread_id; m_row.m_name= safe_class->m_name; m_row.m_name_length= safe_class->m_name_length; - if (pfs->m_lock.end_optimistic_lock(&lock)) + m_row.m_username_length= pfs->m_username_length; + if (unlikely(m_row.m_username_length > sizeof(m_row.m_username))) + return; + if (m_row.m_username_length != 0) + memcpy(m_row.m_username, pfs->m_username, m_row.m_username_length); + + m_row.m_hostname_length= pfs->m_hostname_length; + if (unlikely(m_row.m_hostname_length > sizeof(m_row.m_hostname))) + return; + if (m_row.m_hostname_length != 0) + memcpy(m_row.m_hostname, pfs->m_hostname, m_row.m_hostname_length); + + m_row.m_dbname_length= pfs->m_dbname_length; + if (unlikely(m_row.m_dbname_length > sizeof(m_row.m_dbname))) + return; + if (m_row.m_dbname_length != 0) + memcpy(m_row.m_dbname, pfs->m_dbname, m_row.m_dbname_length); + + m_row.m_command= pfs->m_command; + m_row.m_start_time= pfs->m_start_time; + /* FIXME: need to copy it ? */ + m_row.m_processlist_state_ptr= pfs->m_processlist_state_ptr; + m_row.m_processlist_state_length= pfs->m_processlist_state_length; + /* FIXME: need to copy it ? */ + m_row.m_processlist_info_ptr= pfs->m_processlist_info_ptr; + m_row.m_processlist_info_length= pfs->m_processlist_info_length; + m_row.m_enabled_ptr= &pfs->m_enabled; + + if (pfs->m_lock.end_optimistic_lock(& lock)) m_row_exists= true; } @@ -150,8 +189,9 @@ int table_threads::read_row_values(TABLE *table, return HA_ERR_RECORD_DELETED; /* Set the null bits */ - DBUG_ASSERT(table->s->null_bytes == 1); + DBUG_ASSERT(table->s->null_bytes == 2); buf[0]= 0; + buf[1]= 0; for (; (f= *fields) ; fields++) { @@ -162,12 +202,125 @@ int table_threads::read_row_values(TABLE *table, case 0: /* THREAD_ID */ set_field_ulong(f, m_row.m_thread_internal_id); break; - case 1: /* PROCESSLIST_ID */ - set_field_ulong(f, m_row.m_thread_id); - break; - case 2: /* NAME */ + case 1: /* NAME */ set_field_varchar_utf8(f, m_row.m_name, m_row.m_name_length); break; + case 2: /* TYPE */ + if (m_row.m_thread_id != 0) + set_field_varchar_utf8(f, "FOREGROUND", 10); + else + set_field_varchar_utf8(f, "BACKGROUND", 10); + break; + case 3: /* PROCESSLIST_ID */ + if (m_row.m_thread_id != 0) + set_field_ulong(f, m_row.m_thread_id); + else + f->set_null(); + break; + case 4: /* PROCESSLIST_USER */ + if (m_row.m_username_length > 0) + set_field_varchar_utf8(f, m_row.m_username, + m_row.m_username_length); + else + f->set_null(); + break; + case 5: /* PROCESSLIST_HOST */ + if (m_row.m_hostname_length > 0) + set_field_varchar_utf8(f, m_row.m_hostname, + m_row.m_hostname_length); + else + f->set_null(); + break; + case 6: /* PROCESSLIST_DB */ + if (m_row.m_dbname_length > 0) + set_field_varchar_utf8(f, m_row.m_dbname, + m_row.m_dbname_length); + else + f->set_null(); + break; + case 7: /* PROCESSLIST_COMMAND */ + if (m_row.m_thread_id != 0) + set_field_varchar_utf8(f, command_name[m_row.m_command].str, + command_name[m_row.m_command].length); + else + f->set_null(); + break; + case 8: /* PROCESSLIST_TIME */ + if (m_row.m_start_time) + { + time_t now= my_time(0); + ulonglong elapsed= (now > m_row.m_start_time ? now - m_row.m_start_time : 0); + set_field_ulonglong(f, elapsed); + } + else + f->set_null(); + break; + case 9: /* PROCESSLIST_STATE */ + if (m_row.m_processlist_state_length > 0) + set_field_varchar_utf8(f, m_row.m_processlist_state_ptr, + m_row.m_processlist_state_length); + else + f->set_null(); + break; + case 10: /* PROCESSLIST_INFO */ + if (m_row.m_processlist_info_length > 0) + set_field_longtext_utf8(f, m_row.m_processlist_info_ptr, + m_row.m_processlist_info_length); + else + f->set_null(); + break; + case 11: /* PARENT_THREAD_ID */ + if (m_row.m_parent_thread_internal_id != 0) + set_field_ulong(f, m_row.m_parent_thread_internal_id); + else + f->set_null(); + break; + case 12: /* ROLE */ + f->set_null(); + break; + case 13: /* INSTRUMENTED */ + set_field_enum(f, (*m_row.m_enabled_ptr) ? ENUM_YES : ENUM_NO); + break; + default: + DBUG_ASSERT(false); + } + } + } + return 0; +} + +int table_threads::update_row_values(TABLE *table, + const unsigned char *old_buf, + unsigned char *new_buf, + Field **fields) +{ + Field *f; + enum_yes_no value; + + for (; (f= *fields) ; fields++) + { + if (bitmap_is_set(table->write_set, f->field_index)) + { + switch(f->field_index) + { + case 0: /* THREAD_ID */ + case 1: /* NAME */ + case 2: /* TYPE */ + case 3: /* PROCESSLIST_ID */ + case 4: /* PROCESSLIST_USER */ + case 5: /* PROCESSLIST_HOST */ + case 6: /* PROCESSLIST_DB */ + case 7: /* PROCESSLIST_COMMAND */ + case 8: /* PROCESSLIST_TIME */ + case 9: /* PROCESSLIST_STATE */ + case 10: /* PROCESSLIST_INFO */ + case 11: /* PARENT_THREAD_ID */ + case 12: /* ROLE */ + return HA_ERR_WRONG_COMMAND; + case 13: /* INSTRUMENTED */ + value= (enum_yes_no) get_field_enum(f); + *m_row.m_enabled_ptr= (value == ENUM_YES) ? true : false; + break; default: DBUG_ASSERT(false); } |