MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 21 2009 8:40am
Subject:bzr commit into mysql-5.1-telco-6.3 branch (jonas:3124)
View as plain text  
#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3124 Jonas Oreland	2009-10-21
      ndb - revert work-arounds, that was cause to m_noOfSection vs sendWithDelay

    modified:
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
      storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
      storage/ndb/src/kernel/vm/FastScheduler.cpp
      storage/ndb/src/kernel/vm/VMSignal.hpp
=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2009-10-20 20:13:47 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2009-10-21 08:40:24 +0000
@@ -1217,8 +1217,10 @@ Ndbfs::execCONTINUEB(Signal* signal)
 void
 Ndbfs::execSEND_PACKED(Signal* signal)
 {
+  jamEntry();
   if (scanningInProgress == false && scanIPC(signal))
   {
+    jam();
     scanningInProgress = true;
     signal->theData[0] = NdbfsContinueB::ZSCAN_MEMORYCHANNEL_NO_DELAY;
     sendSignal(reference(), GSN_CONTINUEB, signal, 1, JBB);

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2009-10-20 19:19:19 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2009-10-21 08:40:24 +0000
@@ -121,6 +121,7 @@ protected:
   void execFSREMOVEREQ(Signal* signal);
   void execSTTOR(Signal* signal);
   void execALLOC_MEM_REQ(Signal*);
+  void execSEND_PACKED(Signal*);
 
 private:
   // Declared but not defined

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2009-10-12 06:21:54 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2009-10-21 08:40:24 +0000
@@ -44,6 +44,7 @@ VoidFs::VoidFs(Block_context & ctx) :
   Ndbfs(ctx)
 {
   // Set received signals
+  addRecSignal(GSN_SEND_PACKED, &VoidFs::execSEND_PACKED, true);
   addRecSignal(GSN_READ_CONFIG_REQ, &VoidFs::execREAD_CONFIG_REQ, true);
   addRecSignal(GSN_DUMP_STATE_ORD,  &VoidFs::execDUMP_STATE_ORD, true);
   addRecSignal(GSN_STTOR,  &VoidFs::execSTTOR, true);
@@ -94,6 +95,12 @@ VoidFs::execSTTOR(Signal* signal)
   ndbrequire(0);
 }
 
+void
+VoidFs::execSEND_PACKED(Signal* signal)
+{
+  jamEntry();
+}
+
 void 
 VoidFs::execFSOPENREQ(Signal* signal)
 {

=== modified file 'storage/ndb/src/kernel/vm/FastScheduler.cpp'
--- a/storage/ndb/src/kernel/vm/FastScheduler.cpp	2009-10-20 21:39:41 +0000
+++ b/storage/ndb/src/kernel/vm/FastScheduler.cpp	2009-10-21 08:40:24 +0000
@@ -176,8 +176,7 @@ FastScheduler::doJob()
 void
 FastScheduler::postPoll()
 {
-  SignalT<25> signalT;
-  Signal * signal = reinterpret_cast<Signal*>(&signalT);
+  Signal * signal = getVMSignals();
   SimulatedBlock* b_fs = globalData.getBlock(NDBFS);
   b_fs->executeFunction(GSN_SEND_PACKED, signal);
 }
@@ -185,12 +184,11 @@ FastScheduler::postPoll()
 void FastScheduler::sendPacked()
 {
   if (globalData.sendPackedActivated == 1) {
-    SignalT<25> signalT;
-    Signal * signal = reinterpret_cast<Signal*>(&signalT);
     SimulatedBlock* b_lqh = globalData.getBlock(DBLQH);
     SimulatedBlock* b_tc = globalData.getBlock(DBTC);
     SimulatedBlock* b_tup = globalData.getBlock(DBTUP);
     SimulatedBlock* b_fs = globalData.getBlock(NDBFS);
+    Signal * signal = getVMSignals();
     b_lqh->executeFunction(GSN_SEND_PACKED, signal);
     b_tc->executeFunction(GSN_SEND_PACKED, signal);
     b_tup->executeFunction(GSN_SEND_PACKED, signal);

=== modified file 'storage/ndb/src/kernel/vm/VMSignal.hpp'
--- a/storage/ndb/src/kernel/vm/VMSignal.hpp	2009-10-20 23:15:22 +0000
+++ b/storage/ndb/src/kernel/vm/VMSignal.hpp	2009-10-21 08:40:24 +0000
@@ -65,7 +65,6 @@ struct NodeReceiverGroup {
 
 template <unsigned T> struct SignalT
 {
-  SignalT() { bzero(&header, sizeof(header)); }
   Uint32 m_sectionPtrI[3];
   SignalHeader header;
   union {


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20091021084024-31vcryg67psft4q2.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (jonas:3124)Jonas Oreland21 Oct