#At file:///export/space/pekka/ndb/version/my51-wl4391/
2678 Pekka Nousiainen 2008-07-23
wl#4391 02.diff
LocalProxy, including READ_CONFIG, and subclasses.
modified:
storage/ndb/src/kernel/SimBlockList.cpp
storage/ndb/src/kernel/blocks/Makefile.am
storage/ndb/src/kernel/blocks/backup/Backup.hpp
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
storage/ndb/src/kernel/blocks/restore.cpp
storage/ndb/src/kernel/blocks/restore.hpp
=== modified file 'storage/ndb/src/kernel/SimBlockList.cpp'
--- a/storage/ndb/src/kernel/SimBlockList.cpp 2006-12-23 19:20:40 +0000
+++ b/storage/ndb/src/kernel/SimBlockList.cpp 2008-07-23 16:00:58 +0000
@@ -36,6 +36,13 @@
#include <pgman.hpp>
#include <restore.hpp>
#include <NdbEnv.h>
+#include <LocalProxy.hpp>
+#include <DblqhProxy.hpp>
+#include <DbaccProxy.hpp>
+#include <DbtupProxy.hpp>
+#include <DbtuxProxy.hpp>
+#include <BackupProxy.hpp>
+#include <RestoreProxy.hpp>
#ifndef VM_TRACE
#define NEW_BLOCK(B) new B
@@ -68,6 +75,9 @@ void * operator new (size_t sz, SIMBLOCK
#define NEW_BLOCK(B) new(A_VALUE) B
#endif
+extern bool g_ndbMt;
+extern bool g_ndbMtLqh;
+
void
SimBlockList::load(EmulatorData& data){
noOfBlocks = NO_OF_BLOCKS;
@@ -91,26 +101,44 @@ SimBlockList::load(EmulatorData& data){
fs = NEW_BLOCK(Ndbfs)(ctx);
}
}
-
+
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);
+ if (!g_ndbMtLqh)
+ theList[3] = NEW_BLOCK(Dbacc)(ctx);
+ else
+ theList[3] = NEW_BLOCK(DbaccProxy)(ctx);
theList[4] = NEW_BLOCK(Cmvmi)(ctx);
theList[5] = fs;
theList[6] = dbdict = NEW_BLOCK(Dbdict)(ctx);
theList[7] = dbdih = NEW_BLOCK(Dbdih)(ctx);
- theList[8] = NEW_BLOCK(Dblqh)(ctx);
+ if (!g_ndbMtLqh)
+ theList[8] = NEW_BLOCK(Dblqh)(ctx);
+ else
+ theList[8] = NEW_BLOCK(DblqhProxy)(ctx);
theList[9] = NEW_BLOCK(Dbtc)(ctx);
- theList[10] = NEW_BLOCK(Dbtup)(ctx, pg);
+ if (!g_ndbMtLqh)
+ theList[10] = NEW_BLOCK(Dbtup)(ctx, pg);
+ else
+ theList[10] = NEW_BLOCK(DbtupProxy)(ctx);
theList[11] = NEW_BLOCK(Ndbcntr)(ctx);
theList[12] = NEW_BLOCK(Qmgr)(ctx);
theList[13] = NEW_BLOCK(Trix)(ctx);
- theList[14] = NEW_BLOCK(Backup)(ctx);
+ if (!g_ndbMtLqh)
+ theList[14] = NEW_BLOCK(Backup)(ctx);
+ else
+ theList[14] = NEW_BLOCK(BackupProxy)(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);
+ if (!g_ndbMtLqh)
+ theList[17] = NEW_BLOCK(Dbtux)(ctx);
+ else
+ theList[17] = NEW_BLOCK(DbtuxProxy)(ctx);
+ if (!g_ndbMtLqh)
+ theList[18] = NEW_BLOCK(Restore)(ctx);
+ else
+ theList[18] = NEW_BLOCK(RestoreProxy)(ctx);
assert(NO_OF_BLOCKS == 19);
}
=== modified file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am 2008-04-25 16:35:50 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am 2008-07-23 16:00:58 +0000
@@ -54,7 +54,14 @@ libblocks_a_SOURCES = tsman.cpp lgman.cp
dbtux/DbtuxGen.cpp dbtux/DbtuxMeta.cpp dbtux/DbtuxMaint.cpp \
dbtux/DbtuxNode.cpp dbtux/DbtuxTree.cpp dbtux/DbtuxScan.cpp \
dbtux/DbtuxSearch.cpp dbtux/DbtuxCmp.cpp dbtux/DbtuxStat.cpp \
- dbtux/DbtuxDebug.cpp
+ dbtux/DbtuxDebug.cpp \
+ LocalProxy.cpp \
+ dblqh/DblqhProxy.cpp \
+ dbacc/DbaccProxy.cpp \
+ dbtup/DbtupProxy.cpp \
+ dbtux/DbtuxProxy.cpp \
+ backup/BackupProxy.cpp \
+ RestoreProxy.cpp
EXTRA_PROGRAMS = ndb_print_file
ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
=== modified file 'storage/ndb/src/kernel/blocks/backup/Backup.hpp'
--- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp 2008-06-05 20:31:21 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp 2008-07-23 16:00:58 +0000
@@ -40,8 +40,10 @@
*/
class Backup : public SimulatedBlock
{
+ friend class BackupProxy;
+
public:
- Backup(Block_context& ctx);
+ Backup(Block_context& ctx, Uint32 instanceNumber = 0);
virtual ~Backup();
BLOCK_DEFINES(Backup);
=== modified file 'storage/ndb/src/kernel/blocks/backup/BackupInit.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp 2008-06-05 20:31:21 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp 2008-07-23 16:00:58 +0000
@@ -26,8 +26,8 @@
//extern const unsigned Ndbcntr::g_sysTableCount;
-Backup::Backup(Block_context& ctx) :
- SimulatedBlock(BACKUP, ctx),
+Backup::Backup(Block_context& ctx, Uint32 instanceNumber) :
+ SimulatedBlock(BACKUP, ctx, instanceNumber),
c_nodes(c_nodePool),
c_backups(c_backupPool)
{
=== modified file 'storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp'
--- a/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2008-07-23 16:00:58 +0000
@@ -268,6 +268,8 @@ ElementHeader::clearScanBit(Uint32 heade
class Dbacc: public SimulatedBlock {
+ friend class DbaccProxy;
+
public:
// State values
enum State {
@@ -625,7 +627,7 @@ struct Tabrec {
typedef Ptr<Tabrec> TabrecPtr;
public:
- Dbacc(Block_context&);
+ Dbacc(Block_context&, Uint32 instanceNumber = 0);
virtual ~Dbacc();
// pointer to TUP instance in this thread
=== modified file 'storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp 2008-07-23 16:00:58 +0000
@@ -86,8 +86,8 @@ void Dbacc::initRecords()
ctablesize);
}//Dbacc::initRecords()
-Dbacc::Dbacc(Block_context& ctx):
- SimulatedBlock(DBACC, ctx),
+Dbacc::Dbacc(Block_context& ctx, Uint32 instanceNumber):
+ SimulatedBlock(DBACC, ctx, instanceNumber),
c_tup(0)
{
BLOCK_CONSTRUCTOR(Dbacc);
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2008-06-05 20:34:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2008-07-23 16:00:58 +0000
@@ -400,6 +400,8 @@ class Dbtup;
* - LOG
*/
class Dblqh: public SimulatedBlock {
+ friend class DblqhProxy;
+
public:
enum LcpCloseState {
LCP_IDLE = 0,
@@ -2047,7 +2049,7 @@ public:
};
public:
- Dblqh(Block_context& ctx);
+ Dblqh(Block_context& ctx, Uint32 instanceNumber = 0);
virtual ~Dblqh();
void receive_keyinfo(Signal*, Uint32 * data, Uint32 len);
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp 2008-07-23 16:00:58 +0000
@@ -165,8 +165,8 @@ void Dblqh::initRecords()
bat[1].bits.v = 5;
}//Dblqh::initRecords()
-Dblqh::Dblqh(Block_context& ctx):
- SimulatedBlock(DBLQH, ctx),
+Dblqh::Dblqh(Block_context& ctx, Uint32 instanceNumber):
+ SimulatedBlock(DBLQH, ctx, instanceNumber),
c_lcp_waiting_fragments(c_fragment_pool),
c_lcp_restoring_fragments(c_fragment_pool),
c_lcp_complete_fragments(c_fragment_pool),
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2008-06-05 20:34:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2008-07-23 16:00:58 +0000
@@ -344,6 +344,7 @@ inline const Uint32* ALIGN_WORD(const vo
#endif
class Dbtup: public SimulatedBlock {
+friend class DbtupProxy;
friend class Suma;
public:
struct KeyReqStruct;
@@ -1651,7 +1652,7 @@ struct TupHeadInfo {
Uint32 terrorCode;
public:
- Dbtup(Block_context&, Pgman*);
+ Dbtup(Block_context&, Pgman*, Uint32 instanceNumber = 0);
virtual ~Dbtup();
/*
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp 2008-07-23 16:00:58 +0000
@@ -49,8 +49,8 @@ void Dbtup::initData()
cpackedListIndex = 0;
}//Dbtup::initData()
-Dbtup::Dbtup(Block_context& ctx, Pgman* pgman)
- : SimulatedBlock(DBTUP, ctx),
+Dbtup::Dbtup(Block_context& ctx, Pgman* pgman, Uint32 instanceNumber)
+ : SimulatedBlock(DBTUP, ctx, instanceNumber),
c_lqh(0),
m_pgman(this, pgman),
c_extent_hash(c_extent_pool),
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp 2008-07-23 16:00:58 +0000
@@ -101,8 +101,9 @@
class Configuration;
class Dbtux : public SimulatedBlock {
+ friend class DbtuxProxy;
public:
- Dbtux(Block_context& ctx);
+ Dbtux(Block_context& ctx, Uint32 instanceNumber = 0);
virtual ~Dbtux();
// pointer to TUP instance in this thread
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp 2008-06-05 20:19:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp 2008-07-23 16:00:58 +0000
@@ -18,8 +18,8 @@
#include <signaldata/NodeStateSignalData.hpp>
-Dbtux::Dbtux(Block_context& ctx) :
- SimulatedBlock(DBTUX, ctx),
+Dbtux::Dbtux(Block_context& ctx, Uint32 instanceNumber) :
+ SimulatedBlock(DBTUX, ctx, instanceNumber),
c_tup(0),
c_descPageList(RNIL),
#ifdef VM_TRACE
=== modified file 'storage/ndb/src/kernel/blocks/restore.cpp'
--- a/storage/ndb/src/kernel/blocks/restore.cpp 2008-03-18 07:12:39 +0000
+++ b/storage/ndb/src/kernel/blocks/restore.cpp 2008-07-23 16:00:58 +0000
@@ -32,8 +32,8 @@
#define PAGES LCP_RESTORE_BUFFER
-Restore::Restore(Block_context& ctx) :
- SimulatedBlock(RESTORE, ctx),
+Restore::Restore(Block_context& ctx, Uint32 instanceNumber) :
+ SimulatedBlock(RESTORE, ctx, instanceNumber),
m_file_list(m_file_pool),
m_file_hash(m_file_pool)
{
=== modified file 'storage/ndb/src/kernel/blocks/restore.hpp'
--- a/storage/ndb/src/kernel/blocks/restore.hpp 2008-03-18 07:12:39 +0000
+++ b/storage/ndb/src/kernel/blocks/restore.hpp 2008-07-23 16:00:58 +0000
@@ -28,8 +28,10 @@
class Restore : public SimulatedBlock
{
+ friend class RestoreProxy;
+
public:
- Restore(Block_context& ctx);
+ Restore(Block_context& ctx, Uint32 instanceNumber = 0);
virtual ~Restore();
BLOCK_DEFINES(Restore);
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.4 branch (pekka:2678) WL#4391 | Pekka Nousiainen | 23 Jul |
