stop control thread during shutdown to prevent crashes

unit tests do fast init/destroy cycles, which resulted in control
thread still using resources (e.g. display) that were already destroyed.

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c
index f487f79..540ebf5 100644 (file)
--- a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c
+++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c
@@ -86,5 +86,8 @@ ilm_isInitialized()
 ILM_EXPORT ilmErrorTypes
 ilm_destroy()
 {
-    return gIlmCommonPlatformFunc.destroy();
+    ilmErrorTypes retVal = gIlmCommonPlatformFunc.destroy();
+    ilmClient_destroy();
+    ilmControl_destroy(); // block until control thread is stopped
+    return retVal;
 }

diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index dceb0e8..4f63c39 100644 (file)
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -1429,6 +1429,11 @@ wayland_destroy()
 {
     struct ilm_control_context *ctx = &ilm_context;
     ctx->valid = 0;
+    void* threadRetVal = NULL;
+    pthread_cancel(ctx->thread);
+    if (0 != pthread_join(ctx->thread, &threadRetVal)) {
+        fprintf(stderr, "failed to join control thread\n");
+    }
 }
 
 static void