PolytreeDE
/
polybar
mirror of https://github.com/polybar/polybar.git
1
0
Fork 0
Code Releases Activity

refactor(registry): Changed naming of wait vars

This commit is contained in:
Michael Carlberg 2016-06-21 07:47:51 +02:00
parent e36cf8518a
commit 3ea64e5cbe
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/registry.hpp
View File

@ -29,8 +29,8 @@ class Registry
std::vector<std::unique_ptr<RegistryModuleEntry>> modules; std::vector<std::unique_ptr<RegistryModuleEntry>> modules;
std::mutex wait_mtx; std::mutex wait_lock;
std::condition_variable wait_cv; std::condition_variable wait_handler;
public: public:
Registry(); Registry();

24
src/registry.cpp
View File

@ -45,9 +45,8 @@ void Registry::load()
this->logger->debug("Loading modules"); this->logger->debug("Loading modules");
for (auto &&entry : this->modules) { for (auto &&entry : this->modules) {
std::lock_guard<std::mutex> wait_lck(this->wait_mtx); std::lock_guard<std::mutex> lck(this->wait_lock);
entry->module->start(); entry->module->start();
std::this_thread::sleep_for(10ms);
} }
} }
@ -64,19 +63,21 @@ void Registry::unload()
// Release wait lock // Release wait lock
{ {
std::lock_guard<std::mutex> wait_lck(this->wait_mtx); std::lock_guard<std::mutex> lck(this->wait_lock);
this->wait_cv.notify_one(); this->wait_handler.notify_all();
} }
for (auto &&entry : this->modules) for (auto &&entry : this->modules) {
this->logger->debug("Stopping module: "+ entry->module->name());
entry->module->stop(); entry->module->stop();
}
} }
bool Registry::wait() bool Registry::wait()
{ {
log_trace("STAGE "+ std::to_string(this->stage())); log_trace("STAGE "+ std::to_string(this->stage()));
std::unique_lock<std::mutex> wait_lck(this->wait_mtx); std::unique_lock<std::mutex> lck(this->wait_lock);
auto stage = this->stage(); auto stage = this->stage();
@ -91,7 +92,7 @@ bool Registry::wait()
if (!entry->warmedup) ready = false; if (!entry->warmedup) ready = false;
if (!ready) { if (!ready) {
this->wait_cv.wait(wait_lck); this->wait_handler.wait(lck);
continue; continue;
} }
@ -103,7 +104,7 @@ bool Registry::wait()
} }
else if (stage == STAGE_3) else if (stage == STAGE_3)
this->wait_cv.wait(wait_lck); this->wait_handler.wait(lck);
else if (stage == STAGE_4) else if (stage == STAGE_4)
this->modules.clear(); this->modules.clear();
@ -130,7 +131,7 @@ void Registry::notify(std::string module_name)
mod_entry->warmedup = true; mod_entry->warmedup = true;
} }
std::unique_lock<std::mutex> wait_lck(this->wait_mtx); std::unique_lock<std::mutex> lck(this->wait_lock);
try { try {
this->logger->debug("Refreshing output for module: "+ module_name); this->logger->debug("Refreshing output for module: "+ module_name);
@ -140,10 +141,9 @@ void Registry::notify(std::string module_name)
this->logger->error(e.what()); this->logger->error(e.what());
} }
lck.unlock();
wait_lck.unlock(); this->wait_handler.notify_one();
this->wait_cv.notify_one();
} }
std::string Registry::get(std::string module_name) std::string Registry::get(std::string module_name)