From: Christopher Powers Date: February 3 2011 5:40am Subject: bzr commit into mysql-trunk-wl5379 branch (chris.powers:3222) WL#4896 List-Archive: http://lists.mysql.com/commits/130298 Message-Id: <20110203054026.1CD111DB0331@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7821591026885544536==" --===============7821591026885544536== 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 3222 Christopher Powers 2011-02-02 WL#4896 "Performance Schema Net IO" - Updated abi files - Fixed compiler warnings - Updates to table definition of socket_instances modified: include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp storage/perfschema/pfs.cc storage/perfschema/table_socket_instances.cc* storage/perfschema/table_socket_instances.h* === modified file 'include/mysql/psi/psi_abi_v1.h.pp' --- a/include/mysql/psi/psi_abi_v1.h.pp 2011-01-26 22:26:41 +0000 +++ b/include/mysql/psi/psi_abi_v1.h.pp 2011-02-03 05:40:19 +0000 @@ -75,10 +75,14 @@ enum PSI_socket_operation PSI_SOCKET_CLOSE= 3, PSI_SOCKET_SEND= 4, PSI_SOCKET_RECV= 5, - PSI_SOCKET_SEEK= 6, - PSI_SOCKET_OPT= 7, - PSI_SOCKET_STAT= 8, - PSI_SOCKET_SHUTDOWN= 9 + PSI_SOCKET_SENDTO= 6, + PSI_SOCKET_RECVFROM= 7, + PSI_SOCKET_SENDMSG= 8, + PSI_SOCKET_RECVMSG= 9, + PSI_SOCKET_SEEK= 10, + PSI_SOCKET_OPT= 11, + PSI_SOCKET_STAT= 12, + PSI_SOCKET_SHUTDOWN= 13 }; typedef unsigned int PSI_mutex_key; typedef unsigned int PSI_rwlock_key; === modified file 'include/mysql/psi/psi_abi_v2.h.pp' --- a/include/mysql/psi/psi_abi_v2.h.pp 2011-01-26 22:26:41 +0000 +++ b/include/mysql/psi/psi_abi_v2.h.pp 2011-02-03 05:40:19 +0000 @@ -75,10 +75,14 @@ enum PSI_socket_operation PSI_SOCKET_CLOSE= 3, PSI_SOCKET_SEND= 4, PSI_SOCKET_RECV= 5, - PSI_SOCKET_SEEK= 6, - PSI_SOCKET_OPT= 7, - PSI_SOCKET_STAT= 8, - PSI_SOCKET_SHUTDOWN= 9 + PSI_SOCKET_SENDTO= 6, + PSI_SOCKET_RECVFROM= 7, + PSI_SOCKET_SENDMSG= 8, + PSI_SOCKET_RECVMSG= 9, + PSI_SOCKET_SEEK= 10, + PSI_SOCKET_OPT= 11, + PSI_SOCKET_STAT= 12, + PSI_SOCKET_SHUTDOWN= 13 }; typedef unsigned int PSI_mutex_key; typedef unsigned int PSI_rwlock_key; === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2011-02-03 05:03:04 +0000 +++ b/storage/perfschema/pfs.cc 2011-02-03 05:40:19 +0000 @@ -3546,7 +3546,7 @@ static void end_socket_wait_v1(PSI_socke PFS_socket *socket= reinterpret_cast (state->m_socket); DBUG_ASSERT(socket != NULL); - PFS_thread *thread= reinterpret_cast (state->m_thread); +//TBD PFS_thread *thread= reinterpret_cast (state->m_thread); PFS_single_stat *stat; @@ -3589,7 +3589,7 @@ static void end_socket_wait_v1(PSI_socke stat= NULL; break; } - + register uint flags= state->m_flags; if (flags & STATE_FLAG_TIMED) === modified file 'storage/perfschema/table_socket_instances.cc' (properties changed: -x to +x) --- a/storage/perfschema/table_socket_instances.cc 2010-12-08 03:24:30 +0000 +++ b/storage/perfschema/table_socket_instances.cc 2011-02-03 05:40:19 +0000 @@ -41,28 +41,23 @@ static const TABLE_FIELD_TYPE field_type { NULL, 0} }, { - { C_STRING_WITH_LEN("SOCKET_ID") }, - { C_STRING_WITH_LEN("int(11)") }, - { NULL, 0} - }, - { - { C_STRING_WITH_LEN("IP") }, - { C_STRING_WITH_LEN("varchar(128)") }, + { C_STRING_WITH_LEN("THREAD_ID") }, + { C_STRING_WITH_LEN("int(10)") }, { NULL, 0} }, { - { C_STRING_WITH_LEN("PORT") }, - { C_STRING_WITH_LEN("int(11)") }, + { C_STRING_WITH_LEN("SOCKET_ID") }, + { C_STRING_WITH_LEN("int(10)") }, { NULL, 0} }, { - { C_STRING_WITH_LEN("BYTES_READ") }, - { C_STRING_WITH_LEN("bigint(20)") }, + { C_STRING_WITH_LEN("IP") }, + { C_STRING_WITH_LEN("varchar(64)") }, { NULL, 0} }, { - { C_STRING_WITH_LEN("BYTES_WRITE") }, - { C_STRING_WITH_LEN("bigint(20)") }, + { C_STRING_WITH_LEN("PORT") }, + { C_STRING_WITH_LEN("int(10)") }, { NULL, 0} } }; @@ -70,7 +65,7 @@ static const TABLE_FIELD_TYPE field_type TABLE_FIELD_DEF table_socket_instances::m_field_def= -{ 7, field_types }; +{ 6, field_types }; PFS_engine_table_share table_socket_instances::m_share= @@ -156,12 +151,11 @@ void table_socket_instances::make_row(PF m_row.m_event_name= safe_class->m_name; m_row.m_event_name_length= safe_class->m_name_length; m_row.m_identity= pfs->m_identity; + m_row.m_thread_id= pfs->m_thread_id; m_row.m_fd= pfs->m_fd; m_row.m_ip= pfs->m_ip; m_row.m_ip_length= pfs->m_ip_length; m_row.m_port= pfs->m_port; - m_row.m_bytes_read= pfs->m_socket_stat.m_io_stat.m_read_bytes; //TBD - m_row.m_bytes_write= pfs->m_socket_stat.m_io_stat.m_write_bytes; if (pfs->m_lock.end_optimistic_lock(&lock)) m_row_exists= true; @@ -192,21 +186,18 @@ int table_socket_instances::read_row_val case 1: /* OBJECT_INSTANCE_BEGIN */ set_field_ulonglong(f, (intptr)m_row.m_identity); break; - case 2: /* SOCKET_ID */ + case 2: /* THREAD_ID */ + set_field_ulong(f, m_row.m_thread_id); + break; + case 3: /* SOCKET_ID */ set_field_ulong(f, m_row.m_fd); break; - case 3: /* IP */ + case 4: /* IP */ set_field_varchar_utf8(f, m_row.m_ip, m_row.m_ip_length); break; - case 4: /* PORT */ + case 5: /* PORT */ set_field_ulong(f, m_row.m_port); break; - case 5: /* BYTES_READ */ - set_field_ulonglong(f, m_row.m_bytes_read); - break; - case 6: /* BYTES_WRITE */ - set_field_ulonglong(f, m_row.m_bytes_write); - break; default: DBUG_ASSERT(false); } === modified file 'storage/perfschema/table_socket_instances.h' (properties changed: -x to +x) --- a/storage/perfschema/table_socket_instances.h 2010-12-07 19:50:08 +0000 +++ b/storage/perfschema/table_socket_instances.h 2011-02-03 05:40:19 +0000 @@ -38,6 +38,8 @@ struct row_socket_instances uint m_event_name_length; /** Column OBJECT_INSTANCE_BEGIN */ const void *m_identity; + /** Column THREAD_ID */ + uint m_thread_id; /** Column SOCKET_ID */ uint m_fd; /** Column IP. */ @@ -46,10 +48,6 @@ struct row_socket_instances uint m_ip_length; /** Column PORT */ uint m_port; - /** Column BYTES_READ */ - ulonglong m_bytes_read; // TBD - /** Column BYTES_WRITE */ - ulonglong m_bytes_write; }; /** Table PERFORMANCE_SCHEMA.SOCKET_INSTANCES. */ --===============7821591026885544536== 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: c96fc85e0701e8e0e309f8bf44d5164592ecfafa # timestamp: 2011-02-02 23:40:25 -0600 # source_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl5379/ # base_revision_id: chris.powers@stripped\ # 0mclq8kcrtximqy4 # # Begin bundle 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 --===============7821591026885544536==--