Update release part of resource conflict

Change-Id: Ibbd96006356e78e6b6655df16b6367d63928921c
(cherry picked from commit ec753cea4ffd57bc62cbd43a6d4288220c020c34)

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index bc21c84..26b9d29 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_priv.c
+++ b/src/daemon/mm_resource_manager_daemon_priv.c
@@ -280,15 +280,15 @@ static void __destroy_resource(mm_resource_manager_dmn_res_p res)
 
 static void __destroy_manager(void *m)
 {
-       mm_resource_manager_dmn_p man = (mm_resource_manager_dmn_p) m;
+       mm_resource_manager_dmn_p mgr = (mm_resource_manager_dmn_p) m;
        int i;
 
-       MM_RM_RETM_IF(man == NULL, "NULL pointer");
+       MM_RM_RETM_IF(mgr == NULL, "NULL pointer");
 
        for (i = 0; i < MM_RESOURCE_MANAGER_RES_TYPE_MAX; i++)
-               __destroy_resource(man->resources[i]);
+               __destroy_resource(mgr->resources[i]);
 
-       g_free(man);
+       g_free(mgr);
 }
 
 static int __search_manager_index(mm_resource_manager_id id)
@@ -525,8 +525,7 @@ static GArray *__handle_acquire_requests(mm_resource_manager_dmn_p manager,
                volume = requests->volume;
 
                if (volume == MM_RESOURCE_MANAGER_RES_VOLUME_FULL) {
-                       MM_RM_DEBUG("Full volume of %s is requested [man %p] %s",
-                               res_name, manager, _mm_resource_manager_get_res_str(type));
+                       MM_RM_DEBUG("Resource of %s is requested [mgr %p]", res_name, manager);
 
                        for (i = 0; i < managers->len; i++) {
                                i_mgr = (mm_resource_manager_dmn_p)managers->pdata[i];
@@ -539,28 +538,21 @@ static GArray *__handle_acquire_requests(mm_resource_manager_dmn_p manager,
                                        continue;
                                }
 
-                               res = i_mgr->resources[type]->parts;
-                               if (res) {
-
+                               if ((res = i_mgr->resources[type]->parts)) { /* always null, which is no conflict case now */
                                        for (j = 0; j < res->len; j++) {
-                                               __add_cb_request(cb_requests, i_mgr, type,
-                                                               g_array_index(res, mm_resource_manager_res_volume, j));
-
+                                               __add_cb_request(cb_requests, i_mgr, type, g_array_index(res, mm_resource_manager_res_volume, j));
                                                mm_resource_manager_backend_release(type);
                                        }
-
                                        g_array_free(res, TRUE);
                                        i_mgr->resources[type]->parts = NULL;
-                                       i_mgr->resources[type]->is_acquired = FALSE;
 
-                                       MM_RM_DEBUG("All parts of %s are released in RM %"PRIu64,
-                                               res_name, _mm_rm_hash64(i_mgr->id));
+                                       MM_RM_WARNING("Resource of %s is conflicted in RM %"PRIu64, res_name, _mm_rm_hash64(i_mgr->id));
                                } else {
                                        __add_cb_request(cb_requests, i_mgr, type, MM_RESOURCE_MANAGER_RES_VOLUME_FULL);
 
                                        mm_resource_manager_backend_release(type);
 
-                                       MM_RM_DEBUG("Full resource %s is released in RM %"PRIu64" available volume %d",
+                                       MM_RM_INFO("Resource %s is released in RM %"PRIu64" available volume %d",
                                                res_name, _mm_rm_hash64(i_mgr->id), conf->max_volume[type]);
                                }
                        }
@@ -681,7 +673,7 @@ static void __handle_release_callbacks(GArray *requests)
 
                volume = request->volume;
 
-               MM_RM_INFO("Sending release callback to [man %p] RM #%"PRIu64" for %s of volume %d",
+               MM_RM_INFO("Sending release callback to [mgr %p] RM #%"PRIu64" for %s of volume %d",
                                mgr, id, _mm_resource_manager_get_res_str(type), volume);
 
                _mmrm_dmn_dbus_release_callback(id, type, volume);

diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c
index bfaf54b..1f8c580 100644 (file)
--- a/src/lib/mm_resource_manager_priv.c
+++ b/src/lib/mm_resource_manager_priv.c
@@ -471,7 +471,7 @@ int _mm_resource_manager_get_res_type_volume(mm_resource_manager_h rm,
        mm_resource_manager_s *handle = MM_RESOURCE_MANAGER(rm);
 
        if (handle->__condition_volumes[type][condition] == MM_RESOURCE_MANAGER_NO_RES) {
-               MM_RM_DEBUG("No pair (resource,condition) for the platform");
+               MM_RM_DEBUG("No pair (resource, condition) for the platform");
                return MM_RESOURCE_MANAGER_ERROR_NOT_SUPPORTED;
        } else {
                *volume = handle->__condition_volumes[type][condition];

diff --git a/test/mm_res_manager_test.c b/test/mm_res_manager_test.c
index e0d3076..38b7174 100644 (file)
--- a/test/mm_res_manager_test.c
+++ b/test/mm_res_manager_test.c
@@ -245,17 +245,17 @@ static void display_app_classes()
 
 static gpointer get_manager_by_index(int i)
 {
-       gpointer man;
-       gpointer *mans;
+       gpointer mgr;
+       gpointer *mgrs;
        guint len;
 
-       mans = g_hash_table_get_keys_as_array(resource_managers, &len);
+       mgrs = g_hash_table_get_keys_as_array(resource_managers, &len);
 
-       man = i < len ? mans[i] : NULL;
+       mgr = i < len ? mgrs[i] : NULL;
 
-       g_free(mans);
+       g_free(mgrs);
 
-       return man;
+       return mgr;
 }
 
 static mm_resource_manager_h get_manager_from_cmd(gchar **cmd_tokens)