ndb -

  fix api_signal_log print of uncond signals
parent 14fa759b
...@@ -1354,6 +1354,6 @@ NdbConnection::sendTC_COMMIT_ACK(NdbApiSignal * aSignal, ...@@ -1354,6 +1354,6 @@ NdbConnection::sendTC_COMMIT_ACK(NdbApiSignal * aSignal,
Uint32 * dataPtr = aSignal->getDataPtrSend(); Uint32 * dataPtr = aSignal->getDataPtrSend();
dataPtr[0] = transId1; dataPtr[0] = transId1;
dataPtr[1] = transId2; dataPtr[1] = transId2;
tp->sendSignal(aSignal, refToNode(aTCRef)); tp->sendSignalUnCond(aSignal, refToNode(aTCRef));
} }
...@@ -817,7 +817,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){ ...@@ -817,7 +817,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){
LinearSectionPtr ptr[3]; LinearSectionPtr ptr[3];
signalLogger.sendSignal(* aSignal, signalLogger.sendSignal(* aSignal,
1, 1,
aSignal->getDataPtr(), tDataPtr,
aNode, ptr, 0); aNode, ptr, 0);
signalLogger.flushSignalLog(); signalLogger.flushSignalLog();
aSignal->theSendersBlockRef = tmp; aSignal->theSendersBlockRef = tmp;
...@@ -844,6 +844,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){ ...@@ -844,6 +844,7 @@ TransporterFacade::sendSignal(NdbApiSignal * aSignal, NodeId aNode){
int int
TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){
Uint32* tDataPtr = aSignal->getDataPtrSend();
#ifdef API_TRACE #ifdef API_TRACE
if(setSignalLog() && TRACE_GSN(aSignal->theVerId_signalNumber)){ if(setSignalLog() && TRACE_GSN(aSignal->theVerId_signalNumber)){
Uint32 tmp = aSignal->theSendersBlockRef; Uint32 tmp = aSignal->theSendersBlockRef;
...@@ -851,7 +852,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ ...@@ -851,7 +852,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){
LinearSectionPtr ptr[3]; LinearSectionPtr ptr[3];
signalLogger.sendSignal(* aSignal, signalLogger.sendSignal(* aSignal,
0, 0,
aSignal->getDataPtr(), tDataPtr,
aNode, ptr, 0); aNode, ptr, 0);
signalLogger.flushSignalLog(); signalLogger.flushSignalLog();
aSignal->theSendersBlockRef = tmp; aSignal->theSendersBlockRef = tmp;
...@@ -862,7 +863,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){ ...@@ -862,7 +863,7 @@ TransporterFacade::sendSignalUnCond(NdbApiSignal * aSignal, NodeId aNode){
(aSignal->theReceiversBlockNumber != 0)); (aSignal->theReceiversBlockNumber != 0));
SendStatus ss = theTransporterRegistry->prepareSend(aSignal, SendStatus ss = theTransporterRegistry->prepareSend(aSignal,
0, 0,
aSignal->getDataPtr(), tDataPtr,
aNode, aNode,
0); 0);
......
...@@ -128,7 +128,8 @@ private: ...@@ -128,7 +128,8 @@ private:
friend class GrepSS; friend class GrepSS;
friend class Ndb; friend class Ndb;
friend class Ndb_cluster_connection_impl; friend class Ndb_cluster_connection_impl;
friend class NdbConnection;
int sendSignalUnCond(NdbApiSignal *, NodeId nodeId); int sendSignalUnCond(NdbApiSignal *, NodeId nodeId);
bool isConnected(NodeId aNodeId); bool isConnected(NodeId aNodeId);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment