[Filesystem] Fix for thread that may outlive object it reffers to

[Verification] tizen.filesystem methods work properly. Worker and insstance destructors work properly.

Change-Id: I5724bd798c868aaba23e9f4e5c5f4ba0b13d2faf
Signed-off-by: Arkadiusz Pietraszek <a.pietraszek@partner.samsung.com>

diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc
index be8e802..52f5948 100644 (file)
--- a/src/filesystem/filesystem_instance.cc
+++ b/src/filesystem/filesystem_instance.cc
@@ -145,6 +145,12 @@ FilesystemInstance::Worker::Worker()
 }
 
 FilesystemInstance::Worker::~Worker() {
+  if(!exit && thread.joinable()) {
+    stop();
+  }
+}
+
+void FilesystemInstance::Worker::stop() {
   {
     // use memory barrier for exit flag (could be std::atomic_flag, but we use lock instead)
     std::lock_guard<std::mutex> lck{jobs_mtx};
@@ -228,6 +234,7 @@ FilesystemInstance::FilesystemInstance() {
 
 FilesystemInstance::~FilesystemInstance() {
   ScopeLogger();
+  worker.stop();
   FilesystemManager::GetInstance().StopListening();
   FilesystemManager::GetInstance().RemoveListener();
 }

diff --git a/src/filesystem/filesystem_instance.h b/src/filesystem/filesystem_instance.h
index 3721496..617fab3 100644 (file)
--- a/src/filesystem/filesystem_instance.h
+++ b/src/filesystem/filesystem_instance.h
@@ -80,6 +80,7 @@ class FilesystemInstance : public common::ParsedInstance, FilesystemStateChangeL
     void main(void);
 
    public:
+    void stop();
     Worker();
     ~Worker();