diff options
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/upstream/upstreamapply.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/upstream/upstreamcache.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/zenserver/upstream/upstreamapply.cpp b/src/zenserver/upstream/upstreamapply.cpp index c719b225d..3d29f2228 100644 --- a/src/zenserver/upstream/upstreamapply.cpp +++ b/src/zenserver/upstream/upstreamapply.cpp @@ -188,9 +188,9 @@ public: virtual void GetStatus(CbObjectWriter& Status) override { Status << "upstream_worker_threads" << m_Options.UpstreamThreadCount; - Status << "upstream_queue_count" << m_UpstreamAsyncWorkPool.PendingWork(); + Status << "upstream_queue_count" << m_UpstreamAsyncWorkPool.PendingWorkItemCount(); Status << "downstream_worker_threads" << m_Options.DownstreamThreadCount; - Status << "downstream_queue_count" << m_DownstreamAsyncWorkPool.PendingWork(); + Status << "downstream_queue_count" << m_DownstreamAsyncWorkPool.PendingWorkItemCount(); Status.BeginArray("endpoints"); for (const auto& Ep : m_Endpoints) diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp index 245097796..2a9e67c06 100644 --- a/src/zenserver/upstream/upstreamcache.cpp +++ b/src/zenserver/upstream/upstreamcache.cpp @@ -1490,7 +1490,7 @@ public: { for (uint32_t Idx = 0; Idx < m_Options.ThreadCount; Idx++) { - m_UpstreamThreads.emplace_back(&UpstreamCacheImpl::ProcessUpstreamQueue, this); + m_UpstreamThreads.emplace_back(&UpstreamCacheImpl::ProcessUpstreamQueue, this, Idx + 1); } m_EndpointMonitorThread = std::thread(&UpstreamCacheImpl::MonitorEndpoints, this); @@ -1947,8 +1947,11 @@ private: } } - void ProcessUpstreamQueue() + void ProcessUpstreamQueue(int ThreadIndex) { + std::string ThreadName = fmt::format("upstream_{}", ThreadIndex); + SetCurrentThreadName(ThreadName); + for (;;) { UpstreamCacheRecord CacheRecord; |