You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

88 lines
2.5 KiB

Fixed compiler warnings Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
19 years ago
Fixed compiler warnings Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
19 years ago
  1. /* Copyright (C) 2007 MySQL AB, 2008-2010 Sun Microsystems, Inc.
  2. This program is free software; you can redistribute it and/or modify
  3. it under the terms of the GNU General Public License as published by
  4. the Free Software Foundation; version 2 of the License.
  5. This program is distributed in the hope that it will be useful,
  6. but WITHOUT ANY WARRANTY; without even the implied warranty of
  7. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  8. GNU General Public License for more details.
  9. You should have received a copy of the GNU General Public License
  10. along with this program; if not, write to the Free Software
  11. Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
  12. /*
  13. Implementation for the thread scheduler
  14. */
  15. #ifdef USE_PRAGMA_INTERFACE
  16. #pragma implementation
  17. #endif
  18. #include <mysql_priv.h>
  19. /*
  20. 'Dummy' functions to be used when we don't need any handling for a scheduler
  21. event
  22. */
  23. static bool init_dummy(void) {return 0;}
  24. static void post_kill_dummy(THD* thd) {}
  25. static void end_dummy(void) {}
  26. static bool end_thread_dummy(THD *thd, bool cache_thread) { return 0; }
  27. /*
  28. Initialize default scheduler with dummy functions so that setup functions
  29. only need to declare those that are relvant for their usage
  30. */
  31. scheduler_functions::scheduler_functions()
  32. :init(init_dummy),
  33. init_new_connection_thread(init_new_connection_handler_thread),
  34. add_connection(0), // Must be defined
  35. post_kill_notification(post_kill_dummy),
  36. end_thread(end_thread_dummy), end(end_dummy)
  37. {}
  38. /*
  39. End connection, in case when we are using 'no-threads'
  40. */
  41. static bool no_threads_end(THD *thd, bool put_in_cache)
  42. {
  43. unlink_thd(thd);
  44. mysql_mutex_unlock(&LOCK_thread_count);
  45. return 1; // Abort handle_one_connection
  46. }
  47. /*
  48. Initailize scheduler for --thread-handling=no-threads
  49. */
  50. void one_thread_scheduler(scheduler_functions* func)
  51. {
  52. func->max_threads= 1;
  53. #ifndef EMBEDDED_LIBRARY
  54. func->add_connection= handle_connection_in_main_thread;
  55. #endif
  56. func->init_new_connection_thread= init_dummy;
  57. func->end_thread= no_threads_end;
  58. }
  59. /*
  60. Initialize scheduler for --thread-handling=one-thread-per-connection
  61. */
  62. #ifndef EMBEDDED_LIBRARY
  63. void one_thread_per_connection_scheduler(scheduler_functions* func)
  64. {
  65. func->max_threads= max_connections;
  66. func->add_connection= create_thread_to_handle_connection;
  67. func->end_thread= one_thread_per_connection_end;
  68. }
  69. #endif /* EMBEDDED_LIBRARY */