From: Christopher Powers Date: March 18 2011 7:06pm Subject: bzr push into mysql-trunk branch (chris.powers:3259 to 3260) WL#4896 List-Archive: http://lists.mysql.com/commits/133354 Message-Id: <20110318190657.6A85C1DB0335@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7839219222136878738==" --===============7839219222136878738== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3260 cpowers 2011-03-18 WL#4896 "Performance Schema Net IO" - Fix valgrind warnings associated with SOCKET_INSTANCES.THREAD_ID modified: storage/perfschema/table_socket_instances.cc storage/perfschema/table_socket_instances.h 3259 Marc Alff 2011-03-16 WL#4896 PERFORMANCE SCHEMA NET IO Added instrumentation for IDLE events. added: include/mysql/psi/mysql_idle.h modified: include/mysql/psi/mysql_socket.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_socket_class.result mysql-test/suite/perfschema/r/start_server_no_socket_inst.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/ortho_iter.test sql/sql_parse.cc storage/perfschema/pfs.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/pfs_visitor.cc storage/perfschema/table_events_waits.cc storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_helper.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_timers.cc === modified file 'storage/perfschema/table_socket_instances.cc' --- a/storage/perfschema/table_socket_instances.cc 2011-03-14 16:11:25 +0000 +++ b/storage/perfschema/table_socket_instances.cc 2011-03-18 19:05:00 +0000 @@ -159,7 +159,10 @@ void table_socket_instances::make_row(PF PFS_thread *safe_thread= sanitize_thread(pfs->m_thread_owner); if (safe_thread != NULL) + { m_row.m_thread_id= safe_thread->m_thread_id; + m_row.m_thread_id_set= true; + } if (pfs->m_lock.end_optimistic_lock(&lock)) m_row_exists= true; @@ -191,7 +194,7 @@ int table_socket_instances::read_row_val set_field_ulonglong(f, (intptr)m_row.m_identity); break; case 2: /* THREAD_ID */ - if (m_row.m_thread_id != 0) // TBD: use flag to indicate valid thread id? + if (m_row.m_thread_id_set) set_field_ulong(f, m_row.m_thread_id); else f->set_null(); === modified file 'storage/perfschema/table_socket_instances.h' --- a/storage/perfschema/table_socket_instances.h 2011-03-09 21:28:05 +0000 +++ b/storage/perfschema/table_socket_instances.h 2011-03-18 19:05:00 +0000 @@ -40,6 +40,8 @@ struct row_socket_instances const void *m_identity; /** Column THREAD_ID */ uint m_thread_id; + /** True if thread_is is set */ + bool m_thread_id_set; /** Column SOCKET_ID */ uint m_fd; /** Socket ip address, IPV4 or IPV6 */ @@ -48,6 +50,8 @@ struct row_socket_instances uint m_ip_length; /** Column PORT */ uint m_port; + + row_socket_instances() {m_thread_id= false;} }; /** Table PERFORMANCE_SCHEMA.SOCKET_INSTANCES. */ --===============7839219222136878738== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/cpowers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cpowers@tma-1-20110318190500-w69xcqsu3cs4ff2w # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 47fe4f45f20fb10e222cc9658b74b4d7ab3cbcea # timestamp: 2011-03-18 14:06:56 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: marc.alff@stripped\ # k0jcu83qimk8jh7a # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYdndy0AAj7fgEQQWHP//39v 3IC////6UAS5a811lTOe7YrABJRDVPTTTQJmIjaTNJ6mmgGgaBo0BkEpCapvST8jSZT1HhTTTTIA AANAAAaEyU2lP1Tyj1PSG9FAAaAAAaGjaagEklGmRhTTDU9Eep6JkBp+lNAA0AA0EkhMgTaTQ0Jq ejTJPKDQNNNAAABwobUSQ/f6Mk+MOG8WOnU9XTdBFiqSi5gRTBAliPeMTPqBIRK/yuaseIgDBmRm MuQo4GgDqMIantPA137cA5zRn3ji1e3rldcqfPfa3W7ZKfjEVn2hPFthHUM85seHHiqYWZi7XnBj 1iHdSwuhw3bbczSJjEMvMsYGI+UUA4ppM1l4JcuScCngBprkUuZMwk0qsxuIC1AhWbkYD2eA/Bjn mUc6QMQQ4ZIHUc4EB4wOG6SMpFuq0HqwgMOK2+5oXKass8DwaCFyrrF2RViCPaFpHdMkqIj5GtcN CZdLKlmnDqK1VhS4Z9QXOsDTJOTwku3GgDT133AVZgbMXlXWP07o62VeXKMsCICYTgwI6zOWFlM4 axkeIPmJSEZUZ3gOAFFVZe+rG5gTjYRJmUJqh5Gf8A6Li/BTr0UlgprYY4jJEjSES94Lnh1vdKVJ HAQMJtAZQc9qURYBYKKJRRC4nRaYLsktaVkFjC6tj4zPE1AUNJUkoVDTaVFR/OAGFAbcOGJbaHIv eyV03xCAthJ2Di+aYJnG4l62Wlr8N4KnasB+fZSrSKMSiLiiy1lTp5c6zLYX0gVjoaYIcbSp0nQf dK4cTzTKyEQJxpMlc3XqBLI0qVc9QoeDVNFRRRU2vIY+JXQIFe4g5gOFvKFlaRghlyXTRBkZm777 er6uwfOavQvCLesIMffXnpak2x5mXHdGVlorDiQiNCGLn8wpMAwHSYUgBuvBUmSopM5VU9uzukE4 0+CsihfVx9GBbtWiU1RovsUPc8pEpuF4iZptEt0aYImdkw9KTtFHR0IH+ovBdUWCuOpCMoWO5ZIC 51sr7T79J7yWXJOUavH4x1GhMO1AdgHwTd+5vec05+E5iQUA2bQQiLBDKweM/qXELI3odRMxEMhu bxFhr++F6iZsUnKVE2MzsbaLSGCyo0XYcz8+Bp6dEu60Xw4kUqemDHNgkDXkNqYE6+qqCDoZeSUq JEPtQk5VXSA4oeTWVXzGGwoAKlGpHnIWyq84zuGyitwYK7r01AonKAusjISpZbBLaaN/egaD+t5V GJ81p+tQixXrpbL9uC4iCtxopU+5xPRNkTViCAxbOJOuJkpkaZ9sIjYZTWAqIkwaRZEYa3QxrFr1 5uZsnQIY6NqZWDpjtDla+CxaEDpBlYRQQE9iNN70qxMwMuAb8QI04hFHVpoPcsEVB43KqhPBZuWG dhgeuwlG4FhGv1LLQBozpVAZXrqQyVW2akG701BLJCbEpAsGl7ZDls0WaySygeUKEinNqIw6c070 7aw4tQxxLAnbBLut0NxSrRxAZ8GIbhw945LuD17mZWAPjkyhhlUwfRqzzN4ixE1vanGTwsiBrWNB qaFMlnRrRcMWAOoe4E7gQt7TsAqCpFiZohPClXx3lq/v/F3JFOFCQh2d3LQ= --===============7839219222136878738==--