From 573907447db3e19d49c0bcaf3f659cf2d599c738 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 16 Nov 2023 18:50:27 +0100 Subject: blocking queue fix (#550) * make BlockingQueue::m_CompleteAdding non-atomic * ZenCacheDiskLayer::Flush logging * name worker threads in ZenCacheDiskLayer::DiscoverBuckets * name worker threads in gcv2 * improved logging in ZenServerInstance * scrub threadpool naming * remove waitpid handling, we should just call wait to kill zombie processes --- src/zenutil/include/zenutil/zenserverprocess.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/zenutil/include') diff --git a/src/zenutil/include/zenutil/zenserverprocess.h b/src/zenutil/include/zenutil/zenserverprocess.h index 60adfba54..14d19ad39 100644 --- a/src/zenutil/include/zenutil/zenserverprocess.h +++ b/src/zenutil/include/zenutil/zenserverprocess.h @@ -70,6 +70,7 @@ struct ZenServerInstance void Detach(); inline int GetPid() { return m_Process.Pid(); } inline void SetOwnerPid(int Pid) { m_OwnerPid = Pid; } + bool IsRunning(); void SetTestDir(std::filesystem::path TestDir); inline void SpawnServer(int BasePort = 0, std::string_view AdditionalServerArgs = std::string_view()) @@ -95,6 +96,7 @@ private: std::filesystem::path m_TestDir; int m_BasePort = 0; std::optional m_OwnerPid; + std::string m_Name; void CreateShutdownEvent(int BasePort); void SpawnServer(int BasePort, std::string_view AdditionalServerArgs, int WaitTimeoutMs); -- cgit v1.2.3