CELIX-351: Adds mutex usage to shell_tui to protect services changes

apache · Feb 11, 2016 · 9434821 · 9434821
1 parent 58f521f
commit 9434821
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
@@ -57,7 +57,11 @@ if (DEPENDENCY_MANAGER)
         private/src/dm_dependency_manager_impl
     )
     set_target_properties(dependency_manager_so PROPERTIES SOVERSION 1)
-    target_link_libraries(dependency_manager_so celix_framework)
+    if (APPLE) 
+        target_link_libraries(dependency_manager_so celix_framework "-undefined dynamic_lookup")
+    else()
+        target_link_libraries(dependency_manager_so celix_framework)
+    endif()
 
    	include_directories("public/include")
    	include_directories("private/include")

diff --git a/shell_tui/private/include/shell_tui.h b/shell_tui/private/include/shell_tui.h
@@ -41,6 +41,7 @@ struct shellTuiActivator {
     service_tracker_pt tracker;
     bool running;
     celix_thread_t runnable;
+    celix_thread_mutex_t mutex;
 };
 
 typedef struct shellTuiActivator * shell_tui_activator_pt;

diff --git a/shell_tui/private/src/activator.c b/shell_tui/private/src/activator.c
@@ -35,13 +35,19 @@
 
 static celix_status_t activator_addShellService(void *handle, service_reference_pt ref, void *svc) {
     shell_tui_activator_pt act = (shell_tui_activator_pt) handle;
+    celixThreadMutex_lock(&act->mutex);
     act->shell = svc;
+    celixThreadMutex_unlock(&act->mutex);
     return CELIX_SUCCESS;
 }
 
 static celix_status_t activator_removeShellService(void *handle, service_reference_pt ref, void *svc) {
     shell_tui_activator_pt act = (shell_tui_activator_pt) handle;
-    act->shell = svc;
+    celixThreadMutex_lock(&act->mutex);
+    if (act->shell == svc) {
+        act->shell = NULL;
+    }
+    celixThreadMutex_unlock(&act->mutex);
     return CELIX_SUCCESS;
 }
 
@@ -52,6 +58,7 @@ celix_status_t bundleActivator_create(bundle_context_pt context, void **userData
 
 	if (activator) {
 		activator->shell = NULL;
+        celixThreadMutex_create(&activator->mutex, NULL);
 		(*userData) = activator;
 	}
 	else {

diff --git a/shell_tui/private/src/shell_tui.c b/shell_tui/private/src/shell_tui.c
@@ -72,11 +72,13 @@ static void* shellTui_runnable(void *data) {
                 continue;
             }
 
+            celixThreadMutex_lock(&act->mutex);
             if (act->shell != NULL) {
                 act->shell->executeCommand(act->shell->shell, line, stdout, stderr);
             } else {
                 fprintf(stderr, "Shell service not available\n");
             }
+            celixThreadMutex_unlock(&act->mutex);
         }
     }