Remove obsolete JobQueue thread tracking

src/ripple/core/JobQueue.h

@@ -92,10 +92,6 @@ public:
     // Cannot be const because LoadMonitor has no const methods.
     bool isOverloaded ();
 
-    /** Get the Job corresponding to a thread.  If no thread, use the current
-        thread. */
-    Job* getJobForThread(std::thread::id const& id = {}) const;
-
     // Cannot be const because LoadMonitor has no const methods.
     Json::Value getJson (int c = 0);
 
@@ -109,8 +105,6 @@ private:
     JobDataMap m_jobData;
     JobTypeData m_invalidJobData;
 
-    std::map <std::thread::id, Job*> m_threadIds;
-
     // The number of jobs currently in processTask()
     int m_processCount;
 

src/ripple/core/impl/JobQueue.cpp

@@ -305,16 +305,6 @@ JobQueue::getJson (int c)
     return ret;
 }
 
-Job*
-JobQueue::getJobForThread (std::thread::id const& id) const
-{
-    auto tid = (id == std::thread::id()) ? std::this_thread::get_id() : id;
-
-    std::lock_guard <std::mutex> lock (m_mutex);
-    auto i = m_threadIds.find (tid);
-    return (i == m_threadIds.end()) ? nullptr : i->second;
-}
-
 JobTypeData&
 JobQueue::getJobTypeData (JobType type)
 {
@@ -400,8 +390,6 @@ JobQueue::getNextJob (Job& job)
     job = *iter;
     m_jobSet.erase (iter);
 
-    m_threadIds[std::this_thread::get_id()] = &job;
-
     --data.waiting;
     ++data.running;
 }
@@ -422,10 +410,6 @@ JobQueue::finishJob (JobType type)
         m_workers.addTask ();
     }
 
-    if (! m_threadIds.erase (std::this_thread::get_id()))
-    {
-        assert (false);
-    }
     --data.running;
 }
 

src/ripple/server/impl/ServerHandlerImp.cpp

@@ -237,8 +237,6 @@ ServerHandlerImp::processRequest (Port const& port,
         std::string forwardedFor, std::string user)
 {
     auto rpcJ = app_.journal ("RPC");
-    // Move off the webserver thread onto the JobQueue.
-    assert (app_.getJobQueue().getJobForThread());
 
     Json::Value jsonRPC;
     {