List:Commits« Previous MessageNext Message »
From:jonas Date:January 31 2006 5:47am
Subject:bk commit into 5.1 tree (jonas:1.2067)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2067 06/01/31 06:46:58 jonas@eel.(none) +55 -0
  wl1497 - ndb mem - patch 1/3 -
    Change block construcor

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
    1.19 06/01/31 06:46:51 jonas@eel.(none) +10 -8
    wl1497 

  storage/ndb/src/kernel/vm/SimulatedBlock.cpp
    1.28 06/01/31 06:46:51 jonas@eel.(none) +5 -5
    wl1497 

  storage/ndb/src/kernel/vm/SimBlockList.hpp
    1.4 06/01/31 06:46:51 jonas@eel.(none) +1 -1
    wl1497 

  storage/ndb/src/kernel/blocks/tsman.hpp
    1.3 06/01/31 06:46:51 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.3 06/01/31 06:46:51 jonas@eel.(none) +6 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/trix/Trix.hpp
    1.7 06/01/31 06:46:51 jonas@eel.(none) +3 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/trix/Trix.cpp
    1.12 06/01/31 06:46:51 jonas@eel.(none) +4 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
    1.12 06/01/31 06:46:51 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/suma/Suma.hpp
    1.11 06/01/31 06:46:51 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.34 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/restore.hpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/restore.cpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.26 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.8 06/01/31 06:46:50 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.10 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/pgman.hpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
    1.6 06/01/31 06:46:50 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
    1.7 06/01/31 06:46:50 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
    1.23 06/01/31 06:46:50 jonas@eel.(none) +5 -5
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.29 06/01/31 06:46:50 jonas@eel.(none) +7 -7
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.10 06/01/31 06:46:50 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
    1.7 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/lgman.hpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.4 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
    1.6 06/01/31 06:46:50 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
    1.16 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
    1.22 06/01/31 06:46:50 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
    1.45 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.23 06/01/31 06:46:50 jonas@eel.(none) +10 -10
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
    1.17 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
    1.24 06/01/31 06:46:50 jonas@eel.(none) +4 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
    1.12 06/01/31 06:46:50 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.35 06/01/31 06:46:50 jonas@eel.(none) +15 -16
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.102 06/01/31 06:46:49 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.14 06/01/31 06:46:49 jonas@eel.(none) +5 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.36 06/01/31 06:46:49 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.88 06/01/31 06:46:49 jonas@eel.(none) +15 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
    1.20 06/01/31 06:46:49 jonas@eel.(none) +2 -19
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.44 06/01/31 06:46:49 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.48 06/01/31 06:46:49 jonas@eel.(none) +3 -3
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
    1.12 06/01/31 06:46:49 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.13 06/01/31 06:46:49 jonas@eel.(none) +3 -4
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.27 06/01/31 06:46:49 jonas@eel.(none) +1 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.70 06/01/31 06:46:49 jonas@eel.(none) +5 -7
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.64 06/01/31 06:46:49 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
    1.20 06/01/31 06:46:49 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.27 06/01/31 06:46:49 jonas@eel.(none) +1 -1
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
    1.5 06/01/31 06:46:49 jonas@eel.(none) +3 -5
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.26 06/01/31 06:46:49 jonas@eel.(none) +13 -13
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.17 06/01/31 06:46:49 jonas@eel.(none) +6 -6
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/blocks/backup/Backup.hpp
    1.16 06/01/31 06:46:49 jonas@eel.(none) +2 -2
    Change arg to SimBlock constructor for more flexibilty

  storage/ndb/src/kernel/SimBlockList.cpp
    1.12 06/01/31 06:46:49 jonas@eel.(none) +24 -21
    Change arg to SimBlock constructor for more flexibilty

  BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179
    1.3 06/01/24 20:05:55 jonas@eel.(none) +3 -3
    Delete: storage/ndb/src/kernel/vm/ArrayList.hpp

  BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2
    1.3 06/01/24 20:05:55 jonas@eel.(none) +0 -0
    Delete: storage/ndb/src/kernel/vm/ArrayFifoList.hpp

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/51-ndb

--- 1.3/storage/ndb/src/kernel/blocks/lgman.cpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/lgman.cpp	2006-01-31 06:46:50 +01:00
@@ -50,8 +50,8 @@
 #define DEBUG_UNDO_EXECUTION 0
 #define DEBUG_SEARCH_LOG_HEAD 0
 
-Lgman::Lgman(const Configuration & conf) :
-  SimulatedBlock(LGMAN, conf),
+Lgman::Lgman(Block_context & ctx) :
+  SimulatedBlock(LGMAN, ctx),
   m_logfile_group_list(m_logfile_group_pool),
   m_logfile_group_hash(m_logfile_group_pool)
 {
@@ -115,7 +115,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();

--- 1.3/storage/ndb/src/kernel/blocks/lgman.hpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/lgman.hpp	2006-01-31 06:46:50 +01:00
@@ -31,7 +31,7 @@
 class Lgman : public SimulatedBlock
 {
 public:
-  Lgman(const Configuration & conf);
+  Lgman(Block_context& ctx);
   virtual ~Lgman();
   BLOCK_DEFINES(Lgman);
   

--- 1.3/storage/ndb/src/kernel/blocks/pgman.cpp	2006-01-15 20:45:04 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/pgman.cpp	2006-01-31 06:46:50 +01:00
@@ -40,8 +40,8 @@
 #define dbg(x)
 #endif
 
-Pgman::Pgman(const Configuration & conf) :
-  SimulatedBlock(PGMAN, conf),
+Pgman::Pgman(Block_context& ctx) :
+  SimulatedBlock(PGMAN, ctx),
   m_file_map(m_data_buffer_pool),
   m_page_hashlist(m_page_entry_pool),
   m_page_stack(m_page_entry_pool),
@@ -110,7 +110,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   Uint64 page_buffer = 64*1024*1024;

--- 1.3/storage/ndb/src/kernel/blocks/pgman.hpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/pgman.hpp	2006-01-31 06:46:50 +01:00
@@ -236,7 +236,7 @@
 class Pgman : public SimulatedBlock
 {
 public:
-  Pgman(const Configuration & conf);
+  Pgman(Block_context& ctx);
   virtual ~Pgman();
   BLOCK_DEFINES(Pgman);
 

--- 1.3/storage/ndb/src/kernel/blocks/restore.cpp	2006-01-15 20:45:04 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/restore.cpp	2006-01-31 06:46:50 +01:00
@@ -33,8 +33,8 @@
 
 #define PAGES LCP_RESTORE_BUFFER
 
-Restore::Restore(const Configuration & conf) :
-  SimulatedBlock(RESTORE, conf),
+Restore::Restore(Block_context& ctx) :
+  SimulatedBlock(RESTORE, ctx),
   m_file_list(m_file_pool),
   m_file_hash(m_file_pool)
 {
@@ -89,7 +89,7 @@
   ndbrequire(req->noOfParameters == 0);
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
 #if 0

--- 1.3/storage/ndb/src/kernel/blocks/restore.hpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/restore.hpp	2006-01-31 06:46:50 +01:00
@@ -30,7 +30,7 @@
 class Restore : public SimulatedBlock
 {
 public:
-  Restore(const Configuration & conf);
+  Restore(Block_context& ctx);
   virtual ~Restore();
   BLOCK_DEFINES(Restore);
   

--- 1.2/storage/ndb/src/kernel/blocks/tsman.cpp	2006-01-11 09:26:03 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/tsman.cpp	2006-01-31 06:46:51 +01:00
@@ -31,8 +31,9 @@
 #include <dbtup/Dbtup.hpp>
 
 
-Tsman::Tsman(const Configuration & conf, class Pgman* pg, class Lgman* lg) :
-  SimulatedBlock(TSMAN, conf),
+Tsman::Tsman(Block_context& ctx,
+	     class Pgman* pg, class Lgman* lg) :
+  SimulatedBlock(TSMAN, ctx),
   m_file_hash(m_file_pool),
   m_tablespace_list(m_tablespace_pool),
   m_tablespace_hash(m_tablespace_pool),
@@ -94,7 +95,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
@@ -411,7 +412,8 @@
 
 bool 
 Tsman::find_file_by_id(Ptr<Datafile>& ptr, 
-		       DLList<Datafile>::Head& head, Uint32 id)
+		       DLList<Datafile>::Head& head, 
+		       Uint32 id)
 {
   LocalDLList<Datafile> list(m_file_pool, head);
   for(list.first(ptr); !ptr.isNull(); list.next(ptr))

--- 1.2/storage/ndb/src/kernel/blocks/tsman.hpp	2006-01-11 09:26:03 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/tsman.hpp	2006-01-31 06:46:51 +01:00
@@ -30,7 +30,7 @@
 class Tsman : public SimulatedBlock
 {
 public:
-  Tsman(const Configuration & conf, class Pgman*, class Lgman*);
+  Tsman(Block_context&, Pgman*, Lgman*);
   virtual ~Tsman();
   BLOCK_DEFINES(Tsman);
   

--- 1.15/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2006-01-20 05:41:55 +01:00
+++ 1.16/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2006-01-31 06:46:49 +01:00
@@ -27,12 +27,12 @@
 #include <SimpleProperties.hpp>
 
 #include <SLList.hpp>
-#include <ArrayList.hpp>
 #include <DLFifoList.hpp>
 #include <SignalCounter.hpp>
 #include <blocks/mutexes.hpp>
 
 #include <NdbTCP.h>
+#include <Array.hpp>
 
 /**
  * Backup - This block manages database backup and restore
@@ -40,7 +40,7 @@
 class Backup : public SimulatedBlock
 {
 public:
-  Backup(const Configuration & conf);
+  Backup(Block_context& ctx);
   virtual ~Backup();
   BLOCK_DEFINES(Backup);
   

--- 1.16/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2006-01-20 05:41:56 +01:00
+++ 1.17/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2006-01-31 06:46:49 +01:00
@@ -27,8 +27,8 @@
 
 //extern const unsigned Ndbcntr::g_sysTableCount;
 
-Backup::Backup(const Configuration & conf) :
-  SimulatedBlock(BACKUP, conf),
+Backup::Backup(Block_context& ctx) :
+  SimulatedBlock(BACKUP, ctx),
   c_nodes(c_nodePool),
   c_backups(c_backupPool)
 {
@@ -140,7 +140,7 @@
   ndbrequire(req->noOfParameters == 0);
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   Uint32 noBackups = 0, noTables = 0, noAttribs = 0;
@@ -185,7 +185,7 @@
   c_pagePool.setSize(noPages + NO_OF_PAGES_META_FILE + 2); 
   
   { // Init all tables
-    ArrayList<Table> tables(c_tablePool);
+    SLList<Table> tables(c_tablePool);
     TablePtr ptr;
     while(tables.seize(ptr)){
       new (ptr.p) Table(c_attributePool, c_fragmentPool);
@@ -194,7 +194,7 @@
   }
 
   {
-    ArrayList<BackupFile> ops(c_backupFilePool);
+    SLList<BackupFile> ops(c_backupFilePool);
     BackupFilePtr ptr;
     while(ops.seize(ptr)){
       new (ptr.p) BackupFile(* this, c_pagePool);
@@ -203,7 +203,7 @@
   }
   
   {
-    ArrayList<BackupRecord> recs(c_backupPool);
+    SLList<BackupRecord> recs(c_backupPool);
     BackupRecordPtr ptr;
     while(recs.seize(ptr)){
       new (ptr.p) BackupRecord(* this, c_pagePool, c_tablePool, 

--- 1.25/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-01-15 20:45:04 +01:00
+++ 1.26/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-01-31 06:46:49 +01:00
@@ -47,15 +47,15 @@
 EventLogger g_eventLogger;
 extern int simulate_error_during_shutdown;
 
-Cmvmi::Cmvmi(const Configuration & conf) :
-  SimulatedBlock(CMVMI, conf)
-  ,theConfig((Configuration&)conf)
+Cmvmi::Cmvmi(Block_context& ctx) :
+  SimulatedBlock(CMVMI, ctx)
   ,subscribers(subscriberPool)
 {
   BLOCK_CONSTRUCTOR(Cmvmi);
 
   Uint32 long_sig_buffer_size;
-  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
+  const ndb_mgm_configuration_iterator * p = 
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ndb_mgm_get_int_parameter(p, CFG_DB_LONG_SIGNAL_BUFFER,  
@@ -94,7 +94,7 @@
   
   subscriberPool.setSize(5);
   
-  const ndb_mgm_configuration_iterator * db = theConfig.getOwnConfigIterator();
+  const ndb_mgm_configuration_iterator * db = m_ctx.m_config.getOwnConfigIterator();
   for(unsigned j = 0; j<LogLevel::LOGLEVEL_CATEGORIES; j++){
     Uint32 logLevel;
     if(!ndb_mgm_get_int_parameter(db, CFG_MIN_LOGLEVEL+j, &logLevel)){
@@ -103,7 +103,7 @@
     }
   }
   
-  ndb_mgm_configuration_iterator * iter = theConfig.getClusterConfigIterator();
+  ndb_mgm_configuration_iterator * iter = m_ctx.m_config.getClusterConfigIterator();
   for(ndb_mgm_first(iter); ndb_mgm_valid(iter); ndb_mgm_next(iter)){
     jam();
     Uint32 nodeId;
@@ -318,7 +318,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   Uint64 page_buffer = 64*1024*1024;
@@ -365,7 +365,7 @@
   } else {
     jam();
 
-    if(theConfig.lockPagesInMainMemory()){
+    if(m_ctx.m_config.lockPagesInMainMemory()){
       int res = NdbMem_MemLockAll();
       if(res != 0){
 	g_eventLogger.warning("Failed to memlock pages");
@@ -938,7 +938,7 @@
 
   switch (var) {
   case MaxNoOfSavedMessages:
-    theConfig.maxNoOfErrorLogs(val);
+    m_ctx.m_config.maxNoOfErrorLogs(val);
     sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
     break;
     
@@ -959,12 +959,12 @@
     break;
 
   case TimeBetweenWatchDogCheck:
-    theConfig.timeBetweenWatchDogCheck(val);
+    m_ctx.m_config.timeBetweenWatchDogCheck(val);
     sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
     break;
 
   case StopOnError:
-    theConfig.stopOnError(val);
+    m_ctx.m_config.stopOnError(val);
     sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);
     break;
     
@@ -1086,9 +1086,9 @@
   
   if (dumpState->args[0] == DumpStateOrd::CmvmiSetRestartOnErrorInsert){
     if(signal->getLength() == 1)
-      theConfig.setRestartOnErrorInsert((int)NRT_NoStart_Restart);
+      m_ctx.m_config.setRestartOnErrorInsert((int)NRT_NoStart_Restart);
     else
-      theConfig.setRestartOnErrorInsert(signal->theData[1]);
+      m_ctx.m_config.setRestartOnErrorInsert(signal->theData[1]);
   }
 
   if (dumpState->args[0] == DumpStateOrd::CmvmiTestLongSigWithDelay) {

--- 1.4/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp	2005-10-07 01:06:18 +02:00
+++ 1.5/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp	2006-01-31 06:46:49 +01:00
@@ -21,14 +21,14 @@
 #include <SimulatedBlock.hpp>
 #include <LogLevel.hpp>
 
-#include <ArrayList.hpp>
+#include <DLList.hpp>
 
 /**
  * Cmvmi class
  */
 class Cmvmi : public SimulatedBlock {
 public:
-  Cmvmi(const Configuration & conf);
+  Cmvmi(Block_context&);
   virtual ~Cmvmi();
   
 private:
@@ -79,8 +79,6 @@
   LogLevel clogLevel;
   NdbNodeBitmask c_dbNodes;
 
-  class Configuration & theConfig;
-
   /**
    * This struct defines the data needed for a EVENT_REP subscriber
    */
@@ -112,7 +110,7 @@
   /**
    * List of current subscribers
    */
-  ArrayList<EventRepSubscriber> subscribers;
+  DLList<EventRepSubscriber> subscribers;
 
 private:
   // Declared but not defined

--- 1.26/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp	2006-01-11 09:26:03 +01:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp	2006-01-31 06:46:49 +01:00
@@ -606,7 +606,7 @@
   typedef Ptr<Tabrec> TabrecPtr;
 
 public:
-  Dbacc(const class Configuration &);
+  Dbacc(Block_context&);
   virtual ~Dbacc();
 
   // pointer to TUP instance in this thread

--- 1.19/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp	2005-11-07 12:19:06 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp	2006-01-31 06:46:49 +01:00
@@ -82,8 +82,8 @@
 				ctablesize);
 }//Dbacc::initRecords()
 
-Dbacc::Dbacc(const class Configuration & conf):
-  SimulatedBlock(DBACC, conf),
+Dbacc::Dbacc(Block_context& ctx):
+  SimulatedBlock(DBACC, ctx),
   c_tup(0)
 {
   BLOCK_CONSTRUCTOR(Dbacc);

--- 1.63/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-01-11 09:26:03 +01:00
+++ 1.64/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-01-31 06:46:49 +01:00
@@ -325,7 +325,7 @@
   jamEntry();
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_ACC_DIR_RANGE, &cdirrangesize));

--- 1.69/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-23 09:57:01 +01:00
+++ 1.70/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-31 06:46:49 +01:00
@@ -1462,8 +1462,8 @@
 /* ---------------------------------------------------------------- */
 /* **************************************************************** */
 
-Dbdict::Dbdict(const class Configuration & conf):
-  SimulatedBlock(DBDICT, conf),
+Dbdict::Dbdict(Block_context& ctx):
+  SimulatedBlock(DBDICT, ctx),
   c_attributeRecordHash(c_attributeRecordPool),
   c_file_hash(c_file_pool),
   c_filegroup_hash(c_filegroup_pool),
@@ -1490,10 +1490,6 @@
 {
   BLOCK_CONSTRUCTOR(Dbdict);
   
-  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
-  ndbrequire(p != 0);
-
-  ndb_mgm_get_int_parameter(p, CFG_DB_NO_TRIGGERS, &c_maxNoOfTriggers);
   // Transit signals
   addRecSignal(GSN_DUMP_STATE_ORD, &Dbdict::execDUMP_STATE_ORD);
   addRecSignal(GSN_GET_TABINFOREQ, &Dbdict::execGET_TABINFOREQ);
@@ -2005,10 +2001,12 @@
   jamEntry();
  
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   Uint32 attributesize, tablerecSize;
+  ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_TRIGGERS, 
+					&c_maxNoOfTriggers));
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_ATTRIBUTE,&attributesize));
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE, &tablerecSize));
 

--- 1.26/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-01-17 09:24:53 +01:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-01-31 06:46:49 +01:00
@@ -23,7 +23,6 @@
 #include <ndb_limits.h>
 #include <trigger_definitions.h>
 #include <pc.hpp>
-#include <ArrayList.hpp>
 #include <DLHashTable.hpp>
 #include <DLFifoList.hpp>
 #include <CArray.hpp>
@@ -646,7 +645,7 @@
   void decrease_ref_count(Uint32 obj_ptr_i);
 
 public:
-  Dbdict(const class Configuration &);
+  Dbdict(Block_context& ctx);
   virtual ~Dbdict();
 
 private:

--- 1.12/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2006-01-12 19:50:33 +01:00
+++ 1.13/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2006-01-31 06:46:49 +01:00
@@ -21,7 +21,6 @@
 #include <pc.hpp>
 #include <SimulatedBlock.hpp>
 #include "Sysfile.hpp"
-#include <ArrayList.hpp>
 #include <SignalCounter.hpp>
 
 #include <signaldata/MasterLCP.hpp>
@@ -570,7 +569,7 @@
   typedef Ptr<TakeOverRecord> TakeOverRecordPtr;
   
 public:
-  Dbdih(const class Configuration &);
+  Dbdih(Block_context& ctx);
   virtual ~Dbdih();
 
   struct RWFragment {
@@ -1553,13 +1552,13 @@
    * Pool/list of WaitGCPProxyRecord record
    */
   ArrayPool<WaitGCPProxyRecord> waitGCPProxyPool;
-  ArrayList<WaitGCPProxyRecord> c_waitGCPProxyList;
+  DLList<WaitGCPProxyRecord> c_waitGCPProxyList;
 
   /**
    * Pool/list of WaitGCPMasterRecord record
    */
   ArrayPool<WaitGCPMasterRecord> waitGCPMasterPool;
-  ArrayList<WaitGCPMasterRecord> c_waitGCPMasterList;
+  DLList<WaitGCPMasterRecord> c_waitGCPMasterList;
 
   void checkWaitGCPProxy(Signal*, NodeId failedNodeId);
   void checkWaitGCPMaster(Signal*, NodeId failedNodeId);

--- 1.11/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2005-11-07 12:19:06 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2006-01-31 06:46:49 +01:00
@@ -111,8 +111,8 @@
   bat[21].bits.v = 5;
 }//Dbdih::initRecords()
 
-Dbdih::Dbdih(const class Configuration & config):
-  SimulatedBlock(DBDIH, config),
+Dbdih::Dbdih(Block_context& ctx):
+  SimulatedBlock(DBDIH, ctx),
   c_waitGCPProxyList(waitGCPProxyPool),
   c_waitGCPMasterList(waitGCPMasterPool)
 {

--- 1.47/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-01-17 09:24:53 +01:00
+++ 1.48/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-01-31 06:46:49 +01:00
@@ -1061,7 +1061,7 @@
   jamEntry();
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequireErr(p != 0, NDBD_EXIT_INVALID_CONFIG);
 
   initData();
@@ -1147,7 +1147,7 @@
 {
   jamEntry();
   cntrlblockref = signal->theData[0];
-  if(theConfiguration.getInitialStart()){
+  if(m_ctx.m_config.getInitialStart()){
     sendSignal(cntrlblockref, GSN_DIH_RESTARTREF, signal, 1, JBB);
   } else {
     readGciFileLab(signal);
@@ -11377,7 +11377,7 @@
   memset(&sysfileData[0], 0, sizeof(sysfileData));
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   c_lcpState.clcpDelay = 20;

--- 1.43/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2006-01-11 09:26:03 +01:00
+++ 1.44/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2006-01-31 06:46:49 +01:00
@@ -2069,7 +2069,7 @@
   };
   
 public:
-  Dblqh(const class Configuration &);
+  Dblqh(Block_context& ctx);
   virtual ~Dblqh();
 
   void receive_keyinfo(Signal*, Uint32 * data, Uint32 len);

--- 1.19/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2006-01-11 09:26:03 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2006-01-31 06:46:49 +01:00
@@ -158,8 +158,8 @@
   bat[1].bits.v = 5;
 }//Dblqh::initRecords()
 
-Dblqh::Dblqh(const class Configuration & conf):
-  SimulatedBlock(DBLQH, conf),
+Dblqh::Dblqh(Block_context& ctx):
+  SimulatedBlock(DBLQH, ctx),
   c_lcp_waiting_fragments(c_fragment_pool),
   c_lcp_restoring_fragments(c_fragment_pool),
   c_lcp_complete_fragments(c_fragment_pool),
@@ -167,24 +167,7 @@
   m_commitAckMarkerHash(m_commitAckMarkerPool),
   c_scanTakeOverHash(c_scanRecordPool)
 {
-  Uint32 log_page_size= 0;
   BLOCK_CONSTRUCTOR(Dblqh);
-
-  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
-  ndbrequire(p != 0);
-
-  ndb_mgm_get_int_parameter(p, CFG_DB_REDO_BUFFER,  
-			    &log_page_size);
-
-  /**
-   * Always set page size in half MBytes
-   */
-  clogPageFileSize= (log_page_size / sizeof(LogPageRecord));
-  Uint32 mega_byte_part= clogPageFileSize & 15;
-  if (mega_byte_part != 0) {
-    jam();
-    clogPageFileSize+= (16 - mega_byte_part);
-  }
 
   addRecSignal(GSN_PACKED_SIGNAL, &Dblqh::execPACKED_SIGNAL);
   addRecSignal(GSN_DEBUG_SIG, &Dblqh::execDEBUG_SIG);

--- 1.87/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-17 08:37:32 +01:00
+++ 1.88/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-31 06:46:49 +01:00
@@ -882,13 +882,27 @@
   jamEntry();
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   cnoLogFiles = 8;
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_REDOLOG_FILES, 
 					&cnoLogFiles));
   ndbrequire(cnoLogFiles > 0);
+
+  Uint32 log_page_size= 0;
+  ndb_mgm_get_int_parameter(p, CFG_DB_REDO_BUFFER,  
+			    &log_page_size);
+
+  /**
+   * Always set page size in half MBytes
+   */
+  clogPageFileSize= (log_page_size / sizeof(LogPageRecord));
+  Uint32 mega_byte_part= clogPageFileSize & 15;
+  if (mega_byte_part != 0) {
+    jam();
+    clogPageFileSize+= (16 - mega_byte_part);
+  }
 
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize));
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT, 

--- 1.35/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2006-01-11 09:26:03 +01:00
+++ 1.36/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2006-01-31 06:46:49 +01:00
@@ -541,7 +541,7 @@
   /**
    * The list of defined indexes
    */  
-  ArrayList<TcIndexData> c_theIndexes;
+  DLList<TcIndexData> c_theIndexes;
   UintR c_maxNumberOfIndexes;
 
   struct TcIndexOperation {
@@ -746,7 +746,7 @@
     UintR accumulatingIndexOp;
     UintR executingIndexOp;
     UintR tcIndxSendArray[6];
-    ArrayList<TcIndexOperation> theSeizedIndexOperations;
+    DLList<TcIndexOperation> theSeizedIndexOperations;
   };
   
   typedef Ptr<ApiConnectRecord> ApiConnectRecordPtr;
@@ -1262,7 +1262,7 @@
   typedef Ptr<TcFailRecord> TcFailRecordPtr;
 
 public:
-  Dbtc(const class Configuration &);
+  Dbtc(Block_context&);
   virtual ~Dbtc();
 
 private:

--- 1.13/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2005-11-07 12:19:07 +01:00
+++ 1.14/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2006-01-31 06:46:49 +01:00
@@ -94,7 +94,7 @@
   */
 
   // Init all index operation records
-  ArrayList<TcIndexOperation> indexOps(c_theIndexOperationPool);
+  SLList<TcIndexOperation> indexOps(c_theIndexOperationPool);
   TcIndexOperationPtr ioptr;
   while(indexOps.seize(ioptr) == true) {
     p= ioptr.p;
@@ -156,8 +156,8 @@
   
 }//Dbtc::initRecords()
 
-Dbtc::Dbtc(const class Configuration & conf):
-  SimulatedBlock(DBTC, conf),
+Dbtc::Dbtc(Block_context& ctx):
+  SimulatedBlock(DBTC, ctx),
   c_theDefinedTriggers(c_theDefinedTriggerPool),
   c_firedTriggerHash(c_theFiredTriggerPool),
   c_maxNumberOfDefinedTriggers(0),
@@ -169,7 +169,8 @@
 {
   BLOCK_CONSTRUCTOR(Dbtc);
   
-  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
+  const ndb_mgm_configuration_iterator * p = 
+    ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   Uint32 transactionBufferMemory = 0;

--- 1.101/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-01-12 19:50:33 +01:00
+++ 1.102/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-01-31 06:46:49 +01:00
@@ -606,7 +606,7 @@
   jamEntry();
   
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   initData();

--- 1.34/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2006-01-20 05:41:56 +01:00
+++ 1.35/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2006-01-31 06:46:50 +01:00
@@ -21,7 +21,6 @@
 #include <SimulatedBlock.hpp>
 #include <ndb_limits.h>
 #include <trigger_definitions.h>
-#include <ArrayList.hpp>
 #include <AttributeHeader.hpp>
 #include <Bitmask.hpp>
 #include <signaldata/TupKey.hpp>
@@ -945,16 +944,16 @@
     } m_attributes[2];
     
     // Lists of trigger data for active triggers
-    ArrayList<TupTriggerData> afterInsertTriggers;
-    ArrayList<TupTriggerData> afterDeleteTriggers;
-    ArrayList<TupTriggerData> afterUpdateTriggers;
-    ArrayList<TupTriggerData> subscriptionInsertTriggers;
-    ArrayList<TupTriggerData> subscriptionDeleteTriggers;
-    ArrayList<TupTriggerData> subscriptionUpdateTriggers;
-    ArrayList<TupTriggerData> constraintUpdateTriggers;
+    DLList<TupTriggerData> afterInsertTriggers;
+    DLList<TupTriggerData> afterDeleteTriggers;
+    DLList<TupTriggerData> afterUpdateTriggers;
+    DLList<TupTriggerData> subscriptionInsertTriggers;
+    DLList<TupTriggerData> subscriptionDeleteTriggers;
+    DLList<TupTriggerData> subscriptionUpdateTriggers;
+    DLList<TupTriggerData> constraintUpdateTriggers;
     
     // List of ordered indexes
-    ArrayList<TupTriggerData> tuxCustomTriggers;
+    DLList<TupTriggerData> tuxCustomTriggers;
     
     Uint32 fragid[MAX_FRAG_PER_NODE];
     Uint32 fragrec[MAX_FRAG_PER_NODE];
@@ -1156,7 +1155,7 @@
   };
   typedef Ptr<BuildIndexRec> BuildIndexPtr;
   ArrayPool<BuildIndexRec> c_buildIndexPool;
-  ArrayList<BuildIndexRec> c_buildIndexList;
+  DLList<BuildIndexRec> c_buildIndexList;
   Uint32 c_noOfBuildIndexRec;
 
   /**
@@ -1343,7 +1342,7 @@
   Uint32          terrorCode;
 
 public:
-  Dbtup(const class Configuration &, Pgman*);
+  Dbtup(Block_context&, Pgman*);
   virtual ~Dbtup();
 
   /*
@@ -2008,7 +2007,7 @@
 //------------------------------------------------------------------
 // Trigger handling routines
 //------------------------------------------------------------------
-  ArrayList<TupTriggerData>*
+  DLList<TupTriggerData>*
   findTriggerList(Tablerec* table,
                   TriggerType::Value ttype,
                   TriggerActionTime::Value ttime,
@@ -2045,19 +2044,19 @@
                              Tablerec* regTablePtr);
 
   void fireImmediateTriggers(KeyReqStruct *req_struct,
-                             ArrayList<TupTriggerData>& triggerList, 
+                             DLList<TupTriggerData>& triggerList, 
                              Operationrec* regOperPtr);
 
   void fireDeferredTriggers(KeyReqStruct *req_struct,
-                            ArrayList<TupTriggerData>& triggerList,
+                            DLList<TupTriggerData>& triggerList,
                             Operationrec* regOperPtr);
 
   void fireDetachedTriggers(KeyReqStruct *req_struct,
-                            ArrayList<TupTriggerData>& triggerList,
+                            DLList<TupTriggerData>& triggerList,
                             Operationrec* regOperPtr);
 
   void executeTriggers(KeyReqStruct *req_struct,
-                       ArrayList<TupTriggerData>& triggerList,
+                       DLList<TupTriggerData>& triggerList,
                        Operationrec* regOperPtr);
 
   void executeTrigger(KeyReqStruct *req_struct,

--- 1.11/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp	2006-01-11 09:26:03 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp	2006-01-31 06:46:50 +01:00
@@ -158,7 +158,7 @@
     return;
   }//if
 #endif
-#ifdef VM_TRACE
+#if defined VM_TRACE && 0
   if (type == 1211){
     ndbout_c("Startar modul test av Page Manager");
 

--- 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-01-11 09:26:03 +01:00
+++ 1.24/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-01-31 06:46:50 +01:00
@@ -51,8 +51,8 @@
   init_list_sizes();
 }//Dbtup::initData()
 
-Dbtup::Dbtup(const class Configuration & conf, Pgman* pgman)
-  : SimulatedBlock(DBTUP, conf),
+Dbtup::Dbtup(Block_context& ctx, Pgman* pgman)
+  : SimulatedBlock(DBTUP, ctx),
     c_lqh(0),
     m_pgman(this, pgman),
     c_extent_hash(c_extent_pool),
@@ -280,7 +280,7 @@
   ljamEntry();
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_FRAG, &cnoOfFragrec));
@@ -335,7 +335,7 @@
   unsigned i;
   Uint32 tmp;
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_PAGE, &tmp));

--- 1.16/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2006-01-11 09:26:03 +01:00
+++ 1.17/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2006-01-31 06:46:50 +01:00
@@ -420,7 +420,7 @@
       tablePtr.p->m_attributes[MM].m_no_of_varsize > 0;
     if (DictTabInfo::isOrderedIndex(buildReq->getIndexType())) {
       ljam();
-      const ArrayList<TupTriggerData>& triggerList = 
+      const DLList<TupTriggerData>& triggerList = 
 	tablePtr.p->tuxCustomTriggers;
 
       TriggerPtr triggerPtr;

--- 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-20 05:41:56 +01:00
+++ 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-31 06:46:50 +01:00
@@ -36,13 +36,13 @@
 /* ---------------------------------------------------------------- */
 /* **************************************************************** */
 
-ArrayList<Dbtup::TupTriggerData>*
+DLList<Dbtup::TupTriggerData>*
 Dbtup::findTriggerList(Tablerec* table,
                        TriggerType::Value ttype,
                        TriggerActionTime::Value ttime,
                        TriggerEvent::Value tevent)
 {
-  ArrayList<TupTriggerData>* tlist = NULL;
+  DLList<TupTriggerData>* tlist = NULL;
   switch (ttype) {
   case TriggerType::SUBSCRIPTION:
   case TriggerType::SUBSCRIPTION_BEFORE:
@@ -239,7 +239,7 @@
   TriggerActionTime::Value ttime = req->getTriggerActionTime();
   TriggerEvent::Value tevent = req->getTriggerEvent();
 
-  ArrayList<TupTriggerData>* tlist = findTriggerList(table, ttype, ttime, tevent);
+  DLList<TupTriggerData>* tlist = findTriggerList(table, ttype, ttime, tevent);
   ndbrequire(tlist != NULL);
 
   TriggerPtr tptr;
@@ -332,7 +332,7 @@
 
   //  ndbout_c("Drop TupTrigger %u = %u %u %u %u by %u", triggerId, table, ttype, ttime, tevent, sender);
 
-  ArrayList<TupTriggerData>* tlist = findTriggerList(table, ttype, ttime, tevent);
+  DLList<TupTriggerData>* tlist = findTriggerList(table, ttype, ttime, tevent);
   ndbrequire(tlist != NULL);
 
   Ptr<TupTriggerData> ptr;
@@ -548,7 +548,7 @@
 
 void 
 Dbtup::fireImmediateTriggers(KeyReqStruct *req_struct,
-                             ArrayList<TupTriggerData>& triggerList, 
+                             DLList<TupTriggerData>& triggerList, 
                              Operationrec* const regOperPtr)
 {
   TriggerPtr trigPtr;
@@ -570,7 +570,7 @@
 void 
 Dbtup::fireDeferredTriggers(Signal* signal,
                             KeyReqStruct *req_struct,
-                            ArrayList<TupTriggerData>& triggerList, 
+                            DLList<TupTriggerData>& triggerList, 
                             Operationrec* const regOperPtr)
 {
   TriggerPtr trigPtr;
@@ -591,7 +591,7 @@
 
 void 
 Dbtup::fireDetachedTriggers(KeyReqStruct *req_struct,
-                            ArrayList<TupTriggerData>& triggerList, 
+                            DLList<TupTriggerData>& triggerList, 
                             Operationrec* const regOperPtr)
 {
   
@@ -620,7 +620,7 @@
 }
 
 void Dbtup::executeTriggers(KeyReqStruct *req_struct,
-                            ArrayList<TupTriggerData>& triggerList, 
+                            DLList<TupTriggerData>& triggerList, 
                             Operationrec* regOperPtr)
 {
   TriggerPtr trigPtr;
@@ -1103,7 +1103,7 @@
                      Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
-  const ArrayList<TupTriggerData>& triggerList = regTabPtr->tuxCustomTriggers;
+  const DLList<TupTriggerData>& triggerList = regTabPtr->tuxCustomTriggers;
   TriggerPtr triggerPtr;
   Uint32 failPtrI;
   triggerList.first(triggerPtr);
@@ -1224,7 +1224,7 @@
                         Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
-  const ArrayList<TupTriggerData>& triggerList = regTabPtr->tuxCustomTriggers;
+  const DLList<TupTriggerData>& triggerList = regTabPtr->tuxCustomTriggers;
   TriggerPtr triggerPtr;
   triggerList.first(triggerPtr);
   while (triggerPtr.i != RNIL) {

--- 1.44/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2006-01-17 09:32:13 +01:00
+++ 1.45/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2006-01-31 06:46:50 +01:00
@@ -102,7 +102,7 @@
 
 class Dbtux : public SimulatedBlock {
 public:
-  Dbtux(const Configuration& conf);
+  Dbtux(Block_context& ctx);
   virtual ~Dbtux();
 
   // pointer to TUP instance in this thread

--- 1.21/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2005-11-07 12:19:07 +01:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2006-01-31 06:46:50 +01:00
@@ -17,8 +17,8 @@
 #define DBTUX_GEN_CPP
 #include "Dbtux.hpp"
 
-Dbtux::Dbtux(const Configuration& conf) :
-  SimulatedBlock(DBTUX, conf),
+Dbtux::Dbtux(Block_context& ctx) :
+  SimulatedBlock(DBTUX, ctx),
   c_tup(0),
   c_descPageList(RNIL),
 #ifdef VM_TRACE
@@ -165,7 +165,7 @@
   Uint32 nScanOp; 
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUX_INDEX, &nIndex));

--- 1.15/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2005-11-07 12:19:08 +01:00
+++ 1.16/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2006-01-31 06:46:50 +01:00
@@ -49,8 +49,8 @@
  *  Constructors, startup, initializations
  **************************************************************************/
 
-DbUtil::DbUtil(const Configuration & conf) :
-  SimulatedBlock(DBUTIL, conf),
+DbUtil::DbUtil(Block_context& ctx) :
+  SimulatedBlock(DBUTIL, ctx),
   c_runningPrepares(c_preparePool),
   c_runningPreparedOperations(c_preparedOperationPool),
   c_seizingTransactions(c_transactionPool),
@@ -168,7 +168,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   c_pagePool.setSize(10);

--- 1.5/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2005-10-07 01:06:20 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2006-01-31 06:46:50 +01:00
@@ -21,7 +21,6 @@
 #include <SimulatedBlock.hpp>
 #include <NodeBitmask.hpp>
 
-#include <ArrayList.hpp>
 #include <ArrayPool.hpp>
 #include <SLList.hpp>
 #include <DLList.hpp>
@@ -36,6 +35,7 @@
 #include <signaldata/UtilExecute.hpp>
 #include <signaldata/UtilLock.hpp>
 #include <SimpleProperties.hpp>
+#include <Array.hpp>
 
 #define UTIL_WORDS_PER_PAGE 1023
 
@@ -61,7 +61,7 @@
 class DbUtil : public SimulatedBlock
 {
 public:
-  DbUtil(const class Configuration & conf);
+  DbUtil(Block_context& ctx);
   virtual ~DbUtil();
   BLOCK_DEFINES(DbUtil);
   

--- 1.6/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2005-10-07 01:06:20 +02:00
+++ 1.7/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2006-01-31 06:46:50 +01:00
@@ -152,7 +152,7 @@
   static const SysTable g_sysTable_NDBEVENTS_0;
 
 public:
-  Ndbcntr(const class Configuration &);
+  Ndbcntr(Block_context&);
   virtual ~Ndbcntr();
 
 private:

--- 1.9/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp	2005-10-07 01:06:20 +02:00
+++ 1.10/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp	2006-01-31 06:46:50 +01:00
@@ -35,8 +35,8 @@
   // Records with dynamic sizes
 }//Ndbcntr::initRecords()
 
-Ndbcntr::Ndbcntr(const class Configuration & conf):
-  SimulatedBlock(NDBCNTR, conf),
+Ndbcntr::Ndbcntr(Block_context& ctx):
+  SimulatedBlock(NDBCNTR, ctx),
   cnoWaitrep6(0),
   cnoWaitrep7(0),
   c_stopRec(* this),

--- 1.28/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-01-18 16:45:10 +01:00
+++ 1.29/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-01-31 06:46:50 +01:00
@@ -137,7 +137,7 @@
       jam();
       Uint32 to_3= 0;
       const ndb_mgm_configuration_iterator * p = 
-	theConfiguration.getOwnConfigIterator();
+	m_ctx.m_config.getOwnConfigIterator();
       ndb_mgm_get_int_parameter(p, CFG_DB_START_FAILURE_TIMEOUT, &to_3);
       BaseString tmp;
       tmp.append("Shutting down node as total restart time exceeds "
@@ -239,7 +239,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
@@ -259,7 +259,7 @@
 
   switch (cstartPhase) {
   case 0:
-    if(theConfiguration.getInitialStart()){
+    if(m_ctx.m_config.getInitialStart()){
       jam();
       c_fsRemoveCount = 0;
       clearFilesystem(signal);
@@ -502,7 +502,7 @@
   Uint32 to_3 = 0;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   
   ndbrequire(p != 0);
   ndb_mgm_get_int_parameter(p, CFG_DB_START_PARTIAL_TIMEOUT, &to_1);
@@ -1968,8 +1968,8 @@
   }
 
   if (dumpState->args[0] == DumpStateOrd::NdbcntrTestStopOnError){
-    if (theConfiguration.stopOnError() == true)
-      ((Configuration&)theConfiguration).stopOnError(false);
+    if (m_ctx.m_config.stopOnError() == true)
+      ((Configuration&)m_ctx.m_config).stopOnError(false);
     
     const BlockReference tblockref = calcNdbCntrBlockRef(getOwnNodeId());
       
@@ -2095,7 +2095,7 @@
     if(StopReq::getSystemStop(c_stopRec.stopReq.requestInfo)) {
       jam();
       if(StopReq::getPerformRestart(c_stopRec.stopReq.requestInfo)){
-	((Configuration&)theConfiguration).stopOnError(false);
+	((Configuration&)m_ctx.m_config).stopOnError(false);
       }
     }
     if(!c_stopRec.checkNodeFail(signal)){

--- 1.22/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2005-11-07 12:19:08 +01:00
+++ 1.23/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2006-01-31 06:46:50 +01:00
@@ -50,8 +50,8 @@
 }
 
 
-Ndbfs::Ndbfs(const Configuration & conf) :
-  SimulatedBlock(NDBFS, conf),
+Ndbfs::Ndbfs(Block_context& ctx) :
+  SimulatedBlock(NDBFS, ctx),
   scanningInProgress(false),
   theLastId(0),
   theRequestPool(0),
@@ -98,11 +98,11 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
-  theFileSystemPath.assfmt("%sndb_%u_fs%s", theConfiguration.fileSystemPath(),
+  theFileSystemPath.assfmt("%sndb_%u_fs%s", m_ctx.m_config.fileSystemPath(),
 			   getOwnNodeId(), DIR_SEPARATOR);
-  theBackupFilePath.assign(theConfiguration.backupFilePath());
+  theBackupFilePath.assign(m_ctx.m_config.backupFilePath());
 
   theRequestPool = new Pool<Request>;
 

--- 1.6/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2005-11-07 12:19:08 +01:00
+++ 1.7/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2006-01-31 06:46:50 +01:00
@@ -34,7 +34,7 @@
 class Ndbfs : public SimulatedBlock
 {
 public:
-  Ndbfs(const class Configuration & conf);
+  Ndbfs(Block_context&);
   virtual ~Ndbfs();
 
   virtual const char* get_filename(Uint32 fd) const;
@@ -99,7 +99,7 @@
 class VoidFs : public SimulatedBlock
 {
 public:
-  VoidFs(const class Configuration & conf);
+  VoidFs(Block_context&);
   virtual ~VoidFs();
 
 protected:

--- 1.5/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2005-10-07 17:44:56 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2006-01-31 06:46:50 +01:00
@@ -38,8 +38,8 @@
 
 #define DEBUG(x) { ndbout << "FS::" << x << endl; }
 
-VoidFs::VoidFs(const Configuration & conf) :
-  SimulatedBlock(NDBFS, conf)
+VoidFs::VoidFs(Block_context & ctx) :
+  SimulatedBlock(NDBFS, ctx)
 {
   BLOCK_CONSTRUCTOR(VoidFs);
   

--- 1.9/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2005-10-07 01:06:20 +02:00
+++ 1.10/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2006-01-31 06:46:50 +01:00
@@ -176,7 +176,7 @@
   };
   
 public:
-  Qmgr(const class Configuration &);
+  Qmgr(Block_context&);
   virtual ~Qmgr();
 
 private:

--- 1.7/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2005-10-07 01:06:20 +02:00
+++ 1.8/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2006-01-31 06:46:50 +01:00
@@ -45,8 +45,8 @@
   // Records with dynamic sizes
 }//Qmgr::initRecords()
 
-Qmgr::Qmgr(const class Configuration & conf)
-  : SimulatedBlock(QMGR, conf)
+Qmgr::Qmgr(Block_context& ctx)
+  : SimulatedBlock(QMGR, ctx)
 {
   BLOCK_CONSTRUCTOR(Qmgr);
 

--- 1.25/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2005-12-07 12:59:35 +01:00
+++ 1.26/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-01-31 06:46:50 +01:00
@@ -177,7 +177,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
@@ -1406,7 +1406,7 @@
    * Timeouts
    */
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
   
   Uint32 hbDBDB = 1500;
@@ -1437,7 +1437,7 @@
     sd->ticket.clear();
     sd->mask.clear();
     ndb_mgm_configuration_iterator * iter =
-      theConfiguration.getClusterConfigIterator();
+      m_ctx.m_config.getClusterConfigIterator();
     for (ndb_mgm_first(iter); ndb_mgm_valid(iter); ndb_mgm_next(iter)) {
       Uint32 tmp = 0;
       if (ndb_mgm_get_int_parameter(iter, CFG_NODE_ARBIT_RANK, &tmp) == 0 && 

--- 1.33/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-01-20 09:10:50 +01:00
+++ 1.34/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-01-31 06:46:50 +01:00
@@ -162,7 +162,7 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   // SumaParticipant

--- 1.10/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2006-01-18 16:45:10 +01:00
+++ 1.11/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2006-01-31 06:46:51 +01:00
@@ -38,7 +38,7 @@
 class Suma : public SimulatedBlock {
   BLOCK_DEFINES(Suma);
 public:
-  Suma(const Configuration & conf);
+  Suma(Block_context& ctx);
   virtual ~Suma();
 
   /**

--- 1.11/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2006-01-12 19:50:35 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2006-01-31 06:46:51 +01:00
@@ -19,8 +19,8 @@
 #include <Properties.hpp>
 #include <Configuration.hpp>
 
-Suma::Suma(const Configuration & conf) :
-  SimulatedBlock(SUMA, conf),
+Suma::Suma(Block_context& ctx) :
+  SimulatedBlock(SUMA, ctx),
   c_metaSubscribers(c_subscriberPool),
   c_removeDataSubscribers(c_subscriberPool),
   c_tables(c_tablePool),

--- 1.11/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2005-10-07 01:06:21 +02:00
+++ 1.12/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2006-01-31 06:46:51 +01:00
@@ -40,8 +40,8 @@
 /**
  *
  */
-Trix::Trix(const Configuration & conf) :
-  SimulatedBlock(TRIX, conf),
+Trix::Trix(Block_context& ctx) :
+  SimulatedBlock(TRIX, ctx),
   c_theNodes(c_theNodeRecPool),
   c_masterNodeId(0),
   c_masterTrixRef(0),
@@ -105,14 +105,14 @@
   Uint32 senderData = req->senderData;
 
   const ndb_mgm_configuration_iterator * p = 
-    theConfiguration.getOwnConfigIterator();
+    m_ctx.m_config.getOwnConfigIterator();
   ndbrequire(p != 0);
 
   // Allocate pool sizes
   c_theAttrOrderBufferPool.setSize(100);
   c_theSubscriptionRecPool.setSize(100);
 
-  ArrayList<SubscriptionRecord> subscriptions(c_theSubscriptionRecPool);
+  DLList<SubscriptionRecord> subscriptions(c_theSubscriptionRecPool);
   SubscriptionRecPtr subptr;
   while(subscriptions.seize(subptr) == true) {
     new (subptr.p) SubscriptionRecord(c_theAttrOrderBufferPool);

--- 1.6/storage/ndb/src/kernel/blocks/trix/Trix.hpp	2005-10-07 01:06:21 +02:00
+++ 1.7/storage/ndb/src/kernel/blocks/trix/Trix.hpp	2006-01-31 06:46:51 +01:00
@@ -20,7 +20,6 @@
 #include <SimulatedBlock.hpp>
 #include <trigger_definitions.h>
 #include <DataBuffer.hpp>
-#include <ArrayList.hpp>
 #include <SimpleProperties.hpp>
 #include <signaldata/DictTabInfo.hpp>
 #include <signaldata/CreateTrig.hpp>
@@ -36,7 +35,7 @@
 class Trix : public SimulatedBlock
 {
 public:
-  Trix(const class Configuration & conf);
+  Trix(Block_context&);
   virtual ~Trix();
 
 public:
@@ -89,7 +88,7 @@
   /**
    * The list of other NDB nodes
    */  
-  ArrayList<NodeRecord> c_theNodes;
+  DLList<NodeRecord> c_theNodes;
 
   Uint32 c_masterNodeId;
   BlockReference c_masterTrixRef;
@@ -136,7 +135,7 @@
   /**
    * The list of other subscriptions
    */  
-  ArrayList<SubscriptionRecord> c_theSubscriptions;
+  DLList<SubscriptionRecord> c_theSubscriptions;
 
   // System start
   void execREAD_CONFIG_REQ(Signal* signal);

--- 1.11/storage/ndb/src/kernel/SimBlockList.cpp	2005-11-07 12:19:06 +01:00
+++ 1.12/storage/ndb/src/kernel/SimBlockList.cpp	2006-01-31 06:46:49 +01:00
@@ -69,7 +69,7 @@
 #endif
 
 void 
-SimBlockList::load(const Configuration & conf){
+SimBlockList::load(Configuration & conf){
   noOfBlocks = NO_OF_BLOCKS;
   theList = new SimulatedBlock * [noOfBlocks];
   Dbdict* dbdict = 0;
@@ -78,36 +78,39 @@
   Lgman* lg = 0;
   Tsman* ts = 0;
 
+  Block_context ctx = 
+    { conf, * globalEmulatorData.m_mem_manager };
+
   SimulatedBlock * fs = 0;
   {
     Uint32 dl;
     const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
     if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){
-      fs = NEW_BLOCK(VoidFs)(conf);
+      fs = NEW_BLOCK(VoidFs)(ctx);
     } else { 
-      fs = NEW_BLOCK(Ndbfs)(conf);
+      fs = NEW_BLOCK(Ndbfs)(ctx);
     }
   }
   
-  theList[0]  = pg = NEW_BLOCK(Pgman)(conf);
-  theList[1]  = lg = NEW_BLOCK(Lgman)(conf);
-  theList[2]  = ts = NEW_BLOCK(Tsman)(conf, pg, lg);
-  theList[3]  = NEW_BLOCK(Dbacc)(conf);
-  theList[4]  = NEW_BLOCK(Cmvmi)(conf);
+  theList[0]  = pg = NEW_BLOCK(Pgman)(ctx);
+  theList[1]  = lg = NEW_BLOCK(Lgman)(ctx);
+  theList[2]  = ts = NEW_BLOCK(Tsman)(ctx, pg, lg);
+  theList[3]  = NEW_BLOCK(Dbacc)(ctx);
+  theList[4]  = NEW_BLOCK(Cmvmi)(ctx);
   theList[5]  = fs;
-  theList[6]  = dbdict = NEW_BLOCK(Dbdict)(conf);
-  theList[7]  = dbdih = NEW_BLOCK(Dbdih)(conf);
-  theList[8]  = NEW_BLOCK(Dblqh)(conf);
-  theList[9]  = NEW_BLOCK(Dbtc)(conf);
-  theList[10] = NEW_BLOCK(Dbtup)(conf, pg);
-  theList[11] = NEW_BLOCK(Ndbcntr)(conf);
-  theList[12] = NEW_BLOCK(Qmgr)(conf);
-  theList[13] = NEW_BLOCK(Trix)(conf);
-  theList[14] = NEW_BLOCK(Backup)(conf);
-  theList[15] = NEW_BLOCK(DbUtil)(conf);
-  theList[16] = NEW_BLOCK(Suma)(conf);
-  theList[17] = NEW_BLOCK(Dbtux)(conf);
-  theList[18] = NEW_BLOCK(Restore)(conf);
+  theList[6]  = dbdict = NEW_BLOCK(Dbdict)(ctx);
+  theList[7]  = dbdih = NEW_BLOCK(Dbdih)(ctx);
+  theList[8]  = NEW_BLOCK(Dblqh)(ctx);
+  theList[9]  = NEW_BLOCK(Dbtc)(ctx);
+  theList[10] = NEW_BLOCK(Dbtup)(ctx, pg);
+  theList[11] = NEW_BLOCK(Ndbcntr)(ctx);
+  theList[12] = NEW_BLOCK(Qmgr)(ctx);
+  theList[13] = NEW_BLOCK(Trix)(ctx);
+  theList[14] = NEW_BLOCK(Backup)(ctx);
+  theList[15] = NEW_BLOCK(DbUtil)(ctx);
+  theList[16] = NEW_BLOCK(Suma)(ctx);
+  theList[17] = NEW_BLOCK(Dbtux)(ctx);
+  theList[18] = NEW_BLOCK(Restore)(ctx);
   assert(NO_OF_BLOCKS == 19);
 }
 

--- 1.2/storage/ndb/src/kernel/vm/ArrayList.hpp	2005-04-08 02:44:06 +02:00
+++ 1.3/BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179	2006-01-24 20:05:55 +01:00
@@ -21,10 +21,10 @@
 #include "DLList.hpp"
 #include "Array.hpp"
 
-template <class T>
-class ArrayList : public DLList<T> {
+template <class T, typename P>
+class ArrayList : public DLList<T, T, P> {
 public:
-  ArrayList(ArrayPool<T> & thePool) : DLList<T>(thePool) { }  
+  ArrayList(P & thePool) : DLList<T, T, P>(thePool) { }  
 };
 
 #endif

--- 1.3/storage/ndb/src/kernel/vm/SimBlockList.hpp	2005-11-07 12:19:08 +01:00
+++ 1.4/storage/ndb/src/kernel/vm/SimBlockList.hpp	2006-01-31 06:46:51 +01:00
@@ -27,7 +27,7 @@
   SimBlockList();
   ~SimBlockList();
   
-  void load(const Configuration & conf);
+  void load(Configuration & conf);
   void unload();
 private:
   int noOfBlocks;

--- 1.27/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2005-12-14 14:03:48 +01:00
+++ 1.28/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2006-01-31 06:46:51 +01:00
@@ -46,11 +46,11 @@
 // Constructor, Destructor
 //
 SimulatedBlock::SimulatedBlock(BlockNumber blockNumber,
-			       const class Configuration & conf) 
+			       struct Block_context & ctx) 
   : theNodeId(globalData.ownId),
     theNumber(blockNumber),
     theReference(numberToRef(blockNumber, globalData.ownId)),
-    theConfiguration(conf),
+    m_ctx(ctx),
     m_global_page_pool(globalData.m_global_page_pool),
     c_fragmentInfoHash(c_fragmentInfoPool),
     c_linearFragmentSendList(c_fragmentSendPool),
@@ -724,9 +724,9 @@
   // Pack status of interesting config variables 
   // so that we can print them in error.log
   int magicStatus = 
-    (theConfiguration.stopOnError()<<1) + 
-    (theConfiguration.getInitialStart()<<2) + 
-    (theConfiguration.getDaemonMode()<<3);
+    (m_ctx.m_config.stopOnError()<<1) + 
+    (m_ctx.m_config.getInitialStart()<<2) + 
+    (m_ctx.m_config.getDaemonMode()<<3);
   
 
   /* Add line number to block name */

--- 1.18/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2005-11-19 10:41:40 +01:00
+++ 1.19/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2006-01-31 06:46:51 +01:00
@@ -51,7 +51,7 @@
 
 #include <signaldata/ReadConfig.hpp>
 #include <signaldata/UpgradeStartup.hpp>
-
+#include "ndbd_malloc_impl.hpp"
 
 /**
  * Something for filesystem access
@@ -74,6 +74,12 @@
   NewBaseAddrBits       bits;
 } NewVARIABLE;  /* 128 bits */
 
+struct Block_context
+{
+  class Configuration& m_config;
+  class Ndbd_mem_manager& m_mm;
+};
+
 class SimulatedBlock {
   friend class TraceLCP;
   friend class SafeCounter;
@@ -93,8 +99,8 @@
    * Constructor
    */
   SimulatedBlock(BlockNumber blockNumber,
-                 const class Configuration & theConfiguration); 
-
+		 struct Block_context & ctx); 
+  
   /**********************************************************
    * Handling of execFunctions
    */
@@ -338,6 +344,7 @@
   const BlockReference theReference;
   
 protected:
+  Block_context m_ctx;
   NewVARIABLE* allocateBat(int batSize);
   void freeBat();
   static const NewVARIABLE* getBat    (BlockNumber blockNo);
@@ -378,11 +385,6 @@
   void infoEvent(const char * msg, ...) const ;
   void warningEvent(const char * msg, ...) const ;
   
-  /**
-   * The configuration object
-   */
-  const class Configuration & theConfiguration;
-
   /**
    * Get node state
    */
Thread
bk commit into 5.1 tree (jonas:1.2067)jonas31 Jan