timespec last_modified = first_modified;
struct stat buf;
for ( ;; ) {
- sleep(1);
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit_modified.wait_for(lock, chrono::seconds(1), []() { return threads_should_quit; });
+ }
if (threads_should_quit) {
return;
void ImageInput::shutdown_updaters()
{
- // TODO: Kick these out of the sleep before one second?
- threads_should_quit = true;
-
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit = true;
+ threads_should_quit_modified.notify_all();
+ }
for (auto &it : update_threads) {
it.second.join();
}
mutex ImageInput::all_images_lock;
map<string, shared_ptr<const ImageInput::Image>> ImageInput::all_images;
map<string, thread> ImageInput::update_threads;
-volatile bool ImageInput::threads_should_quit = false;
+mutex ImageInput::threads_should_quit_mu;
+bool ImageInput::threads_should_quit = false;
+condition_variable ImageInput::threads_should_quit_modified;
#include <movit/flat_input.h>
#include <stdbool.h>
#include <time.h>
+#include <condition_variable>
#include <cstdint>
#include <map>
#include <memory>
static std::mutex all_images_lock;
static std::map<std::string, std::shared_ptr<const Image>> all_images;
static std::map<std::string, std::thread> update_threads;
- static volatile bool threads_should_quit;
+
+ static std::mutex threads_should_quit_mu;
+ static bool threads_should_quit; // Under threads_should_quit_mu.
+ static std::condition_variable threads_should_quit_modified; // Signals when threads_should_quit is set.
};
#endif // !defined(_IMAGE_INPUT_H)