[Feature] Issue#55 Support CPU_TIME metrics

AliSQL · AliSQL · commit bfa79bd6de6e · 2018-01-23T13:48:53.000+08:00
Supply CPU_time metric to help analysis.
diff --git a/config.h.cmake b/config.h.cmake
@@ -219,6 +219,7 @@
 #cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_CREATE 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
+#cmakedefine HAVE_PTHREAD_GETCPUCLOCKID 1
 #cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KILL 1
diff --git a/configure.cmake b/configure.cmake
@@ -553,6 +553,7 @@ CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
 CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
+CHECK_FUNCTION_EXISTS (pthread_getcpuclockid HAVE_PTHREAD_GETCPUCLOCKID)
 CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
 CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
 CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
diff --git a/include/my_pthread.h b/include/my_pthread.h
@@ -318,6 +318,23 @@ extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
 void *my_pthread_getspecific_imp(pthread_key_t key);
 #endif
 
+/* CPU time */
+#if defined(HAVE_PTHREAD_GETCPUCLOCKID) && defined(HAVE_CLOCK_GETTIME)
+
+#define HAVE_CPU_TIME
+#define my_pthread_getcpuclockid(A) pthread_getcpuclockid(pthread_self(), A)
+#define my_clock_gettime(A, B)  clock_gettime(A, B)
+typedef clockid_t my_pthread_clock_id;
+
+#else  /* Not support on other platform */
+
+#define my_pthread_getcpuclockid(A) (-1)
+#define my_clock_gettime(A, B) (-1)
+typedef ulonglong my_pthread_clock_id;
+
+#endif /* CPU time */
+
+
 #ifndef HAVE_LOCALTIME_R
 struct tm *localtime_r(const time_t *clock, struct tm *res);
 #endif
diff --git a/mysql-test/r/feature_cpu_time_metrics_issue55.result b/mysql-test/r/feature_cpu_time_metrics_issue55.result
@@ -0,0 +1,11 @@
+show status like 'cpu_time';
+Variable_name	Value
+CPU_time	#
+create table t(id int);
+drop table t;
+show status like 'cpu_time';
+Variable_name	Value
+CPU_time	#
+show full processlist;
+Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read	CPU_time
+#	root	localhost	test	Query	xxx	#	#	#	#	#	#	#	#
diff --git a/mysql-test/r/thread_memory_usage.result b/mysql-test/r/thread_memory_usage.result
@@ -4,7 +4,7 @@ select * from test.t1;
 id
 1
 show full processlist;
-Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read
-#	root	localhost	test	#	xxx	#	#	#	#	#	#	#
-#	root	localhost	test	#	xxx	#	#	#	#	#	#	#
+Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read	CPU_time
+#	root	localhost	test	#	xxx	#	#	#	#	#	#	#	#
+#	root	localhost	test	#	xxx	#	#	#	#	#	#	#	#
 drop table test.t1;
diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
@@ -96,7 +96,7 @@ echo
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
@@ -173,7 +173,7 @@ let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
@@ -222,7 +222,7 @@ connection con1;
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
@@ -260,7 +260,7 @@ connection con2;
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
@@ -324,7 +324,7 @@ WHERE ID = @test_user_con2_id AND Command IN('Query','Execute')
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
@@ -460,7 +460,7 @@ echo
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE> 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE> 9 # 10 # 11 # 12 # 13 # 14 #
 --replace_result "init" STATE "starting" STATE "cleaning up" STATE
 --sorted_result
 SHOW FULL PROCESSLIST;
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
diff --git a/mysql-test/suite/rds/r/feature_checksum_restrict_io_issue25.result b/mysql-test/suite/rds/r/feature_checksum_restrict_io_issue25.result
@@ -7,7 +7,7 @@ key(col2)
 )engine= innodb;
 Table	Checksum
 test_1.t1	1724218332
-Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read
-#	root	localhost	test	Sleep	xxx	#	#	#	#	#	#	#
-#	root	localhost	test	Query	xxx	#	#	#	#	#	#	#
-#	root	localhost	test	Sleep	xxx	#	#	#	#	#	#	#
+Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read	CPU_time
+#	root	localhost	test	Sleep	xxx	#	#	#	#	#	#	#	#
+#	root	localhost	test	Query	xxx	#	#	#	#	#	#	#	#
+#	root	localhost	test	Sleep	xxx	#	#	#	#	#	#	#	#
diff --git a/mysql-test/suite/rds/r/feature_restrict_iops_issue25.result b/mysql-test/suite/rds/r/feature_restrict_iops_issue25.result
@@ -10,8 +10,8 @@ checksum table test_1.t1;
 Table	Checksum
 test_1.t1	3791299187
 show full processlist;
-Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read
-#	root	localhost	test	Query	xxx	#	#	#	#	#	#	#
+Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read	CPU_time
+#	root	localhost	test	Query	xxx	#	#	#	#	#	#	#	#
 show status like '%IO_limit_count%';
 Variable_name	Value
 IO_limit_count	#
diff --git a/mysql-test/suite/rds/t/feature_checksum_restrict_io_issue25.test b/mysql-test/suite/rds/t/feature_checksum_restrict_io_issue25.test
@@ -24,7 +24,7 @@ commit;
 set session rds_sql_max_iops=2;
 checksum table test_1.t1;
 
---replace_column 1 # 6 xxx 7 # 8 # 9 # 10 # 11 # 12 # 13 #
+--replace_column 1 # 6 xxx 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 #
 show full processlist;
 
 
diff --git a/mysql-test/t/feature_cpu_time_metrics_issue55.test b/mysql-test/t/feature_cpu_time_metrics_issue55.test
@@ -0,0 +1,14 @@
+connection default;
+
+--replace_column 2 #
+show status like 'cpu_time';
+
+create table t(id int);
+drop table t;
+
+--replace_column 2 #
+show status like 'cpu_time';
+
+--replace_column 1 # 6 xxx 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 17 #
+show full processlist;
+
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -8278,6 +8278,7 @@ SHOW_VAR status_vars[]= {
   {"Physical_sync_read",       (char*) offsetof(STATUS_VAR, physical_sync_read), SHOW_LONGLONG_STATUS},
   {"Physical_async_read",      (char*) offsetof(STATUS_VAR, physical_async_read), SHOW_LONGLONG_STATUS},
   {"IO_limit_count",           (char*) offsetof(STATUS_VAR, io_limit_count), SHOW_LONGLONG_STATUS},
+  {"CPU_time",                 (char*) offsetof(STATUS_VAR, cpu_time), SHOW_LONGLONG_STATUS},
   {"Select_full_join",         (char*) offsetof(STATUS_VAR, select_full_join_count), SHOW_LONGLONG_STATUS},
   {"Select_full_range_join",   (char*) offsetof(STATUS_VAR, select_full_range_join_count), SHOW_LONGLONG_STATUS},
   {"Select_range",             (char*) offsetof(STATUS_VAR, select_range_count), SHOW_LONGLONG_STATUS},
diff --git a/sql/sql_class.h b/sql/sql_class.h
@@ -676,6 +676,7 @@ typedef struct system_status_var
   ulonglong physical_sync_read;
   ulonglong physical_async_read;
   ulonglong io_limit_count;
+  ulonglong cpu_time;
   /*
     Number of statements sent from the client
   */
@@ -2341,6 +2342,9 @@ class THD :public MDL_context_owner,
   // track down slow pthread_create
   ulonglong  prior_thr_create_utime, thr_create_utime;
   ulonglong  start_utime, utime_after_lock;
+  struct timespec  start_cpu_time;
+  my_pthread_clock_id clock_id;
+  bool clock_err;
 
   thr_lock_type update_lock_default;
   Delayed_insert *di;
@@ -3621,6 +3625,34 @@ class THD :public MDL_context_owner,
   {
     return limit_found_rows;
   }
+
+  void set_cpu_time()
+  {
+    clock_err= false;
+#ifdef HAVE_CPU_TIME
+    if (my_pthread_getcpuclockid(&clock_id)
+        || my_clock_gettime(clock_id, &start_cpu_time) == -1)
+    {
+      clock_err= true;
+      return;
+    }
+#endif
+  }
+
+  void inc_cpu_time()
+  {
+#ifdef HAVE_CPU_TIME
+    if (!clock_err)
+    {
+      struct timespec end_cpu_time;
+      if (my_clock_gettime(clock_id, &end_cpu_time) != -1)
+      {
+        ulonglong diff= diff_timespec(end_cpu_time, start_cpu_time);
+        status_var_add(status_var.cpu_time, diff);
+      }
+    }
+#endif
+  }
   /**
     Returns TRUE if session is in a multi-statement transaction mode.
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -1243,6 +1243,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
   thd->enable_slow_log= TRUE;
   thd->lex->sql_command= SQLCOM_END; /* to avoid confusing VIEW detectors */
   thd->set_time();
+  thd->set_cpu_time();
   if (!thd->is_valid_time())
   {
     /*
@@ -1873,6 +1874,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
   thd->packet.shrink(thd->variables.net_buffer_length);	// Reclaim some memory
   free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
 
+  thd->inc_cpu_time();
   /* DTRACE instrumentation, end */
   if (MYSQL_QUERY_DONE_ENABLED() || MYSQL_COMMAND_DONE_ENABLED())
   {
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
@@ -2063,6 +2063,7 @@ class thread_info
   CSET_STRING query_string;
   long long memory_used, query_memory_used;
   ulonglong logical_read, physical_sync_read, physical_async_read;
+  ulonglong cpu_time;
 };
 
 // For sorting by thread_id.
@@ -2241,6 +2242,10 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
     field_list.push_back(field= new Item_return_int("Physical_async_read",
                                                     MY_INT64_NUM_DECIMAL_DIGITS,
                                                     MYSQL_TYPE_LONGLONG));
+
+    field_list.push_back(field= new Item_return_int("CPU_time",
+                                                    MY_INT64_NUM_DECIMAL_DIGITS,
+                                                    MYSQL_TYPE_LONGLONG));
   }
   if (protocol->send_result_set_metadata(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
@@ -2297,6 +2302,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
         thd_info->logical_read= tmp->status_var.logical_read;
         thd_info->physical_sync_read= tmp->status_var.physical_sync_read;
         thd_info->physical_async_read= tmp->status_var.physical_async_read;
+        thd_info->cpu_time= tmp->status_var.cpu_time;
 
         DBUG_EXECUTE_IF("processlist_acquiring_dump_threads_LOCK_thd_data",
                         {
@@ -2363,6 +2369,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
       protocol->store(thd_info->logical_read);
       protocol->store(thd_info->physical_sync_read);
       protocol->store(thd_info->physical_async_read);
+      protocol->store(thd_info->cpu_time);
     }
     if (protocol->write())
       break; /* purecov: inspected */
