diff options
Diffstat (limited to 'storage/perfschema/pfs_host.h')
| -rw-r--r-- | storage/perfschema/pfs_host.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/storage/perfschema/pfs_host.h b/storage/perfschema/pfs_host.h index d52207d3571..3781988237b 100644 --- a/storage/perfschema/pfs_host.h +++ b/storage/perfschema/pfs_host.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, 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, version 2.0, @@ -40,6 +40,7 @@ struct PFS_thread; @{ */ +/** Hash key for a host. */ struct PFS_host_key { /** @@ -51,6 +52,7 @@ struct PFS_host_key uint m_key_length; }; +/** Per host statistics. */ struct PFS_ALIGNED PFS_host : PFS_connection_slice { public: @@ -74,13 +76,18 @@ public: PFS_atomic::add_32(& m_refcount, -1); } - void aggregate(void); + void aggregate(bool alive); void aggregate_waits(void); void aggregate_stages(void); void aggregate_statements(void); + void aggregate_transactions(void); + void aggregate_memory(bool alive); + void aggregate_status(void); void aggregate_stats(void); void release(void); + void carry_memory_stat_delta(PFS_memory_stat_delta *delta, uint index); + /* Internal lock. */ pfs_lock m_lock; PFS_host_key m_key; @@ -95,7 +102,7 @@ private: int init_host(const PFS_global_param *param); void cleanup_host(void); -int init_host_hash(void); +int init_host_hash(const PFS_global_param *param); void cleanup_host_hash(void); PFS_host *find_or_create_host(PFS_thread *thread, @@ -104,14 +111,7 @@ PFS_host *find_or_create_host(PFS_thread *thread, PFS_host *sanitize_host(PFS_host *unsafe); void purge_all_host(void); -/* For iterators and show status. */ - -extern ulong host_max; -extern ulong host_lost; - -/* Exposing the data directly, for iterators. */ - -extern PFS_host *host_array; +/* For show status. */ extern LF_HASH host_hash; |