Return no task error in case of nothing to stop

Change-Id: I5fc3740c1e990eec816fff7d19a476204d04ea2d
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/src/framework/client/content-screening.cpp b/src/framework/client/content-screening.cpp
index 6e0c8e3..abaa660 100644 (file)
--- a/src/framework/client/content-screening.cpp
+++ b/src/framework/client/content-screening.cpp
@@ -465,8 +465,8 @@ int csr_cs_scan_cancel(csr_cs_context_h handle)
 
        auto hExt = reinterpret_cast<Client::HandleExt *>(handle);
 
-       if (hExt->isStopped())
-               return CSR_ERROR_NONE;
+       if (!hExt->hasRunning() || hExt->isStopped())
+               return CSR_ERROR_NO_TASK;
 
        hExt->stop();
 

diff --git a/src/framework/client/handle-ext.cpp b/src/framework/client/handle-ext.cpp
index 8e67aeb..eb317c3 100644 (file)
--- a/src/framework/client/handle-ext.cpp
+++ b/src/framework/client/handle-ext.cpp
@@ -55,6 +55,19 @@ bool HandleExt::isStopped() const
        return m_stop.load();
 }
 
+bool HandleExt::hasRunning()
+{
+       std::unique_lock<std::mutex> l(m_mutex);
+       auto it = m_workerMap.begin();
+
+       while (it != m_workerMap.end()) {
+               if (!it->second.isDone.load())
+                       return true;
+       }
+
+       return false;
+}
+
 void HandleExt::eraseJoinableIf(std::function<bool(const WorkerMapPair &)> pred)
 {
        std::unique_lock<std::mutex> l(m_mutex);

diff --git a/src/framework/client/handle-ext.h b/src/framework/client/handle-ext.h
index 6636597..7363abd 100644 (file)
--- a/src/framework/client/handle-ext.h
+++ b/src/framework/client/handle-ext.h
@@ -45,6 +45,7 @@ public:
        void dispatchAsync(const Task &task);
        void stop(void);
        bool isStopped(void) const;
+       bool hasRunning(void);
 
        Callback m_cb; // TODO: to refine..