Permalink
Browse files

Merge remote-tracking branch 'origin/candidate-3.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
  • Loading branch information...
2 parents 349279c + 8f19d1f commit 18837b1fef2a0d21f308207a162e51265745c1ae @richardkchapman richardkchapman committed Nov 30, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −1 system/mp/mpcomm.cpp
  2. +2 −1 thorlcr/activities/lookupjoin/thlookupjoinslave.cpp
View
2 system/mp/mpcomm.cpp
@@ -1024,7 +1024,7 @@ class MultiPacketHandler // TAG_SYS_MULTI
void logError(unsigned code, MultiPacketHeader &mhdr, CMessageBuffer &msg)
{
unsigned ms = msTick();
- if (lastErrMs-ms > 1000) // avoid logging too much
+ if ((ms-lastErrMs) > 1000) // avoid logging too much
{
StringBuffer errorMsg("sender=");
msg.getSender().getUrlStr(errorMsg).newline();
View
3 thorlcr/activities/lookupjoin/thlookupjoinslave.cpp
@@ -88,7 +88,7 @@ class CBroadcaster : public CSimpleInterface
Owned<IBitSet> slavesStopped;
IBCastReceive *recvInterface;
Semaphore allDoneSem;
- CriticalSection allDoneLock;
+ CriticalSection allDoneLock, bcastOtherCrit;
bool allDone, allDoneWaiting, allRequestStop, stopping;
Owned<IBitSet> slavesDone, slavesStopping;
@@ -190,6 +190,7 @@ class CBroadcaster : public CSimpleInterface
unsigned psuedoNode = (myNode<origin) ? slaves-origin+myNode : myNode-origin;
CMessageBuffer replyMsg;
// sends to all in 1st pass, then waits for ack from all
+ CriticalBlock b(bcastOtherCrit);
for (unsigned sendRecv=0; sendRecv<2 && !activity.queryAbortSoon(); sendRecv++)
{
unsigned i = 0;

0 comments on commit 18837b1

Please sign in to comment.