Extend trx_sys library

storage/innobase/btr/btr0cur.cc

@@ -49,6 +49,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 10/16/1994 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_sys/trx_sys.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/page/page_zip_available.h>
 #include <innodb/memory_check/memory_check.h>

storage/innobase/buf/buf0buf.cc

@@ -42,6 +42,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sys/time.h>
 #include <sys/resource.h>
 
+#include <innodb/trx_sys/trx_sys_mutex_enter.h>
+#include <innodb/trx_sys/trx_sys_mutex_exit.h>
 #include <innodb/page/page_zip_decompress.h>
 #include <innodb/logger/fatal.h>
 #include <innodb/dict_types/index_id_t.h>

storage/innobase/buf/buf0flu.cc

@@ -103,7 +103,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0mon.h"
 #include "srv0srv.h"
 #include "srv0start.h"
-#include "trx0sys.h"
+
 
 #include <innodb/formatting/formatting.h>
 #include "ut0stage.h"

storage/innobase/buf/buf0rea.cc

@@ -33,6 +33,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <mysql/service_thd_wait.h>
 #include <stddef.h>
 
+#include <innodb/trx_sys/trx_sys_hdr_page.h>
 #include <innodb/logger/info.h>
 #include <innodb/math/ut_ulint_cmp.h>
 #include <innodb/buf_pool/buf_pool_get.h>
@@ -59,7 +60,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "my_inttypes.h"
 #include "srv0srv.h"
 #include "srv0start.h"
-#include "trx0sys.h"
+
 #include <innodb/formatting/formatting.h>
 
 /** There must be at least this many pages in buf_pool in the area to start

storage/innobase/dict/dict0dd.cc

@@ -27,6 +27,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 /** @file dict/dict0dd.cc
 Data dictionary interface */
 
+#include <innodb/trx_sys/trx_sys.h>
 #include <innodb/dict_mem/dict_mem_table_add_col.h>
 #include <innodb/dict_mem/dict_mem_table_create.h>
 #include <innodb/dict_mem/dict_mem_table_free.h>

storage/innobase/handler/ha_innodb.cc

@@ -46,6 +46,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "my_config.h"
 #endif /* !UNIV_HOTBACKUP */
 
+#include <innodb/trx_sys/trx_sys.h>
 #include <innodb/read/MVCC.h>
 #include <innodb/trx_trx/trx_state_eq.h>
 #include <innodb/trx_trx/trx_isolation_level.h>
@@ -289,7 +290,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0tmp.h"
 #include "trx0roll.h"
 #include "trx0rseg.h"
-#include "trx0sys.h"
+
 
 #include "trx0xa.h"
 #else

storage/innobase/handler/p_s.cc

@@ -29,6 +29,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
  *******************************************************/
 
+#include <innodb/trx_sys/trx_sys_mutex_enter.h>
+#include <innodb/trx_sys/trx_sys_mutex_exit.h>
+#include <innodb/trx_sys/trx_sys.h>
 #include <innodb/trx_trx/assert_trx_nonlocking_or_in_list.h>
 #include <innodb/trx_trx/trx_immutable_id.h>
 #include <innodb/trx_trx/trx_is_started.h>
@@ -43,7 +46,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "sql_table.h"
 #include "table.h"
 #include "trx0i_s.h"
-#include "trx0sys.h"
+
 
 #include "my_io.h"
 

storage/innobase/ibuf/ibuf0ibuf.cc

@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include <innodb/trx_sys/trx_sys_hdr_page.h>
 #include <innodb/trx_trx/trx_is_interrupted.h>
 #include <innodb/dict_mem/dict_add_col_name.h>
 #include <innodb/dict_mem/dict_mem_fill_column_struct.h>
@@ -115,7 +116,7 @@ bool srv_ibuf_disable_background_merge;
 
 #include "row0upd.h"
 #include "srv0start.h"
-#include "trx0sys.h"
+
 
 /*	STRUCTURE OF AN INSERT BUFFER RECORD
 

storage/innobase/include/lock0lock.h

@@ -88,7 +88,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0row.h"
 #include "row0vers.h"
 #include "srv0srv.h"
-#include "trx0sys.h"
+
 
 #include "que0types.h"
 #include "srv0srv.h"

storage/innobase/include/row0row.ic

@@ -30,6 +30,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 4/20/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_sys/trx_read_trx_id.h>
 #include <innodb/record/rec_get_nth_field.h>
 #include <innodb/data_types/dtuple_get_n_fields.h>
 #include <innodb/record/rec_get_nth_field_offs.h>

storage/innobase/include/row0undo.h

@@ -39,7 +39,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "btr0types.h"
 #include "que0types.h"
 #include "row0types.h"
-#include "trx0sys.h"
+
 
 
 /** Converts an implict lock on the record to explict in case of partial

storage/innobase/include/trx0purge.h

@@ -35,6 +35,10 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/univ/univ.h>
 
+#include <innodb/tablespace/Space_Ids.h>
+#include <innodb/trx_types/TrxUndoRsegs.h>
+#include <innodb/trx_types/trx_rseg_t.h>
+#include <innodb/trx_types/Rsegs.h>
 #include <innodb/trx_types/PQMutex.h>
 #include <innodb/allocator/UT_NEW_NOKEY.h>
 
@@ -43,15 +47,18 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "page0page.h"
 #include "que0types.h"
 #include <innodb/read/ReadView.h>
-#include "trx0sys.h"
+
 #include "usr0sess.h"
 #ifdef UNIV_HOTBACKUP
-#include "trx0sys.h"
+
 #endif /* UNIV_HOTBACKUP */
 
+#include <innodb/trx_types/purge_pq_t.h>
+
 struct trx_purge_t;
 struct trx_undo_ptr_t;
 
+
 /** The global data structure coordinating a purge */
 extern trx_purge_t *purge_sys;
 

storage/innobase/include/trx0roll.h

@@ -39,7 +39,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/trx_types/trx_savept_t.h>
 #include <innodb/trx_trx/trx_named_savept_t.h>
 
-#include "trx0sys.h"
+
 
 #ifdef UNIV_HOTBACKUP
 #include "que0que.h"

storage/innobase/include/trx0rseg.h

@@ -35,12 +35,15 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/univ/univ.h>
 
+#include <innodb/tablespace/Space_Ids.h>
+#include <innodb/trx_types/trx_rseg_t.h>
 #include <innodb/trx_types/trx_rsegf_t.h>
 #include <innodb/trx_types/trx_rsegsf_t.h>
+#include <innodb/trx_types/purge_pq_t.h>
 
 #include <vector>
 #include "fut0lst.h"
-#include "trx0sys.h"
+
 
 /** Gets a rollback segment header.
 @param[in]	space		space where placed

storage/innobase/include/trx0rseg.ic

@@ -31,11 +31,12 @@ this program; if not, write to the Free Software Foundation, Inc.,
  *******************************************************/
 
 #include <innodb/tablespace/srv_tmp_space.h>
+#include <innodb/trx_sys/trx_sys.h>
 
 #include "mtr0log.h"
 #include "srv0srv.h"
 #include "trx0purge.h"
-#include "trx0sys.h"
+
 
 /** Gets a rollback segment header.
 @param[in]	space		space where placed

storage/innobase/include/trx0undo.h

@@ -38,9 +38,11 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/trx_types/trx_undo_rec_t.h>
 
 #include "sql/xa.h"
-#include "trx0sys.h"
+
 #include "trx0xa.h"
 
+struct trx_rseg_t;
+struct trx_undo_t;
 struct trx_undo_ptr_t;
 
 #ifndef UNIV_HOTBACKUP

storage/innobase/lob/lob0impl.cc

@@ -37,7 +37,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0util.h"
 #include "lob0zip.h"
 #include "my_dbug.h"
-#include "trx0sys.h"
+
 #include "zlob0first.h"
 #include "zlob0index.h"
 #include "zlob0read.h"

storage/innobase/lock/lock0lock.cc

@@ -32,6 +32,11 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #define LOCK_MODULE_IMPLEMENTATION
 
+#include <innodb/trx_sys/trx_rw_min_trx_id.h>
+#include <innodb/trx_sys/trx_rw_is_active.h>
+#include <innodb/trx_sys/trx_rw_min_trx_id.h>
+#include <innodb/trx_sys/trx_sys_get_max_trx_id.h>
+#include <innodb/trx_sys/trx_sys.h>
 #include <innodb/trx_trx/trx_reference.h>
 #include <innodb/trx_trx/assert_trx_in_rw_list.h>
 #include <innodb/trx_trx/check_trx_state.h>
@@ -100,7 +105,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0sel.h"
 #include "srv0mon.h"
 #include "trx0purge.h"
-#include "trx0sys.h"
+
 #include "usr0sess.h"
 #include "ut0ut.h"
 #include <innodb/vector/vector.h>

storage/innobase/lock/lock0prdt.cc

@@ -47,7 +47,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lock0priv.h"
 #include "srv0mon.h"
 #include "trx0purge.h"
-#include "trx0sys.h"
+
 #include "usr0sess.h"
 #include <innodb/vector/vector.h>
 

storage/innobase/log/log0chkp.cc

@@ -85,7 +85,7 @@ the file COPYING.Google.
 #include "srv0start.h"
 
 #include "trx0roll.h"
-#include "trx0sys.h"
+
 #include <innodb/enum/to_int.h>
 
 

storage/innobase/log/log0log.cc

@@ -69,7 +69,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "dict0boot.h"
 #include "ha_prototypes.h"
 #include <innodb/thread/os_thread_create.h>
-#include "trx0sys.h"
+
 
 
 

storage/innobase/log/log0write.cc

@@ -116,7 +116,7 @@ the file COPYING.Google.
 #include "srv0start.h"
 
 #include "trx0roll.h"
-#include "trx0sys.h"
+
 
 
 

storage/innobase/page/page0page.cc

@@ -35,6 +35,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "my_dbug.h"
 
+#include <innodb/trx_sys/trx_sys_get_max_trx_id.h>
 #include <innodb/page/page_dir_get_n_heap.h>
 #include <innodb/page/page_zip_compress.h>
 #include <innodb/page/page_zip_decompress.h>

storage/innobase/row/row0ins.cc

@@ -30,6 +30,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 4/20/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_sys/trx_sys_mutex_enter.h>
+#include <innodb/trx_sys/trx_sys_mutex_exit.h>
 #include <innodb/trx_trx/trx_kill_blocking.h>
 #include <innodb/trx_trx/trx_isolation_level.h>
 #include <innodb/io/srv_read_only_mode.h>

storage/innobase/row/row0vers.cc

@@ -30,6 +30,11 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 2/6/1997 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_sys/trx_get_rw_trx_by_id.h>
+#include <innodb/trx_sys/trx_sys_mutex_enter.h>
+#include <innodb/trx_sys/trx_sys_mutex_exit.h>
+#include <innodb/trx_sys/trx_sys_get_max_trx_id.h>
+#include <innodb/trx_sys/trx_rw_is_active.h>
 #include <innodb/trx_trx/trx_state_eq.h>
 #include <innodb/trx_trx/trx_release_reference.h>
 #include <innodb/cmp/cmp_dfield_dfield.h>

storage/innobase/srv/srv0mon.cc

@@ -53,7 +53,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0srv.h"
 #include "trx0purge.h"
 #include "trx0rseg.h"
-#include "trx0sys.h"
+
 
 /* Macro to standardize the counter names for counters in the
 "monitor_buf_page" module as they have very structured defines */