Prevent from call method on partially destroyed object

[Bug]           startAsync can cause call method on partially destroyed object
[Cause]         async call are processed while ZoneManager is being destroyed
[Solution]      Ensure that all async calls was ended
[Verification]  Set EVENT_TIMEOUT=5 (ut-zones-manager.cpp), build, install,
                run ZonesManagerSuite/StartShutdownZoneTest with 1000
                times less speed.

Change-Id: I00bc8c0926be8a9a62ec23b81f62a2827db4799b

diff --git a/server/zone.cpp b/server/zone.cpp
index f6fb188..1c4d2b2 100644 (file)
--- a/server/zone.cpp
+++ b/server/zone.cpp
@@ -81,8 +81,12 @@ Zone::~Zone()
     // Make sure all OnNameLostCallbacks get finished and no new will
     // get called before proceeding further. This guarantees no race
     // condition on the reconnect thread.
-    Lock lock(mReconnectMutex);
-    disconnect();
+    {
+        Lock lock(mReconnectMutex);
+        disconnect();
+    }
+    // wait for all tasks to complete
+    mWorker.reset();
 }
 
 const std::vector<boost::regex>& Zone::getPermittedToSend() const

diff --git a/server/zones-manager.cpp b/server/zones-manager.cpp
index 840d8c4..42a3a48 100644 (file)
--- a/server/zones-manager.cpp
+++ b/server/zones-manager.cpp
@@ -187,6 +187,8 @@ ZonesManager::~ZonesManager()
             LOGE("Failed to stop all of the zones");
         }
     }
+    // wait for all tasks to complete
+    mWorker.reset();
 
     LOGD("ZonesManager object destroyed");
 }