diff options
Diffstat (limited to 'storage/perfschema/unittest/pfs_instr-t.cc')
| -rw-r--r-- | storage/perfschema/unittest/pfs_instr-t.cc | 173 |
1 files changed, 118 insertions, 55 deletions
diff --git a/storage/perfschema/unittest/pfs_instr-t.cc b/storage/perfschema/unittest/pfs_instr-t.cc index c9f4bac1171..d4401ab7ea2 100644 --- a/storage/perfschema/unittest/pfs_instr-t.cc +++ b/storage/perfschema/unittest/pfs_instr-t.cc @@ -21,13 +21,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> -#include <my_pthread.h> +#include <my_thread.h> #include <pfs_instr.h> #include <pfs_stat.h> #include <pfs_global.h> #include <pfs_instr_class.h> +#include <pfs_buffer_container.h> #include <tap.h> +#include "stub_global_status_var.h" + #include <memory.h> PFS_global_param param; @@ -66,9 +69,15 @@ void test_no_instruments() param.m_statement_class_sizing= 0; param.m_events_statements_history_sizing= 0; param.m_events_statements_history_long_sizing= 0; + param.m_events_transactions_history_sizing= 0; + param.m_events_transactions_history_long_sizing= 0; param.m_digest_sizing= 0; param.m_session_connect_attrs_sizing= 0; - param.m_max_digest_length= 0; + param.m_program_sizing= 0; + param.m_prepared_stmt_sizing= 0; + param.m_statement_stack_sizing= 0; + param.m_memory_class_sizing= 0; + param.m_metadata_lock_sizing= 0; init_event_name_sizing(& param); rc= init_instruments(& param); @@ -95,6 +104,27 @@ void test_no_instances() PFS_socket *socket; PFS_table *table; + dummy_mutex_class.m_event_name_index = 0; + dummy_mutex_class.m_flags = 0; + dummy_mutex_class.m_enabled = true; + dummy_mutex_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + dummy_rwlock_class.m_event_name_index = 1; + dummy_rwlock_class.m_flags = 0; + dummy_rwlock_class.m_enabled = true; + dummy_rwlock_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + dummy_cond_class.m_event_name_index = 2; + dummy_cond_class.m_flags = 0; + dummy_cond_class.m_enabled = true; + dummy_cond_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + dummy_file_class.m_event_name_index = 3; + dummy_file_class.m_flags = 0; + dummy_file_class.m_enabled = true; + dummy_file_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + dummy_socket_class.m_event_name_index = 4; + dummy_socket_class.m_flags = 0; + dummy_socket_class.m_enabled = true; + dummy_socket_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + memset(& param, 0xFF, sizeof(param)); param.m_enabled= true; param.m_mutex_class_sizing= 1; @@ -125,9 +155,15 @@ void test_no_instances() param.m_statement_class_sizing= 0; param.m_events_statements_history_sizing= 0; param.m_events_statements_history_long_sizing= 0; + param.m_events_transactions_history_sizing= 0; + param.m_events_transactions_history_long_sizing= 0; param.m_digest_sizing= 0; param.m_session_connect_attrs_sizing= 0; - param.m_max_digest_length= 0; + param.m_program_sizing= 0; + param.m_prepared_stmt_sizing= 0; + param.m_statement_stack_sizing= 0; + param.m_memory_class_sizing= 1; + param.m_metadata_lock_sizing= 0; init_event_name_sizing(& param); rc= init_instruments(& param); @@ -135,50 +171,50 @@ void test_no_instances() mutex= create_mutex(& dummy_mutex_class, NULL); ok(mutex == NULL, "no mutex"); - ok(mutex_lost == 1, "lost 1"); + ok(global_mutex_container.get_lost_counter() == 1, "lost 1"); mutex= create_mutex(& dummy_mutex_class, NULL); ok(mutex == NULL, "no mutex"); - ok(mutex_lost == 2, "lost 2"); + ok(global_mutex_container.get_lost_counter() == 2, "lost 2"); rwlock= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock == NULL, "no rwlock"); - ok(rwlock_lost == 1, "lost 1"); + ok(global_rwlock_container.m_lost == 1, "lost 1"); rwlock= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock == NULL, "no rwlock"); - ok(rwlock_lost == 2, "lost 2"); + ok(global_rwlock_container.m_lost == 2, "lost 2"); cond= create_cond(& dummy_cond_class, NULL); ok(cond == NULL, "no cond"); - ok(cond_lost == 1, "lost 1"); + ok(global_cond_container.m_lost == 1, "lost 1"); cond= create_cond(& dummy_cond_class, NULL); ok(cond == NULL, "no cond"); - ok(cond_lost == 2, "lost 2"); + ok(global_cond_container.m_lost == 2, "lost 2"); thread= create_thread(& dummy_thread_class, NULL, 0); ok(thread == NULL, "no thread"); - ok(thread_lost == 1, "lost 1"); + ok(global_thread_container.m_lost == 1, "lost 1"); thread= create_thread(& dummy_thread_class, NULL, 0); ok(thread == NULL, "no thread"); - ok(thread_lost == 2, "lost 2"); + ok(global_thread_container.m_lost == 2, "lost 2"); PFS_thread fake_thread; fake_thread.m_filename_hash_pins= NULL; file= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file == NULL, "no file"); - ok(file_lost == 1, "lost 1"); + ok(global_file_container.m_lost == 1, "lost 1"); file= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file == NULL, "no file"); - ok(file_lost == 2, "lost 2"); + ok(global_file_container.m_lost == 2, "lost 2"); - init_file_hash(); + init_file_hash(& param); file= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file == NULL, "no file"); - ok(file_lost == 3, "lost 3"); + ok(global_file_container.m_lost == 3, "lost 3"); file= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file == NULL, "no file"); - ok(file_lost == 4, "lost 4"); + ok(global_file_container.m_lost == 4, "lost 4"); char long_file_name[10000]; int size= sizeof(long_file_name); @@ -186,21 +222,21 @@ void test_no_instances() file= find_or_create_file(& fake_thread, & dummy_file_class, long_file_name, size, true); ok(file == NULL, "no file"); - ok(file_lost == 5, "lost 5"); + ok(global_file_container.m_lost == 5, "lost 5"); table= create_table(& dummy_table_share, & fake_thread, NULL); ok(table == NULL, "no table"); - ok(table_lost == 1, "lost 1"); + ok(global_table_container.m_lost == 1, "lost 1"); table= create_table(& dummy_table_share, & fake_thread, NULL); ok(table == NULL, "no table"); - ok(table_lost == 2, "lost 2"); + ok(global_table_container.m_lost == 2, "lost 2"); socket= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket == NULL, "no socket"); - ok(socket_lost == 1, "lost 1"); + ok(global_socket_container.m_lost == 1, "lost 1"); socket= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket == NULL, "no socket"); - ok(socket_lost == 2, "lost 2"); + ok(global_socket_container.m_lost == 2, "lost 2"); /* No result to test, just make sure it does not crash */ reset_events_waits_by_instance(); @@ -265,139 +301,163 @@ void test_with_instances() param.m_statement_class_sizing= 0; param.m_events_statements_history_sizing= 0; param.m_events_statements_history_long_sizing= 0; + param.m_events_transactions_history_sizing= 0; + param.m_events_transactions_history_long_sizing= 0; param.m_digest_sizing= 0; param.m_session_connect_attrs_sizing= 0; - param.m_max_digest_length= 0; + param.m_program_sizing= 0; + param.m_prepared_stmt_sizing= 0; + param.m_statement_stack_sizing= 0; + param.m_memory_class_sizing= 1; + param.m_metadata_lock_sizing= 0; init_event_name_sizing(& param); rc= init_instruments(& param); ok(rc == 0, "instances init"); dummy_mutex_class.m_event_name_index= 0; + dummy_mutex_class.m_flags= 0; + dummy_mutex_class.m_enabled= true; + dummy_mutex_class.m_volatility = PSI_VOLATILITY_UNKNOWN; dummy_rwlock_class.m_event_name_index= 1; + dummy_rwlock_class.m_flags= 0; + dummy_rwlock_class.m_enabled= true; + dummy_rwlock_class.m_volatility = PSI_VOLATILITY_UNKNOWN; dummy_cond_class.m_event_name_index= 2; + dummy_cond_class.m_flags= 0; + dummy_cond_class.m_enabled= true; + dummy_cond_class.m_volatility = PSI_VOLATILITY_UNKNOWN; dummy_file_class.m_event_name_index= 3; + dummy_file_class.m_flags= 0; + dummy_file_class.m_enabled= true; + dummy_file_class.m_volatility = PSI_VOLATILITY_UNKNOWN; dummy_socket_class.m_event_name_index= 4; + dummy_socket_class.m_flags= 0; + dummy_socket_class.m_enabled= true; + dummy_socket_class.m_volatility = PSI_VOLATILITY_UNKNOWN; + + dummy_table_share.m_enabled= true; + dummy_table_share.m_timed= true; mutex_1= create_mutex(& dummy_mutex_class, NULL); ok(mutex_1 != NULL, "mutex"); - ok(mutex_lost == 0, "not lost"); + ok(global_mutex_container.get_lost_counter() == 0, "not lost"); mutex_2= create_mutex(& dummy_mutex_class, NULL); ok(mutex_2 != NULL, "mutex"); - ok(mutex_lost == 0, "not lost"); + ok(global_mutex_container.get_lost_counter() == 0, "not lost"); mutex_2= create_mutex(& dummy_mutex_class, NULL); ok(mutex_2 == NULL, "no mutex"); - ok(mutex_lost == 1, "lost 1"); + ok(global_mutex_container.get_lost_counter() == 1, "lost 1"); destroy_mutex(mutex_1); mutex_2= create_mutex(& dummy_mutex_class, NULL); ok(mutex_2 != NULL, "mutex"); - ok(mutex_lost == 1, "no new loss"); + ok(global_mutex_container.get_lost_counter() == 1, "no new loss"); rwlock_1= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock_1 != NULL, "rwlock"); - ok(rwlock_lost == 0, "not lost"); + ok(global_rwlock_container.m_lost == 0, "not lost"); rwlock_2= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock_2 != NULL, "rwlock"); - ok(rwlock_lost == 0, "not lost"); + ok(global_rwlock_container.m_lost == 0, "not lost"); rwlock_2= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock_2 == NULL, "no rwlock"); - ok(rwlock_lost == 1, "lost 1"); + ok(global_rwlock_container.m_lost == 1, "lost 1"); destroy_rwlock(rwlock_1); rwlock_2= create_rwlock(& dummy_rwlock_class, NULL); ok(rwlock_2 != NULL, "rwlock"); - ok(rwlock_lost == 1, "no new loss"); + ok(global_rwlock_container.m_lost == 1, "no new loss"); cond_1= create_cond(& dummy_cond_class, NULL); ok(cond_1 != NULL, "cond"); - ok(cond_lost == 0, "not lost"); + ok(global_cond_container.m_lost == 0, "not lost"); cond_2= create_cond(& dummy_cond_class, NULL); ok(cond_2 != NULL, "cond"); - ok(cond_lost == 0, "not lost"); + ok(global_cond_container.m_lost == 0, "not lost"); cond_2= create_cond(& dummy_cond_class, NULL); ok(cond_2 == NULL, "no cond"); - ok(cond_lost == 1, "lost 1"); + ok(global_cond_container.m_lost == 1, "lost 1"); destroy_cond(cond_1); cond_2= create_cond(& dummy_cond_class, NULL); ok(cond_2 != NULL, "cond"); - ok(cond_lost == 1, "no new loss"); + ok(global_cond_container.m_lost == 1, "no new loss"); thread_1= create_thread(& dummy_thread_class, NULL, 0); ok(thread_1 != NULL, "thread"); - ok(thread_lost == 0, "not lost"); + ok(global_thread_container.m_lost == 0, "not lost"); thread_2= create_thread(& dummy_thread_class, NULL, 0); ok(thread_2 != NULL, "thread"); - ok(thread_lost == 0, "not lost"); + ok(global_thread_container.m_lost == 0, "not lost"); thread_2= create_thread(& dummy_thread_class, NULL, 0); ok(thread_2 == NULL, "no thread"); - ok(thread_lost == 1, "lost 1"); + ok(global_thread_container.m_lost == 1, "lost 1"); destroy_thread(thread_1); thread_2= create_thread(& dummy_thread_class, NULL, 0); ok(thread_2 != NULL, "thread"); - ok(thread_lost == 1, "no new loss"); + ok(global_thread_container.m_lost == 1, "no new loss"); PFS_thread fake_thread; fake_thread.m_filename_hash_pins= NULL; file_1= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file_1 == NULL, "no file"); - ok(file_lost == 1, "lost 1"); + ok(global_file_container.m_lost == 1, "lost 1"); file_1= find_or_create_file(& fake_thread, & dummy_file_class, "dummy", 5, true); ok(file_1 == NULL, "no file"); - ok(file_lost == 2, "lost 2"); + ok(global_file_container.m_lost == 2, "lost 2"); - init_file_hash(); - file_lost= 0; + init_file_hash(& param); + global_file_container.m_lost= 0; file_1= find_or_create_file(& fake_thread, & dummy_file_class, "dummy_A", 7, true); ok(file_1 != NULL, "file"); ok(file_1->m_file_stat.m_open_count == 1, "open count 1"); - ok(file_lost == 0, "not lost"); + ok(global_file_container.m_lost == 0, "not lost"); file_2= find_or_create_file(& fake_thread, & dummy_file_class, "dummy_A", 7, true); ok(file_1 == file_2, "same file"); ok(file_1->m_file_stat.m_open_count == 2, "open count 2"); - ok(file_lost == 0, "not lost"); + ok(global_file_container.m_lost == 0, "not lost"); release_file(file_2); ok(file_1->m_file_stat.m_open_count == 1, "open count 1"); file_2= find_or_create_file(& fake_thread, & dummy_file_class, "dummy_B", 7, true); ok(file_2 != NULL, "file"); - ok(file_lost == 0, "not lost"); + ok(global_file_container.m_lost == 0, "not lost"); file_2= find_or_create_file(& fake_thread, & dummy_file_class, "dummy_C", 7, true); ok(file_2 == NULL, "no file"); - ok(file_lost == 1, "lost"); + ok(global_file_container.m_lost == 1, "lost"); release_file(file_1); /* the file still exists, not destroyed */ ok(file_1->m_file_stat.m_open_count == 0, "open count 0"); file_2= find_or_create_file(& fake_thread, & dummy_file_class, "dummy_D", 7, true); ok(file_2 == NULL, "no file"); - ok(file_lost == 2, "lost"); + ok(global_file_container.m_lost == 2, "lost"); socket_1= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket_1 != NULL, "socket"); - ok(socket_lost == 0, "not lost"); + ok(global_socket_container.m_lost == 0, "not lost"); socket_2= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket_2 != NULL, "socket"); - ok(socket_lost == 0, "not lost"); + ok(global_socket_container.m_lost == 0, "not lost"); socket_2= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket_2 == NULL, "no socket"); - ok(socket_lost == 1, "lost 1"); + ok(global_socket_container.m_lost == 1, "lost 1"); destroy_socket(socket_1); socket_2= create_socket(& dummy_socket_class, NULL, NULL, 0); ok(socket_2 != NULL, "socket"); - ok(socket_lost == 1, "no new loss"); + ok(global_socket_container.m_lost == 1, "no new loss"); table_1= create_table(& dummy_table_share, & fake_thread, NULL); ok(table_1 != NULL, "table"); - ok(table_lost == 0, "not lost"); + ok(global_table_container.m_lost == 0, "not lost"); table_2= create_table(& dummy_table_share, & fake_thread, NULL); ok(table_2 != NULL, "table"); - ok(table_lost == 0, "not lost"); + ok(global_table_container.m_lost == 0, "not lost"); table_2= create_table(& dummy_table_share, & fake_thread, NULL); ok(table_2 == NULL, "no table"); - ok(table_lost == 1, "lost 1"); + ok(global_table_container.m_lost == 1, "lost 1"); destroy_table(table_1); table_2= create_table(& dummy_table_share, & fake_thread, NULL); ok(table_2 != NULL, "table"); - ok(table_lost == 1, "no new loss"); + ok(global_table_container.m_lost == 1, "no new loss"); //TODO: test that cleanup works reset_events_waits_by_instance(); @@ -409,6 +469,9 @@ void test_with_instances() void do_all_tests() { + flag_global_instrumentation= true; + flag_thread_instrumentation= true; + test_no_instruments(); test_no_instances(); test_with_instances(); |