From: Christopher Powers Date: December 8 2010 8:13pm Subject: bzr commit into mysql-trunk-wl4896 branch (chris.powers:3213) WL#4896 List-Archive: http://lists.mysql.com/commits/126362 Message-Id: <20101208201401.A594E1DB0328@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0027620990042333316==" --===============0027620990042333316== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped 3213 Christopher Powers 2010-12-08 WL#4896 Peformance schema Net IO Merge w/ mysql-trunk - misc fixes modified: sql/sys_vars.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_server.cc === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2010-12-02 15:05:07 +0000 +++ b/sql/sys_vars.cc 2010-12-08 20:13:38 +0000 @@ -134,6 +134,22 @@ static Sys_var_ulong Sys_pfs_max_file_in DEFAULT(PFS_MAX_FILE), BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); +static Sys_var_ulong Sys_pfs_max_sockets( + "performance_schema_max_sockets", + "Maximum number of opened instrumented sockets.", + READ_ONLY GLOBAL_VAR(pfs_param.m_socket_sizing), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024*1024), + DEFAULT(PFS_MAX_SOCKETS), + BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); + +static Sys_var_ulong Sys_pfs_max_socket_classes( + "performance_schema_max_socket_classes", + "Maximum number of socket instruments.", + READ_ONLY GLOBAL_VAR(pfs_param.m_socket_class_sizing), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 256), + DEFAULT(PFS_MAX_SOCKET_CLASS), + BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); + static Sys_var_ulong Sys_pfs_max_mutex_classes( "performance_schema_max_mutex_classes", "Maximum number of mutex instruments.", === modified file 'storage/perfschema/pfs_engine_table.cc' --- a/storage/perfschema/pfs_engine_table.cc 2010-12-07 18:55:54 +0000 +++ b/storage/perfschema/pfs_engine_table.cc 2010-12-08 20:13:38 +0000 @@ -743,179 +743,192 @@ bool pfs_show_status(handlerton *hton, T total_memory+= size; break; case 23: + name= "(PFS_SOCKET_CLASS).ROW_SIZE"; + size= sizeof(PFS_socket_class); + break; + case 24: + name= "(PFS_SOCKET_CLASS).ROW_COUNT"; + size= socket_class_max; + break; + case 25: + name= "(PFS_SOCKET_CLASS).MEMORY"; + size= socket_class_max * sizeof(PFS_socket_class); + total_memory+= size; + break; + case 26: name= "MUTEX_INSTANCES.ROW_SIZE"; size= sizeof(PFS_mutex); break; - case 24: + case 27: name= "MUTEX_INSTANCES.ROW_COUNT"; size= mutex_max; break; - case 25: + case 28: name= "MUTEX_INSTANCES.MEMORY"; size= mutex_max * sizeof(PFS_mutex); total_memory+= size; break; - case 26: + case 29: name= "RWLOCK_INSTANCES.ROW_SIZE"; size= sizeof(PFS_rwlock); break; - case 27: + case 30: name= "RWLOCK_INSTANCES.ROW_COUNT"; size= rwlock_max; break; - case 28: + case 31: name= "RWLOCK_INSTANCES.MEMORY"; size= rwlock_max * sizeof(PFS_rwlock); total_memory+= size; break; - case 29: + case 32: name= "COND_INSTANCES.ROW_SIZE"; size= sizeof(PFS_cond); break; - case 30: + case 33: name= "COND_INSTANCES.ROW_COUNT"; size= cond_max; break; - case 31: + case 34: name= "COND_INSTANCES.MEMORY"; size= cond_max * sizeof(PFS_cond); total_memory+= size; break; - case 32: + case 35: name= "PROCESSLIST.ROW_SIZE"; size= sizeof(PFS_thread); break; - case 33: + case 36: name= "PROCESSLIST.ROW_COUNT"; size= thread_max; break; - case 34: + case 37: name= "PROCESSLIST.MEMORY"; size= thread_max * sizeof(PFS_thread); total_memory+= size; break; - case 35: + case 38: name= "FILE_INSTANCES.ROW_SIZE"; size= sizeof(PFS_file); break; - case 36: + case 39: name= "FILE_INSTANCES.ROW_COUNT"; size= file_max; break; - case 37: + case 40: name= "FILE_INSTANCES.MEMORY"; size= file_max * sizeof(PFS_file); total_memory+= size; break; - case 38: + case 41: name= "(PFS_FILE_HANDLE).ROW_SIZE"; size= sizeof(PFS_file*); break; - case 39: + case 42: name= "(PFS_FILE_HANDLE).ROW_COUNT"; size= file_handle_max; break; - case 40: + case 43: name= "(PFS_FILE_HANDLE).MEMORY"; size= file_handle_max * sizeof(PFS_file*); total_memory+= size; break; - case 41: + case 44: + name= "SOCKET_INSTANCES.ROW_SIZE"; + size= sizeof(PFS_socket); + break; + case 45: + name= "SOCKET_INSTANCES.ROW_COUNT"; + size= socket_max; + break; + case 46: + name= "SOCKET_INSTANCES.MEMORY"; + size= socket_max * sizeof(PFS_socket); + total_memory+= size; + break; + case 47: name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_SIZE"; size= sizeof(PFS_single_stat); break; - case 42: + case 48: name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.ROW_COUNT"; size= thread_max * max_instrument_class; break; - case 43: + case 49: name= "EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME.MEMORY"; size= thread_max * max_instrument_class * sizeof(PFS_single_stat); total_memory+= size; break; - case 44: + case 50: name= "(PFS_TABLE_SHARE).ROW_SIZE"; size= sizeof(PFS_table_share); break; - case 45: + case 51: name= "(PFS_TABLE_SHARE).ROW_COUNT"; size= table_share_max; break; - case 46: + case 52: name= "(PFS_TABLE_SHARE).MEMORY"; size= table_share_max * sizeof(PFS_table_share); total_memory+= size; break; - case 47: + case 53: name= "(PFS_TABLE).ROW_SIZE"; size= sizeof(PFS_table); break; - case 48: + case 54: name= "(PFS_TABLE).ROW_COUNT"; size= table_max; break; - case 49: + case 55: name= "(PFS_TABLE).MEMORY"; size= table_max * sizeof(PFS_table); total_memory+= size; break; - case 50: + case 56: name= "SETUP_ACTORS.ROW_SIZE"; size= sizeof(PFS_setup_actor); break; - case 51: + case 57: name= "SETUP_ACTORS.ROW_COUNT"; size= setup_actor_max; break; - case 52: + case 58: name= "SETUP_ACTORS.MEMORY"; size= setup_actor_max * sizeof(PFS_setup_actor); total_memory+= size; break; - case 53: + case 59: name= "SETUP_OBJECTS.ROW_SIZE"; size= sizeof(PFS_setup_object); break; - case 54: + case 60: name= "SETUP_OBJECTS.ROW_COUNT"; size= setup_object_max; break; - case 55: + case 61: name= "SETUP_OBJECTS.MEMORY"; size= setup_object_max * sizeof(PFS_setup_object); total_memory+= size; break; - case 56: + case 62: name= "EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME.ROW_SIZE"; size= sizeof(PFS_single_stat); break; - case 57: + case 63: name= "EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME.ROW_COUNT"; size= max_instrument_class; break; - case 58: + case 64: name= "EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME.MEMORY"; size= max_instrument_class * sizeof(PFS_single_stat); total_memory+= size; break; - case 59: - name= "(PFS_SOCKET_CLASS).ROW_SIZE"; - size= sizeof(PFS_socket_class); - break; - case 60: - name= "(PFS_SOCKET_CLASS).ROW_COUNT"; - size= socket_class_max; - break; - case 61: - name= "(PFS_SOCKET_CLASS).MEMORY"; - size= socket_class_max * sizeof(PFS_socket_class); - total_memory+= size; - break; /* This case must be last, for aggregation in total_memory. */ - case 62: + case 65: name= "PERFORMANCE_SCHEMA.MEMORY"; size= total_memory; /* This will fail if something is not advertised here */ === modified file 'storage/perfschema/pfs_server.cc' --- a/storage/perfschema/pfs_server.cc 2010-09-23 16:08:54 +0000 +++ b/storage/perfschema/pfs_server.cc 2010-12-08 20:13:38 +0000 @@ -69,6 +69,7 @@ initialize_performance_schema(const PFS_ init_thread_class(param->m_thread_class_sizing) || init_table_share(param->m_table_share_sizing) || init_file_class(param->m_file_class_sizing) || + init_socket_class(param->m_socket_class_sizing) || init_instruments(param) || init_events_waits_history_long( param->m_events_waits_history_long_sizing) || @@ -118,6 +119,7 @@ static void cleanup_performance_schema(v cleanup_thread_class(); cleanup_table_share(); cleanup_file_class(); + cleanup_socket_class(); cleanup_events_waits_history_long(); cleanup_table_share_hash(); cleanup_file_hash(); --===============0027620990042333316== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 024efb1cda042ab0dde1f24310722ea7f4a68a19 # timestamp: 2010-12-08 14:14:00 -0600 # base_revision_id: chris.powers@stripped\ # 1igi3mu7hk25gymb # # Begin bundle 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 oSGt9maU --===============0027620990042333316==--