Merge branch 'mysql-8.0' into mysql-trunk

Author: marcalff

mysql-test/suite/connection_control/r/connection_delay_info_schema_view.result

@@ -6,6 +6,16 @@
 # Install connection_control plugin
 INSTALL PLUGIN connection_control SONAME 'CONNECTION_CONTROL_LIB';
 INSTALL PLUGIN connection_control_failed_login_attempts SONAME 'CONNECTION_CONTROL_LIB';
+# Performance schema
+# Verify the instrumentation provided
+SELECT * FROM performance_schema.setup_instruments
+WHERE NAME LIKE "%/conn_delay/%"
+  ORDER BY NAME;
+NAME	ENABLED	TIMED	PROPERTIES	VOLATILITY	DOCUMENTATION
+stage/conn_delay/Waiting in connection_control plugin	YES	YES		0	NULL
+wait/synch/cond/conn_delay/connection_delay_wait_condition	YES	YES		0	NULL
+wait/synch/mutex/conn_delay/connection_delay_mutex	YES	YES		0	NULL
+wait/synch/rwlock/conn_delay/connection_event_delay_lock	YES	YES	singleton	0	NULL
 # Create user accounts for testing
 CREATE USER u1@localhost IDENTIFIED BY 'abcd';
 CREATE USER u2@localhost IDENTIFIED BY 'abcd';

mysql-test/suite/connection_control/t/connection_delay_info_schema_view.test

@@ -15,6 +15,13 @@
 --echo # Install connection_control plugin
 --source ../inc/install_connection_control_plugin.inc
 
+--echo # Performance schema
+--echo # Verify the instrumentation provided
+
+SELECT * FROM performance_schema.setup_instruments
+  WHERE NAME LIKE "%/conn_delay/%"
+  ORDER BY NAME;
+
 --echo # Create user accounts for testing
 CREATE USER u1@localhost IDENTIFIED BY 'abcd';
 CREATE USER u2@localhost IDENTIFIED BY 'abcd';

plugin/connection_control/connection_control.cc

@@ -63,6 +63,49 @@ Connection_control_variables g_variables;
 Connection_event_coordinator *g_connection_event_coordinator = nullptr;
 MYSQL_PLUGIN connection_control_plugin_info = nullptr;
 
+/* Performance Schema instrumentation */
+
+PSI_mutex_key key_connection_delay_mutex = PSI_NOT_INSTRUMENTED;
+
+static PSI_mutex_info all_connection_delay_mutex_info[] = {
+    {&key_connection_delay_mutex, "connection_delay_mutex", 0, 0,
+     PSI_DOCUMENT_ME}};
+
+PSI_rwlock_key key_connection_event_delay_lock;
+
+static PSI_rwlock_info all_connection_delay_rwlock_info[] = {
+    {&key_connection_event_delay_lock, "connection_event_delay_lock",
+     PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME}};
+
+PSI_cond_key key_connection_delay_wait = PSI_NOT_INSTRUMENTED;
+
+static PSI_cond_info all_connection_delay_cond_info[] = {
+    {&key_connection_delay_wait, "connection_delay_wait_condition", 0, 0,
+     PSI_DOCUMENT_ME}};
+
+PSI_stage_info stage_waiting_in_connection_control_plugin = {
+    0, "Waiting in connection_control plugin", 0, PSI_DOCUMENT_ME};
+
+static PSI_stage_info *all_connection_delay_stage_info[] = {
+    &stage_waiting_in_connection_control_plugin};
+
+static void init_performance_schema() {
+  const char *category = "conn_delay";
+
+  int count_mutex = array_elements(all_connection_delay_mutex_info);
+  mysql_mutex_register(category, all_connection_delay_mutex_info, count_mutex);
+
+  int count_rwlock = array_elements(all_connection_delay_rwlock_info);
+  mysql_rwlock_register(category, all_connection_delay_rwlock_info,
+                        count_rwlock);
+
+  int count_cond = array_elements(all_connection_delay_cond_info);
+  mysql_cond_register(category, all_connection_delay_cond_info, count_cond);
+
+  int count_stage = array_elements(all_connection_delay_stage_info);
+  mysql_stage_register(category, all_connection_delay_stage_info, count_stage);
+}
+
 /**
   event_notify() implementation for connection_control
 
@@ -106,6 +149,12 @@ static int connection_control_notify(MYSQL_THD thd,
 */
 
 static int connection_control_init(MYSQL_PLUGIN plugin_info) {
+  /*
+    Declare all performance schema instrumentation up front,
+    so it is discoverable.
+  */
+  init_performance_schema();
+
   // Initialize error logging service.
   if (init_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs)) return 1;
 

plugin/connection_control/connection_control.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2019, 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,
@@ -23,11 +23,19 @@
 #ifndef CONNECTION_CONTROL_H
 #define CONNECTION_CONTROL_H
 
+#include <mysql/psi/mysql_cond.h>
+#include <mysql/psi/mysql_mutex.h>
 #include <mysql/psi/mysql_rwlock.h>
+#include <mysql/psi/mysql_stage.h>
 #include <mysql/psi/mysql_thread.h> /* mysql_rwlock_t */
 
 #include "plugin/connection_control/connection_control_data.h"
 
+extern PSI_mutex_key key_connection_delay_mutex;
+extern PSI_rwlock_key key_connection_event_delay_lock;
+extern PSI_cond_key key_connection_delay_wait;
+extern PSI_stage_info stage_waiting_in_connection_control_plugin;
+
 namespace connection_control {
 
 /** Helper class : Wrapper on READ lock */

plugin/connection_control/connection_delay.cc

@@ -74,10 +74,6 @@ int64 MAX_DELAY = INT_MAX32;
 
 /** variables used by connection_delay.cc */
 static mysql_rwlock_t connection_event_delay_lock;
-static PSI_rwlock_key key_connection_event_delay_lock;
-static PSI_rwlock_info all_rwlocks[] = {{&key_connection_event_delay_lock,
-                                         "connection_event_delay_lock", 0, 0,
-                                         PSI_DOCUMENT_ME}};
 
 static opt_connection_control opt_enums[] = {OPT_FAILED_CONNECTIONS_THRESHOLD,
                                              OPT_MIN_CONNECTION_DELAY,
@@ -461,29 +457,14 @@ void Connection_delay_action::conditional_wait(MYSQL_THD thd,
 
   /** PSI_stage_info for thd_enter_cond/thd_exit_cond */
   PSI_stage_info old_stage;
-  PSI_stage_info stage_waiting_in_connection_control_plugin = {
-      0, "Waiting in connection_control plugin", 0, PSI_DOCUMENT_ME};
 
   /** Initialize mutex required for mysql_cond_timedwait */
   mysql_mutex_t connection_delay_mutex;
-  const char *category = "conn_delay";
-  PSI_mutex_key key_connection_delay_mutex;
-  PSI_mutex_info connection_delay_mutex_info[] = {
-      {&key_connection_delay_mutex, "connection_delay_mutex",
-       PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME}};
-  int count_mutex = array_elements(connection_delay_mutex_info);
-  mysql_mutex_register(category, connection_delay_mutex_info, count_mutex);
   mysql_mutex_init(key_connection_delay_mutex, &connection_delay_mutex,
                    MY_MUTEX_INIT_FAST);
 
   /* Initialize condition to wait for */
   mysql_cond_t connection_delay_wait_condition;
-  PSI_cond_key key_connection_delay_wait;
-  PSI_cond_info connection_delay_wait_info[] = {
-      {&key_connection_delay_wait, "connection_delay_wait_condition", 0, 0,
-       PSI_DOCUMENT_ME}};
-  int count_cond = array_elements(connection_delay_wait_info);
-  mysql_cond_register(category, connection_delay_wait_info, count_cond);
   mysql_cond_init(key_connection_delay_wait, &connection_delay_wait_condition);
 
   /** Register wait condition with THD */
@@ -791,9 +772,6 @@ bool init_connection_delay_event(
   /*
     1. Initialize lock(s)
   */
-  const char *category = "conn_control";
-  int count = array_elements(all_rwlocks);
-  mysql_rwlock_register(category, all_rwlocks, count);
   mysql_rwlock_init(key_connection_event_delay_lock,
                     &connection_event_delay_lock);
   g_max_failed_connection_handler = new Connection_delay_action(