1 files changed, 38 insertions, 32 deletions

diff --git a/storage/perfschema/table_all_instr.cc b/storage/perfschema/table_all_instr.cc
index d48028b1539..b030b8824ca 100644
--- a/storage/perfschema/table_all_instr.cc
+++ b/storage/perfschema/table_all_instr.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 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,
@@ -26,9 +26,20 @@
 */
 
 #include "my_global.h"
-#include "my_pthread.h"
+#include "my_thread.h"
 #include "table_all_instr.h"
 #include "pfs_global.h"
+#include "pfs_buffer_container.h"
+
+ha_rows
+table_all_instr::get_row_count(void)
+{
+  return global_mutex_container.get_row_count()
+    + global_rwlock_container.get_row_count()
+    + global_cond_container.get_row_count()
+    + global_file_container.get_row_count()
+    + global_socket_container.get_row_count() ;
+}
 
 table_all_instr::table_all_instr(const PFS_engine_table_share *share)
   : PFS_engine_table(share, &m_pos),
@@ -55,10 +66,10 @@ int table_all_instr::rnd_next(void)
   {
     switch (m_pos.m_index_1) {
     case pos_all_instr::VIEW_MUTEX:
-      for ( ; m_pos.m_index_2 < mutex_max; m_pos.m_index_2++)
       {
-        mutex= &mutex_array[m_pos.m_index_2];
-        if (mutex->m_lock.is_populated())
+        PFS_mutex_iterator it= global_mutex_container.iterate(m_pos.m_index_2);
+        mutex= it.scan_next(& m_pos.m_index_2);
+        if (mutex != NULL)
         {
           make_mutex_row(mutex);
           m_next_pos.set_after(&m_pos);
@@ -67,10 +78,10 @@ int table_all_instr::rnd_next(void)
       }
       break;
     case pos_all_instr::VIEW_RWLOCK:
-      for ( ; m_pos.m_index_2 < rwlock_max; m_pos.m_index_2++)
       {
-        rwlock= &rwlock_array[m_pos.m_index_2];
-        if (rwlock->m_lock.is_populated())
+        PFS_rwlock_iterator it= global_rwlock_container.iterate(m_pos.m_index_2);
+        rwlock= it.scan_next(& m_pos.m_index_2);
+        if (rwlock != NULL)
         {
           make_rwlock_row(rwlock);
           m_next_pos.set_after(&m_pos);
@@ -79,10 +90,10 @@ int table_all_instr::rnd_next(void)
       }
       break;
     case pos_all_instr::VIEW_COND:
-      for ( ; m_pos.m_index_2 < cond_max; m_pos.m_index_2++)
       {
-        cond= &cond_array[m_pos.m_index_2];
-        if (cond->m_lock.is_populated())
+        PFS_cond_iterator it= global_cond_container.iterate(m_pos.m_index_2);
+        cond= it.scan_next(& m_pos.m_index_2);
+        if (cond != NULL)
         {
           make_cond_row(cond);
           m_next_pos.set_after(&m_pos);
@@ -91,10 +102,10 @@ int table_all_instr::rnd_next(void)
       }
       break;
     case pos_all_instr::VIEW_FILE:
-      for ( ; m_pos.m_index_2 < file_max; m_pos.m_index_2++)
       {
-        file= &file_array[m_pos.m_index_2];
-        if (file->m_lock.is_populated())
+        PFS_file_iterator it= global_file_container.iterate(m_pos.m_index_2);
+        file= it.scan_next(& m_pos.m_index_2);
+        if (file != NULL)
         {
           make_file_row(file);
           m_next_pos.set_after(&m_pos);
@@ -103,10 +114,10 @@ int table_all_instr::rnd_next(void)
       }
       break;
     case pos_all_instr::VIEW_SOCKET:
-      for ( ; m_pos.m_index_2 < socket_max; m_pos.m_index_2++)
       {
-        socket= &socket_array[m_pos.m_index_2];
-        if (socket->m_lock.is_populated())
+        PFS_socket_iterator it= global_socket_container.iterate(m_pos.m_index_2);
+        socket= it.scan_next(& m_pos.m_index_2);
+        if (socket != NULL)
         {
           make_socket_row(socket);
           m_next_pos.set_after(&m_pos);
@@ -132,45 +143,40 @@ int table_all_instr::rnd_pos(const void *pos)
 
   switch (m_pos.m_index_1) {
   case pos_all_instr::VIEW_MUTEX:
-    DBUG_ASSERT(m_pos.m_index_2 < mutex_max);
-    mutex= &mutex_array[m_pos.m_index_2];
-    if (mutex->m_lock.is_populated())
+    mutex= global_mutex_container.get(m_pos.m_index_2);
+    if (mutex != NULL)
     {
       make_mutex_row(mutex);
       return 0;
     }
     break;
   case pos_all_instr::VIEW_RWLOCK:
-    DBUG_ASSERT(m_pos.m_index_2 < rwlock_max);
-    rwlock= &rwlock_array[m_pos.m_index_2];
-    if (rwlock->m_lock.is_populated())
+    rwlock= global_rwlock_container.get(m_pos.m_index_2);
+    if (rwlock != NULL)
     {
       make_rwlock_row(rwlock);
       return 0;
     }
     break;
   case pos_all_instr::VIEW_COND:
-    DBUG_ASSERT(m_pos.m_index_2 < cond_max);
-    cond= &cond_array[m_pos.m_index_2];
-    if (cond->m_lock.is_populated())
+    cond= global_cond_container.get(m_pos.m_index_2);
+    if (cond != NULL)
     {
       make_cond_row(cond);
       return 0;
     }
     break;
   case pos_all_instr::VIEW_FILE:
-    DBUG_ASSERT(m_pos.m_index_2 < file_max);
-    file= &file_array[m_pos.m_index_2];
-    if (file->m_lock.is_populated())
+    file= global_file_container.get(m_pos.m_index_2);
+    if (file != NULL)
     {
       make_file_row(file);
       return 0;
     }
     break;
   case pos_all_instr::VIEW_SOCKET:
-    DBUG_ASSERT(m_pos.m_index_2 < socket_max);
-    socket= &socket_array[m_pos.m_index_2];
-    if (socket->m_lock.is_populated())
+    socket= global_socket_container.get(m_pos.m_index_2);
+    if (socket != NULL)
     {
       make_socket_row(socket);
       return 0;