lock when get global device list

[Version] 0.10.74
[Profile] Common
[Issue Type] Enhancement

Change-Id: I50f78969a6227bb3a8424b0350c09e5304e0a606

diff --git a/mm_sound_device.c b/mm_sound_device.c
index 457c7c2..c929cac 100644 (file)
--- a/mm_sound_device.c
+++ b/mm_sound_device.c
@@ -30,7 +30,8 @@
 
 #define VOLUME_TYPE_LEN 64
 
-mm_sound_device_list_t *g_device_list;
+mm_sound_device_list_t g_device_list;
+pthread_mutex_t g_thread_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static int _check_for_valid_mask (int flags)
 {
@@ -224,26 +225,25 @@ int mm_sound_get_current_device_list(mm_sound_device_flags_e flags, MMSoundDevic
                return ret;
        }
 
-       /* free previously allocated list */
-       if (g_device_list != NULL)
-               __free_device_list(g_device_list);
+       pthread_mutex_lock(&g_thread_mutex);
 
-       if (!(g_device_list = g_malloc0(sizeof(mm_sound_device_list_t)))) {
-               debug_error("[Client] Allocate device list failed");
-               return MM_ERROR_SOUND_INTERNAL;
+       if (g_device_list.list != NULL) {
+               g_list_free_full(g_device_list.list, g_free);
+               g_device_list.list = NULL;
        }
 
-       g_device_list->is_new_device_list = true;
+       g_device_list.is_new_device_list = true;
 
-       ret = mm_sound_client_get_current_connected_device_list(flags, g_device_list);
+       ret = mm_sound_client_get_current_connected_device_list(flags, &g_device_list);
        if (ret < 0) {
                debug_error("Could not get current connected device list, ret = %x\n", ret);
-               g_free(g_device_list);
-               g_device_list = NULL;
+               g_device_list.list = NULL;
        } else {
-               *device_list = g_device_list;
+               *device_list = &g_device_list;
        }
 
+       pthread_mutex_unlock(&g_thread_mutex);
+
        return ret;
 }
 

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 36850ce..b0b9ed5 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.10.73
+Version:    0.10.74
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0