reapack

commit f48d25aa675419c80aa760658505c6f04d8b8a63
parent c599b87bc445875eb77b9574a90337f86196f764
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon,  6 Feb 2017 14:40:01 -0500

download: refactor abort and isAbort

Diffstat:
M
src/download.cpp
 | 
14
--------------
M
src/download.hpp
 | 
8
+++-----

2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/download.cpp b/src/download.cpp
@@ -131,13 +131,6 @@ void Download::setState(const State state)
   }
 }
 
-bool Download::isAborted()
-{
-  WDL_MutexLock lock(&m_mutex);
-
-  return m_aborted;
-}
-
 void Download::start()
 {
   DownloadThread *thread = new DownloadThread;
@@ -145,13 +138,6 @@ void Download::start()
   onFinish([thread] { delete thread; });
 }
 
-void Download::abort()
-{
-  WDL_MutexLock lock(&m_mutex);
-
-  m_aborted = true;
-}
-
 void Download::exec(CURL *curl)
 {
   DownloadNotifier::get()->notify({this, Running});
diff --git a/src/download.hpp b/src/download.hpp
@@ -65,14 +65,14 @@ public:
   void setState(State);
   State state() const { return m_state; }
   const std::string &contents() { return m_contents; }
-  bool isAborted();
+  bool isAborted() { return m_aborted; }
 
   void onStart(const VoidSignal::slot_type &slot) { m_onStart.connect(slot); }
   void onFinish(const VoidSignal::slot_type &slot) { m_onFinish.connect(slot); }
   void setCleanupHandler(const CleanupHandler &cb) { m_cleanupHandler = cb; }
 
   void start();
-  void abort();
+  void abort() { m_aborted = true; }
 
   void exec(CURL *);
 
@@ -88,10 +88,8 @@ private:
   NetworkOpts m_opts;
   int m_flags;
 
-  WDL_Mutex m_mutex;
-
   State m_state;
-  bool m_aborted;
+  std::atomic_bool m_aborted;
   std::string m_contents;
 
   VoidSignal m_onStart;