Revert "Change resource timeout from 5 second to 300 miliseconds"

This reverts commit 55d7659a6c0473119f7df317c147c2d1e5dd6e4a.

Change-Id: I3341933da6182e1dd97467f87a2c11bad256af4a

diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec
index d908ea5..906a0df 100644 (file)
--- a/packaging/mm-resource-manager.spec
+++ b/packaging/mm-resource-manager.spec
@@ -1,6 +1,6 @@
 Name:       mm-resource-manager
 Summary:    A Multimedia Resource Manager API
-Version:    0.2.43
+Version:    0.2.44
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/daemon/backend/murphy/mm_resource_manager_mloop.c b/src/daemon/backend/murphy/mm_resource_manager_mloop.c
index 48870bc..9e0d597 100644 (file)
--- a/src/daemon/backend/murphy/mm_resource_manager_mloop.c
+++ b/src/daemon/backend/murphy/mm_resource_manager_mloop.c
@@ -23,7 +23,7 @@ static void __mm_resource_manager_mloop_state_callback(mrp_res_context_t *contex
 static gboolean __mm_resource_manager_mloop_list_resources(mrp_res_context_t *context);
 static int __mm_resource_manager_mloop_wait_connection(mm_resource_manager_mloop_s *mrp);
 
-#define RM_RESOURCE_TIMEOUT 500
+#define RM_RESOURCE_TIMEOUT 5000
 
 static gpointer thread_func(mm_resource_manager_mloop_s *mrp)
 {

diff --git a/src/daemon/backend/murphy/mm_resource_manager_rset.c b/src/daemon/backend/murphy/mm_resource_manager_rset.c
index c352b3b..2144398 100644 (file)
--- a/src/daemon/backend/murphy/mm_resource_manager_rset.c
+++ b/src/daemon/backend/murphy/mm_resource_manager_rset.c
@@ -38,7 +38,7 @@ static const char *state_str[MRP_RES_RESOURCE_ABOUT_TO_LOOSE + 1] = {
 static void _mm_resource_manager_rset_state_callback(mrp_res_context_t *cx, const mrp_res_resource_set_t *rs, void *user_data);
 static void _mm_resource_manager_rset_release_cb(mrp_res_context_t *cx, const mrp_res_resource_set_t *rs, void *user_data);
 
-#define RM_RESOURCE_TIMEOUT 500
+#define RM_RESOURCE_TIMEOUT 5000
 
 int _mm_resource_manager_rset_create(mm_resource_manager_app_class_e app_class,
                mm_resource_manager_mloop_s *mrp, mm_resource_manager_rset_s **rset)

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index 5ca6442..139b784 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_priv.c
+++ b/src/daemon/mm_resource_manager_daemon_priv.c
@@ -34,7 +34,7 @@
 #define MM_RESOURCE_MANAGER_RESERVED_PART_ARRAY_SIZE 4 /* preallocated size */
 #define MM_RESOURCE_MANAGER_RESERVED_CALLBACK_ARRAY_SIZE 32 /* preallocated size */
 #define MM_RESOURCE_MANGER_NOT_FOUND -1
-#define RELEASE_CB_SYNC_TIMEOUT 500 /* milliseconds */
+#define RELEASE_CB_SYNC_TIMEOUT 5000 /* milliseconds */
 
 typedef enum {
        MM_RESOURCE_MANAGER_RES_STATE_FOR_ACQUIRE,