Change the value of timeout to avoid open() blocking issue

Change-Id: I9a37edf414ac01d069703263c0f96a9b59e067fa

diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec
index e54923b..b0b8a6d 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.38
+Version:    0.2.39
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index 1a55f29..b157ad7 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 300 /* milliseconds */
+#define RELEASE_CB_SYNC_TIMEOUT 500 /* milliseconds */
 
 typedef enum {
        MM_RESOURCE_MANAGER_RES_STATE_FOR_ACQUIRE,
@@ -796,7 +796,10 @@ static gboolean __wait_for_release_cb_sync(mm_resource_manager_id id)
        mm_resource_manager_id recv_id;
        ssize_t read_size;
 
+       MM_RM_DEBUG("Enter");
        sync.fd = open(RELEASE_CB_SYNC_PATH, O_RDONLY | O_NONBLOCK);
+       MM_RM_DEBUG("[%d] opened %s", sync.fd, RELEASE_CB_SYNC_PATH);
+
        MM_RM_RETVM_IF(sync.fd == -1, FALSE, "Sync FIFO cannot be opened");
 
        if (!__poll(sync, id))
@@ -815,6 +818,7 @@ static gboolean __wait_for_release_cb_sync(mm_resource_manager_id id)
 
 out:
        close(sync.fd);
+       MM_RM_DEBUG("[%d] closed", sync.fd);
 
        return ret;
 }

diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c
index 5d56f5b..07ee502 100644 (file)
--- a/src/lib/mm_resource_manager_priv.c
+++ b/src/lib/mm_resource_manager_priv.c
@@ -734,7 +734,10 @@ static void __send_release_cb_sync(mm_resource_manager_id id)
 {
        int sync_fd;
 
+       MM_RM_DEBUG("Enter");
        sync_fd = open(RELEASE_CB_SYNC_PATH, O_WRONLY);
+       MM_RM_DEBUG("[%d] opened %s", sync_fd, RELEASE_CB_SYNC_PATH);
+
        MM_RM_RETM_IF(sync_fd == -1, "Sync FIFO cannot be opened [errno %d]", errno);
 
        if (write(sync_fd, &id, sizeof(id)) == sizeof(id))
@@ -743,6 +746,7 @@ static void __send_release_cb_sync(mm_resource_manager_id id)
                MM_RM_ERROR("[SYNC] message cannot be sent RM #%"PRIu64, _mm_rm_hash64(id));
 
        close(sync_fd);
+       MM_RM_DEBUG("[%d] closed", sync_fd);
 }
 
 static void __init_lib()