# HG changeset patch # User Sebastien Jodogne # Date 1679742459 -3600 # Node ID 5ec3dcdf78b91e892bc3561e8a5449e679b3920a # Parent cddf28cfcd8ddf25d659e531bb85f3c783df6ffe renamed HousekeeperThread as MemoryTrimmingThread to avoid confusion with Housekeeper plugin diff -r cddf28cfcd8d -r 5ec3dcdf78b9 OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Sat Mar 25 11:38:37 2023 +0100 +++ b/OrthancServer/Sources/ServerContext.cpp Sat Mar 25 12:07:39 2023 +0100 @@ -109,10 +109,10 @@ #if HAVE_MALLOC_TRIM == 1 - void ServerContext::HousekeeperThread(ServerContext* that, - unsigned int sleepDelay) + void ServerContext::MemoryTrimmingThread(ServerContext* that, + unsigned int sleepDelay) { - // note, right now, this thread is started only if malloc_trim is defined + // This thread is started only if malloc_trim is defined while (!that->done_) { boost::this_thread::sleep(boost::posix_time::milliseconds(sleepDelay)); @@ -439,9 +439,9 @@ changeThread_ = boost::thread(ChangeThread, this, (unitTesting ? 20 : 100)); #if HAVE_MALLOC_TRIM == 1 - housekeeperThread_ = boost::thread(HousekeeperThread, this, 100); + memoryTrimmingThread_ = boost::thread(MemoryTrimmingThread, this, 100); #else - LOG(INFO) << "Your platform does not support malloc_trim(), not starting the housekeeper thread"; + LOG(INFO) << "Your platform does not support malloc_trim(), not starting the memory trimming thread"; #endif dynamic_cast(*dcmtkTranscoder_).SetLossyQuality(lossyQuality); @@ -486,9 +486,9 @@ saveJobsThread_.join(); } - if (housekeeperThread_.joinable()) + if (memoryTrimmingThread_.joinable()) { - housekeeperThread_.join(); + memoryTrimmingThread_.join(); } jobsEngine_.GetRegistry().ResetObserver(); diff -r cddf28cfcd8d -r 5ec3dcdf78b9 OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Sat Mar 25 11:38:37 2023 +0100 +++ b/OrthancServer/Sources/ServerContext.h Sat Mar 25 12:07:39 2023 +0100 @@ -188,8 +188,8 @@ unsigned int sleepDelay); #if HAVE_MALLOC_TRIM == 1 - static void HousekeeperThread(ServerContext* that, - unsigned int sleepDelay); + static void MemoryTrimmingThread(ServerContext* that, + unsigned int sleepDelay); #endif void SaveJobsEngine(); @@ -235,7 +235,7 @@ SharedMessageQueue pendingChanges_; boost::thread changeThread_; boost::thread saveJobsThread_; - boost::thread housekeeperThread_; + boost::thread memoryTrimmingThread_; std::unique_ptr queryRetrieveArchive_; std::string defaultLocalAet_;