refactor: destroy threads first

include/modules/backlight.hpp

@@ -56,6 +56,6 @@ class Backlight : public ALabel {
   std::mutex                udev_thread_mutex_;
   std::vector<BacklightDev> devices_;
   // thread must destruct before shared data
-  waybar::util::SleeperThread udev_thread_;
+  util::SleeperThread udev_thread_;
 };
 }  // namespace waybar::modules

include/modules/battery.hpp

@@ -37,13 +37,14 @@ class Battery : public ALabel {
   const std::tuple<uint8_t, float, std::string> getInfos() const;
   const std::string                             formatTimeRemaining(float hoursRemaining);
 
-  util::SleeperThread   thread_;
-  util::SleeperThread   thread_timer_;
   std::vector<fs::path> batteries_;
   fs::path              adapter_;
   int                   fd_;
   std::vector<int>      wds_;
   std::string           old_status_;
+
+  util::SleeperThread   thread_;
+  util::SleeperThread   thread_timer_;
 };
 
 }  // namespace waybar::modules

include/modules/clock.hpp

@@ -14,7 +14,7 @@ class Clock : public ALabel {
   auto update() -> void;
 
  private:
-  waybar::util::SleeperThread thread_;
+  util::SleeperThread thread_;
 };
 
 }  // namespace waybar::modules

include/modules/cpu.hpp

@@ -2,12 +2,12 @@
 
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
-#include <fstream>
 #include <cstdint>
+#include <fstream>
 #include <numeric>
-#include <vector>
 #include <string>
 #include <utility>
+#include <vector>
 #include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
@@ -26,7 +26,8 @@ class Cpu : public ALabel {
   std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
 
   std::vector<std::tuple<size_t, size_t>> prev_times_;
-  waybar::util::SleeperThread             thread_;
+
+  util::SleeperThread thread_;
 };
 
 }  // namespace waybar::modules

include/modules/custom.hpp

@@ -31,11 +31,12 @@ class Custom : public ALabel {
   std::string              tooltip_;
   std::vector<std::string> class_;
   int                      percentage_;
-  waybar::util::SleeperThread thread_;
-  waybar::util::command::res  output_;
-  waybar::util::JsonParser    parser_;
   FILE*                    fp_;
   int                      pid_;
+  util::command::res       output_;
+  util::JsonParser         parser_;
+
+  util::SleeperThread thread_;
 };
 
 }  // namespace waybar::modules

include/modules/memory.hpp

@@ -15,10 +15,12 @@ class Memory : public ALabel {
 
  private:
   static inline const std::string data_dir_ = "/proc/meminfo";
+  void                            parseMeminfo();
+
   unsigned long memtotal_;
   unsigned long memfree_;
-  void                            parseMeminfo();
+
-  waybar::util::SleeperThread     thread_;
+  util::SleeperThread thread_;
 };
 
 }  // namespace waybar::modules

include/modules/network.hpp

@@ -46,8 +46,6 @@ class Network : public ALabel {
   void              clearIface();
   bool              wildcardMatch(const std::string& pattern, const std::string& text) const;
 
-  waybar::util::SleeperThread thread_;
-  waybar::util::SleeperThread thread_timer_;
   int                ifid_;
   sa_family_t        family_;
   struct sockaddr_nl nladdr_ = {0};
@@ -70,6 +68,9 @@ class Network : public ALabel {
   int32_t     signal_strength_dbm_;
   uint8_t     signal_strength_;
   uint32_t    frequency_;
+
+  util::SleeperThread thread_;
+  util::SleeperThread thread_timer_;
 };
 
 }  // namespace waybar::modules

include/modules/sway/mode.hpp

@@ -5,8 +5,8 @@
 #include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
-#include "util/sleeper_thread.hpp"
 #include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules::sway {
 
@@ -20,10 +20,11 @@ class Mode : public ALabel, public sigc::trackable {
   void onEvent(const struct Ipc::ipc_response&);
   void worker();
 
-  waybar::util::SleeperThread thread_;
-  Ipc                         ipc_;
   std::string      mode_;
   util::JsonParser parser_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
 }  // namespace waybar::modules::sway

include/modules/sway/window.hpp

@@ -25,13 +25,14 @@ class Window : public ALabel, public sigc::trackable {
   void                                                   getTree();
 
   const Bar&       bar_;
-  waybar::util::SleeperThread thread_;
-  Ipc                         ipc_;
   std::mutex       mutex_;
   std::string      window_;
   int              windowId_;
   std::string      app_id_;
   util::JsonParser parser_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
 }  // namespace waybar::modules::sway

include/modules/sway/workspaces.hpp

@@ -36,13 +36,14 @@ class Workspaces : public IModule, public sigc::trackable {
   const Json::Value&                           config_;
   std::vector<Json::Value>                     workspaces_;
   std::vector<std::string>                     workspaces_order_;
-  waybar::util::SleeperThread                  thread_;
-  Ipc                                          ipc_;
   std::mutex                                   mutex_;
   Gtk::Box                                     box_;
   util::JsonParser                             parser_;
   bool                                         scrolling_;
   std::unordered_map<std::string, Gtk::Button> buttons_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
 }  // namespace waybar::modules::sway

include/modules/temperature.hpp

@@ -18,7 +18,7 @@ class Temperature : public ALabel {
   bool                           isCritical(uint16_t);
 
   std::string         file_path_;
-  waybar::util::SleeperThread thread_;
+  util::SleeperThread thread_;
 };
 
 }  // namespace waybar::modules

src/modules/custom.cpp

@@ -25,14 +25,14 @@ void waybar::modules::Custom::delayWorker() {
   thread_ = [this] {
     bool can_update = true;
     if (config_["exec-if"].isString()) {
-      auto res = waybar::util::command::exec(config_["exec-if"].asString());
+      auto res = util::command::exec(config_["exec-if"].asString());
       if (res.exit_code != 0) {
         can_update = false;
         event_box_.hide();
       }
     }
     if (can_update) {
-      output_ = waybar::util::command::exec(config_["exec"].asString());
+      output_ = util::command::exec(config_["exec"].asString());
       dp.emit();
     }
     thread_.sleep_for(interval_);