summaryrefslogtreecommitdiff
path: root/sql/sql_connect.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-02-01 12:45:39 +0200
committerMonty <monty@mariadb.org>2016-02-07 10:34:03 +0200
commit3d4a7390c1a94ef6e07b04b52ea94a95878cda1b (patch)
treea53179de37b318e27e48546ed3bc8a723148104a /sql/sql_connect.h
parent076aa182c2d2ee67c233d0e79c900dfba6f593c1 (diff)
downloadmariadb-git-3d4a7390c1a94ef6e07b04b52ea94a95878cda1b.tar.gz
MDEV-6150 Speed up connection speed by moving creation of THD to new thread
Creating a CONNECT object on client connect and pass this to the working thread which creates the THD. Split LOCK_thread_count to different mutexes Added LOCK_thread_start to syncronize threads Moved most usage of LOCK_thread_count to dedicated functions Use next_thread_id() instead of thread_id++ Other things: - Thread id now starts from 1 instead of 2 - Added cast for thread_id as thread id is now of type my_thread_id - Made THD->host const (To ensure it's not changed) - Removed some DBUG_PRINT() about entering/exiting mutex as these was already logged by mutex code - Fixed that aborted_connects and connection_errors_internal are counted in all cases - Don't take locks for current_linfo when we set it (not needed as it was 0 before)
Diffstat (limited to 'sql/sql_connect.h')
-rw-r--r--sql/sql_connect.h37
1 files changed, 36 insertions, 1 deletions
diff --git a/sql/sql_connect.h b/sql/sql_connect.h
index bab171606ba..902ebfa41c9 100644
--- a/sql/sql_connect.h
+++ b/sql/sql_connect.h
@@ -19,8 +19,43 @@
#include "my_sys.h" /* pthread_handler_t */
#include "mysql_com.h" /* enum_server_command */
#include "structs.h"
+#include <mysql/psi/mysql_socket.h>
#include <hash.h>
+/*
+ Object to hold connect information to be given to the newly created thread
+*/
+
+class scheduler_functions;
+
+class CONNECT : public ilink {
+public:
+ /* To be copied to THD */
+ Vio *vio; /* Copied to THD with my_net_init() */
+ const char *host;
+ scheduler_functions *scheduler;
+ my_thread_id thread_id;
+ pthread_t real_id;
+ bool extra_port;
+
+ /* Own variables */
+ bool thread_count_incremented;
+ ulonglong prior_thr_create_utime;
+
+ CONNECT()
+ :vio(0), host(0), scheduler(thread_scheduler), thread_id(0), real_id(0),
+ extra_port(0),
+ thread_count_incremented(0), prior_thr_create_utime(0)
+ {
+ };
+ ~CONNECT();
+ void close_and_delete();
+ void close_with_error(uint sql_errno,
+ const char *message, uint close_error);
+ THD *create_thd();
+};
+
+
class THD;
typedef struct st_lex_user LEX_USER;
typedef struct user_conn USER_CONN;
@@ -37,7 +72,7 @@ void free_global_index_stats(void);
void free_global_client_stats(void);
pthread_handler_t handle_one_connection(void *arg);
-void do_handle_one_connection(THD *thd_arg);
+void do_handle_one_connection(CONNECT *connect);
bool init_new_connection_handler_thread();
void reset_mqh(LEX_USER *lu, bool get_them);
bool check_mqh(THD *thd, uint check_command);