message: threads: add thread names to deadlock debugging message
  Also refactor CLockLocation to use an initialization list.
diff: // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  #include <sync.h>
  +#include <tinyformat.h>
  #include <logging.h>
  #include <util/strencodings.h>
  +#include <util/threadnames.h>
  #include <stdio.h>
  @@ -37,23 +39,30 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
  //
  struct CLockLocation {
  - CLockLocation(const char* pszName, const char* pszFile, int nLine, bool fTryIn)
  - {
  - mutexName = pszName;
  - sourceFile = pszFile;
  - sourceLine = nLine;
  - fTry = fTryIn;
  - }
  + CLockLocation(
  + const char* pszName,
  + const char* pszFile,
  + int nLine,
  + bool fTryIn,
  + const std::string& thread_name)
  + : fTry(fTryIn),
  + mutexName(pszName),
  + sourceFile(pszFile),
  + m_thread_name(thread_name),
  + sourceLine(nLine) {}
  std::string ToString() const
  {
  - return mutexName + " " + sourceFile + ":" + itostr(sourceLine) + (fTry ? " (TRY)" : "");
  + return tfm::format(
  + "%s %s:%s%s (in thread %s)",
  + mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name);
  }
  private:
  bool fTry;
  std::string mutexName;
  std::string sourceFile;
  + const std::string& m_thread_name;
  int sourceLine;
  };
  @@ -125,7 +134,7 @@ static void push_lock(void* c, const CLockLocation& locklocation)
  std::pair<void*, void*> p1 = std::make_pair(i.first, c);
  if (lockdata.lockorders.count(p1))
  continue;
  - lockdata.lockorders[p1] = g_lockstack;
  + lockdata.lockorders.emplace(p1, g_lockstack);
  std::pair<void*, void*> p2 = std::make_pair(c, i.first);
  lockdata.invlockorders.insert(p2);
  @@ -141,7 +150,7 @@ static void pop_lock()
  void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
  {
  - push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry));
  + push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry, util::ThreadGetInternalName()));
  }
  void LeaveCritical()
  