multithreaded and threshold time difference

Author: marttcw

README.md

@@ -1,29 +1,52 @@
 # steamcountsnotifyd
-SteamCountsNotifyD is a daemon that notifies you when your selected games gets some player activity
+SteamCountsNotifyD is a multithreaded daemon that notifies you when your selected games gets some player activity
 
 ## License
 SteamCountsNotifyD is released under a free software license (MIT)
 
 ## Dependencies
-Minimal dependencies needed, only libcurl to download and libnotify to notify.
-* [libcurl](https://curl.haxx.se/libcurl/)
-* [libnotify](https://developer.gnome.org/libnotify/)
+Minimal dependencies needed:
+* [libcurl](https://curl.haxx.se/libcurl/) - For downloading
+* [libnotify](https://developer.gnome.org/libnotify/) - For notification
 
 ## Requirements to build
-* [meson](https://mesonbuild.com/)
-* [ninja](https://ninja-build.org/)
+* [meson](https://mesonbuild.com/) - To generate ninja file compile/install script
+* [ninja](https://ninja-build.org/) - To compile/install the project
 * C++17 capable compiler
   * [GCC](https://gcc.gnu.org/) - Recommends 9.2 or 8.3
   * [Clang](https://clang.llvm.org/)
+### C++ Requirements
+* C++11 for std::thread
+* C++11 for std::function
+* C++11 for lambda expressions
+* C++17 for std::filesystem
+* C++17 for cleaner for loop over std::pair
 
 ## Instructions
 ### Compile
 * `cd steamcountsnotifyd`
 * `meson build && cd build`
 * `ninja`
 ### Install
-* TODO
+* `cd steamcountsnotifyd/build/`
+* `ninja install` - use `sudo` if necessary
+### Uninstall
+* `cd steamcountsnotifyd/build/`
+* `ninja uninstall` - use `sudo` if necessary
 
 ## Usage
-* TODO
+* Refer to `steamcountsnotifyd -h`
+
+## Configuration
+* Uses xdg directory: `$HOME/.config/steamcountsnotifyd/config`
+### Example
+```
+interval 1
+thresholdinterval 2
+connectiontimeout 10
+notifytimeout 10
+
+newappid 244630 "NEOTOKYO" 0
+newappid 282440 "Quake Live" 100
+```
 

meson.build

@@ -4,13 +4,25 @@ project('steamcountsnotifyd'
   , version : 'PRE-ALPHA 20190910'
 )
 
-add_project_arguments(['-lstdc++fs'], language : 'cpp')
+cc = meson.get_compiler('cpp')
+
+# C++17 filesystem arguments
+if cc.get_id() == 'gcc'
+  message('Compiler: GCC')
+  add_project_arguments(['-lstdc++fs'], language : 'cpp')
+  add_project_link_arguments(['-lstdc++fs'], language : 'cpp')
+elif cc.get_id() == 'clang'
+  message('Compiler: LLVM/clang')
+  add_project_arguments(['-stdlib=libc++'], language : 'cpp')
+  add_project_link_arguments(['-stdlib=libc++','-lstdc++fs'], language : 'cpp')
+endif
 
 src_inc = include_directories('./src/')
-local_inc = include_directories('/usr/local/include/')
 
-libcurl_dep = dependency('libcurl', required : true)
-libnotify_dep = dependency('libnotify', required : true)
+# Dependencies
+thread_dep = dependency('threads')                        # C++11 threads
+libcurl_dep = dependency('libcurl', required : true)      # libcurl
+libnotify_dep = dependency('libnotify', required : true)  # libnotify
 
 src = [
     './src/main.cpp'
@@ -24,8 +36,9 @@ src = [
 
 executable('steamcountsnotifyd'
            , sources : src
-           , dependencies : [libcurl_dep, libnotify_dep]
-           , include_directories : [src_inc, local_inc]
+           , dependencies : [thread_dep, libcurl_dep, libnotify_dep]
+           , include_directories : [src_inc]
+           , install : true
 )
 
 

src/core/params.cpp

@@ -82,22 +82,27 @@ param::config::~config()
 {
 }
 
-unsigned int param::config::getIntervalMins()
+unsigned int param::config::getIntervalMins() const
 {
   return this->intervalMins;
 }
 
-unsigned int param::config::getConnectionTimeout()
+unsigned int param::config::getThresholdIntervalMins() const
+{
+  return this->thresholdIntervalMins;
+}
+
+unsigned int param::config::getConnectionTimeout() const
 {
   return this->connectionTimeout;
 }
 
-unsigned int param::config::getNotificationTimeout()
+unsigned int param::config::getNotificationTimeout() const
 {
   return this->notificationTimeout;
 }
 
-param::appidNameMap param::config::getAppidMap()
+param::appidNameMap param::config::getAppidMap() const
 {
   return this->appidMap;
 }

src/core/params.h

@@ -30,11 +30,11 @@ namespace param
   public:
     config();
     ~config();
-    unsigned int getIntervalMins();
-    unsigned int getThresholdIntervalMins();
-    unsigned int getConnectionTimeout();
-    unsigned int getNotificationTimeout();
-    appidNameMap getAppidMap();
+    unsigned int getIntervalMins() const;
+    unsigned int getThresholdIntervalMins() const;
+    unsigned int getConnectionTimeout() const;
+    unsigned int getNotificationTimeout() const;
+    appidNameMap getAppidMap() const;
     bool         setFromArgs(std::deque<std::string> &args);
   };
 }

src/main.cpp

@@ -6,13 +6,16 @@
  *
  * TODO:
  *  Threshold interval
+ *  Threadding
  *  Daemonise
  */
 
 #include <iostream>
 #include <chrono>
 #include <thread>
 #include <deque>
+#include <vector>
+#include <functional>
 
 #include "wrapper/curl.h"
 #include "wrapper/notify.h"
@@ -24,24 +27,23 @@ int main(int argc, char **argv)
 {
   std::deque<std::string> args = tool::toArgs(argc, argv);
   args.pop_front();     // Program execution name not needed
-  
   param::config config;
-  unsigned int  currentCount = 0;
-  bool          running  = true;
-  bool          notify   = false;
-  std::string   messageTitle;
-  std::string   messageDetails;
-  wrapper::curl curlJob;
+  bool          running = config.setFromArgs(args);
 
-  running = config.setFromArgs(args);
+  // Functional lambda
+  std::function<void(unsigned int, param::appidName_s, const param::config &)> appidRunningThread = [](unsigned int appid, param::appidName_s game, const param::config &config)
+  {
+    unsigned int  currentCount = 0;
+    bool          notify   = false;
+    bool          running  = true;
+    std::string   messageTitle;
+    std::string   messageDetails;
+    wrapper::curl curlJob;
+    unsigned int  currentThreadInterval = config.getIntervalMins();
 
-  curlJob.setTimeout(config.getConnectionTimeout());
+    curlJob.setTimeout(config.getConnectionTimeout());
 
-  // Running state
-  while (running)
-  {
-    // Loop through list
-    for (const auto &[appid, game] : config.getAppidMap())
+    while (running)
     {
       curlJob.setUrl("https://api.steampowered.com/ISteamUserStats/GetNumberOfCurrentPlayers/v1/?appid="+std::to_string(appid));
 
@@ -78,10 +80,31 @@ int main(int argc, char **argv)
 
         notify = false;
       }
+
+      // Delay
+      std::this_thread::sleep_for(std::chrono::minutes(currentThreadInterval));
+    }
+  };
+
+  // If help or version message not used (normal execution)
+  if (running)
+  {
+    // Initialise and run threads for each appid/game 
+    std::vector<std::thread> appidThreadVector;
+
+    for (const auto &[appid, game] : config.getAppidMap())
+    {
+      appidThreadVector.emplace_back(std::thread(appidRunningThread, appid, game, config));
     }
 
-    // Delay
-    std::this_thread::sleep_for(std::chrono::minutes(config.getIntervalMins()));
+    // Join thread if joinable
+    for (std::thread &thread : appidThreadVector)
+    {
+      if (thread.joinable())
+      {
+        thread.join();
+      }
+    }
   }
 
   return 0;