WL#5766 : PERFORMANCE SCHEMA, stored programs instrumentation.

Details:
 - 4th round of review comment from Marc.

Author: mayprasa

include/mysql/psi/mysql_sp.h

@@ -70,7 +70,8 @@ enum enum_sp_object_type
   SP_OBJECT_TYPE_PROCEDURE= 3,
   SP_OBJECT_TYPE_TABLE= 4,
   SP_OBJECT_TYPE_TRIGGER= 5,
-  SP_OBJECT_TYPE_TEMPORARY_TABLE= 6
+  SP_OBJECT_TYPE_TEMPORARY_TABLE= 7,
+  SP_OBJECT_TYPE_NONE= 7
 };
 
 static inline struct PSI_sp_locker*

storage/perfschema/pfs.cc

@@ -4555,12 +4555,18 @@ pfs_get_thread_statement_locker_v1(PSI_statement_locker_state *state,
         PFS_program *parent_sp= reinterpret_cast<PFS_program*>(sp_share);
         pfs->m_sp_type= parent_sp->m_type;
         memcpy(pfs->m_schema_name, parent_sp->m_schema_name,
-               parent_sp->m_schema_name_length);   
-        pfs->m_schema_name_length= parent_sp->m_schema_name_length;                         
+               parent_sp->m_schema_name_length);
+        pfs->m_schema_name_length= parent_sp->m_schema_name_length;
         memcpy(pfs->m_object_name, parent_sp->m_object_name,
                parent_sp->m_object_name_length);
-        pfs->m_object_name_length= parent_sp->m_object_name_length;                       
-      }  
+        pfs->m_object_name_length= parent_sp->m_object_name_length;
+      }
+      else
+      {
+        pfs->m_sp_type= OBJECT_TYPE_NONE;
+        pfs->m_schema_name_length= 0;
+        pfs->m_object_name_length= 0;
+      }
 
       state->m_statement= pfs;
       flags|= STATE_FLAG_EVENT;
@@ -5153,28 +5159,32 @@ void pfs_release_sp_share_v1(PSI_sp_share* sp_share)
 
 PSI_sp_locker* pfs_start_sp_v1(PSI_sp_locker_state *state, PSI_sp_share *sp_share)
 {
-  PFS_thread *pfs_thread= my_pthread_get_THR_PFS();                             
-  if (unlikely(pfs_thread == NULL))                                             
+  DBUG_ASSERT(state != NULL);
+  if (! flag_global_instrumentation)
     return NULL;
 
-  PFS_program *pfs_program= reinterpret_cast<PFS_program*>(sp_share);
+  if (flag_thread_instrumentation)
+  {
+    PFS_thread *pfs_thread= my_pthread_get_THR_PFS();                             
+    if (unlikely(pfs_thread == NULL))                                             
+      return NULL;
+  }
+
   /* 
     sp share might be null in case when stat array is full and no new
     stored program stats are being inserted into it.
   */
+  PFS_program *pfs_program= reinterpret_cast<PFS_program*>(sp_share);
   if (pfs_program == NULL || !pfs_program->m_enabled)
     return NULL;
 
-  state->m_thread= reinterpret_cast<PSI_thread *> (pfs_thread);
-
-  ulonglong timer_start= 0;
+  state->m_flags= 0;
 
   if(pfs_program->m_timed)
   {
-    state->m_flags |= STATE_FLAG_TIMED;
-    timer_start= get_timer_raw_value_and_function(statement_timer, 
+    state->m_flags|= STATE_FLAG_TIMED;
+    state->m_timer_start= get_timer_raw_value_and_function(statement_timer, 
                                                   & state->m_timer);
-    state->m_timer_start= timer_start;
   }
 
   state->m_sp_share= sp_share;
@@ -5187,8 +5197,8 @@ void pfs_end_sp_v1(PSI_sp_locker *locker)
   PSI_sp_locker_state *state= reinterpret_cast<PSI_sp_locker_state*> (locker);
   DBUG_ASSERT(state != NULL);
 
-  ulonglong timer_end= 0;
-  ulonglong wait_time= 0;
+  ulonglong timer_end;
+  ulonglong wait_time;
 
   PFS_program *pfs_program= reinterpret_cast<PFS_program *>(state->m_sp_share);
   PFS_sp_stat *stat= &pfs_program->m_sp_stat;

storage/perfschema/pfs_column_types.h

@@ -191,12 +191,13 @@ enum enum_object_type
   OBJECT_TYPE_PROCEDURE= 3,
   OBJECT_TYPE_TABLE= 4,
   OBJECT_TYPE_TRIGGER= 5,
-  OBJECT_TYPE_TEMPORARY_TABLE= 6
+  OBJECT_TYPE_TEMPORARY_TABLE= 6,
+  OBJECT_TYPE_NONE= 7
 };
 /** Integer, first value of @sa enum_object_type. */
 #define FIRST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_EVENT))
 /** Integer, last value of @sa enum_object_type. */
-#define LAST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_TEMPORARY_TABLE))
+#define LAST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_NONE))
 /** Integer, number of values of @sa enum_object_type. */
 #define COUNT_OBJECT_TYPE (LAST_OBJECT_TYPE - FIRST_OBJECT_TYPE + 1)
 

storage/perfschema/pfs_program.cc

@@ -38,14 +38,18 @@ bool flag_programs= true;
 /** Current index in Stat array where new record is to be inserted. */
 volatile uint32 program_index= 0;
 
+/** Max size of the program array. */
 ulong program_max= 0;
+/** Number of stored program instanes lost. */
 ulong program_lost= 0;
+/** True when program array is full. */
+bool program_full;
 
 LF_HASH program_hash;                                                           
 static bool program_hash_inited= false;
 
 /**
-  Initialize table EVENTS_STATEMENTS_SUMMARY_BY_ROUTINE.
+  Initialize table EVENTS_STATEMENTS_SUMMARY_BY_PROGRAM.
   @param param performance schema sizing
 */
 int init_program(const PFS_global_param *param)
@@ -56,6 +60,7 @@ int init_program(const PFS_global_param *param)
   */
   program_max= param->m_program_sizing;
   program_lost= 0;
+  program_full= false;
 
   if (program_max == 0)
     return 0;
@@ -202,10 +207,18 @@ find_or_create_program(PFS_thread *thread,
                       const char *schema_name,
                       uint schema_name_length)
 {
+  bool is_enabled, is_timed;
+
   if (program_array == NULL || program_max == 0 ||
       object_name_length ==0 || schema_name_length == 0)
     return NULL;
 
+  if(program_full)
+  {
+    program_lost++;
+    return NULL;
+  }
+
   LF_PINS *pins= get_program_hash_pins(thread);
   if (unlikely(pins == NULL))
     return NULL;
@@ -239,6 +252,15 @@ find_or_create_program(PFS_thread *thread,
 
   lf_hash_search_unpin(pins);
 
+  /* 
+     First time while inserting this record to program array we need to
+     find out if it is enabled and timed.
+  */
+  lookup_setup_object(thread, object_type,
+                      schema_name, schema_name_length,
+                      object_name, object_name_length,
+                      &is_enabled, &is_timed);
+
   /* Else create a new record in program stat array. */
   while (++attempts <= program_max)
   {
@@ -258,15 +280,9 @@ find_or_create_program(PFS_thread *thread,
         pfs->m_object_name_length= object_name_length;
         pfs->m_schema_name= pfs->m_object_name + object_name_length + 1;
         pfs->m_schema_name_length= schema_name_length;
+        pfs->m_enabled= is_enabled;
+        pfs->m_timed= is_timed;
 
-        /* 
-           First time while inserting this record to program array we need to
-           find out if it is enabled and timed.
-        */
-        lookup_setup_object(thread, pfs->m_type,
-                            pfs->m_schema_name, pfs->m_schema_name_length,
-                            pfs->m_object_name, pfs->m_object_name_length,
-                            &pfs->m_enabled, &pfs->m_timed);
 
         /* Insert this record. */
         int res= lf_hash_insert(&program_hash, pins, &pfs);
@@ -297,6 +313,7 @@ find_or_create_program(PFS_thread *thread,
     }
   }
   program_lost++;
+  program_full= true;
   return NULL;
 }
 
@@ -330,6 +347,7 @@ void drop_program(PFS_thread *thread,
     lf_hash_delete(&program_hash, pins,
                    key.m_hash_key, key.m_key_length);
     pfs->m_lock.allocated_to_free();
+    program_full= false;
   }
 
   lf_hash_search_unpin(pins);

storage/perfschema/pfs_program.h

@@ -13,8 +13,8 @@
   along with this program; if not, write to the Free Software Foundation,
   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#ifndef PFS_ROUTINE_H
-#define PFS_ROUTINE_H
+#ifndef PFS_PROGRAM_H
+#define PFS_PROGRAM_H
 
 /**
   @file storage/perfschema/pfs_program.h
@@ -46,7 +46,7 @@ struct PFS_program_key
   uint m_key_length;
 }; 
 
-struct PFS_program : public PFS_instr
+struct PFS_ALIGNED PFS_program : public PFS_instr
 {
   /** Object type. */
   enum_object_type m_type;

storage/perfschema/table_esms_by_program.cc

@@ -15,7 +15,7 @@
 
 /**
   @file storage/perfschema/table_esms_by_program.cc
-  Table EVENTS_STATEMENTS_SUMMARY_BY_ROUTINE (implementation).
+  Table EVENTS_STATEMENTS_SUMMARY_BY_PROGRAM (implementation).
 */
 
 #include "my_global.h"

storage/perfschema/table_esms_by_program.h

@@ -13,8 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifndef TABLE_ESMS_BY_ROUTINE_H
-#define TABLE_ESMS_BY_ROUTINE_H
+#ifndef TABLE_ESMS_BY_PROGRAM_H
+#define TABLE_ESMS_BY_PROGRAM_H
 
 /**
   @file storage/perfschema/table_esms_by_program.h