1 files changed, 55 insertions, 12 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 3de3db0..c2d059b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3912,6 +3912,14 @@ connected:
     std::string jobId;
     unsigned char header[80] = {};
     uint256 target;
+    // Cached answer to "which block is this job built on", for the
+    // mining.notify handler below -- see the comment there. Session-local, so
+    // a reconnect re-resolves rather than trusting an answer obtained before
+    // a possible change of pool.
+    uint256 hashPrevResolved;           // prevhash the cached answer describes
+    bool fPrevResolved       = false;   // whether that answer exists yet
+    int  nPrevHeight         = -1;      // its height, or -1 == unknown to us
+    int  nBestHeightResolved = -1;      // nBestHeight when we last resolved
     double currentDifficulty = 1.0; // updated by mining.set_difficulty from pool
     bool haveJob         = false;
     bool gotSubscribeAck = false;
@@ -4047,22 +4055,57 @@ connected:
                                     // actually hash (== p[2] of the notify);
                                     // a brief cs_main lookup is safe here --
                                     // this thread holds no other lock.
+                                    //
+                                    // Resolving it is the expensive half, and
+                                    // this is the socket-reading thread: block
+                                    // validation can hold cs_main for a long
+                                    // time, and every moment spent waiting on
+                                    // it here is a moment set_difficulty and
+                                    // share responses are not being handled.
+                                    // Most notifies in a round are a new job
+                                    // on the SAME tip, so the answer is cached
+                                    // and re-resolved only when it could come
+                                    // out differently: a prevhash we have not
+                                    // resolved, or one we could NOT resolve
+                                    // last time while the chain has since
+                                    // moved (unknown -> known). A block's
+                                    // height is fixed once mapBlockIndex knows
+                                    // it, so a cached "known" never goes
+                                    // stale. nBestHeight is read unlocked on
+                                    // purpose -- it only decides whether to
+                                    // repeat a lookup, never what gets
+                                    // printed, so a stale read costs at most
+                                    // one deferred or one extra lookup.
+                                    // The line still prints in full for every
+                                    // job, cached or not.
                                     uint256 hashPrev;
                                     memcpy(&hashPrev, header + 4, 32);
-                                    int nPrevHeight = -1;
-                                    CRITICAL_BLOCK(cs_main)
+                                    if (LogAcceptsCategory("worker"))
                                     {
-                                        map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrev);
-                                        if (mi != mapBlockIndex.end())
-                                            nPrevHeight = (*mi).second->nHeight;
+                                        int nBestHeightNow = nBestHeight;
+                                        if (!fPrevResolved
+                                            || hashPrev != hashPrevResolved
+                                            || (nPrevHeight < 0 && nBestHeightNow != nBestHeightResolved))
+                                        {
+                                            nPrevHeight = -1;
+                                            CRITICAL_BLOCK(cs_main)
+                                            {
+                                                map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrev);
+                                                if (mi != mapBlockIndex.end())
+                                                    nPrevHeight = (*mi).second->nHeight;
+                                            }
+                                            hashPrevResolved    = hashPrev;
+                                            nBestHeightResolved = nBestHeightNow;
+                                            fPrevResolved       = true;
+                                        }
+                                        if (nPrevHeight >= 0)
+                                            LogPrint("worker", "[pool->worker] new job %s received, prevhash %s (known, job height %d)\n",
+                                                     jobId.c_str(), hashPrev.GetHex().c_str(),
+                                                     nPrevHeight + 1);
+                                        else
+                                            LogPrint("worker", "[pool->worker] new job %s received, prevhash %s (unknown to our chain)\n",
+                                                     jobId.c_str(), hashPrev.GetHex().c_str());
                                     }
-                                    if (nPrevHeight >= 0)
-                                        LogPrint("worker", "[pool->worker] new job %s received, prevhash %s (known, job height %d)\n",
-                                                 jobId.c_str(), hashPrev.GetHex().c_str(),
-                                                 nPrevHeight + 1);
-                                    else
-                                        LogPrint("worker", "[pool->worker] new job %s received, prevhash %s (unknown to our chain)\n",
-                                                 jobId.c_str(), hashPrev.GetHex().c_str());
                                     SetParticipantMiningStatus("hashing job " + jobId);
                                 }
                             }