[0.2.125] Add log for debug(close fd)

Change-Id: I10e4837829d6d17059c88165330987a68dd827e1

diff --git a/muse/include/muse_player_private.h b/muse/include/muse_player_private.h
index 4c9faf4cbc0017c15e3f306c72e3e95427c86798..e43fe7dfbb40c989cc362798a66d795a74bba85b 100644 (file)
--- a/muse/include/muse_player_private.h
+++ b/muse/include/muse_player_private.h
@@ -25,6 +25,16 @@ extern "C" {
 #include <glib.h>
 #include "legacy_player.h"
 
+#define DEBUG_FD_NUM 10
+#define MPLAYER_CLOSE_FD(fd) \
+do { \
+       if (fd > INVALID_DEFAULT_VALUE) { \
+               if (fd < DEBUG_FD_NUM) \
+                       LOGW("close fd %d", fd); \
+               close(fd); \
+       } \
+} while (0)
+
 typedef struct {
        legacy_player_h player_handle;
        tbm_bufmgr bufmgr;

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 9f5a61d3b099119aec1931ec775dc62bf3960151..02d421514d7858b70d9a63726eea0a7752312a88 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -184,10 +184,8 @@ static bool __mplayer_remove_export_data(muse_module_h module, int key, bool rem
                        if ((export_data) &&
                                (export_data->key == key || remove_all)) {
                                /* LOGD("buffer key : %d matched, remove it (remove_all %d)", key, remove_all); */
-                               if (export_data->tfd > INVALID_DEFAULT_VALUE) {
-                                       close(export_data->tfd);
+                                       MPLAYER_CLOSE_FD(export_data->tfd);
                                        export_data->tfd = INVALID_DEFAULT_VALUE;
-                               }
                                if (export_data->bo) {
                                        tbm_bo_unref(export_data->bo);
                                        export_data->bo = NULL;
@@ -766,10 +764,8 @@ static bool __mplayer_video_decoded_callback(void *video_data, void *user_data)
        ret_val = true;
 ERROR:
 
-       for (i = 0; i < bo_num; i++) {
-               if (tfd[i] > INVALID_DEFAULT_VALUE)
-                       close(tfd[i]);
-       }
+       for (i = 0; i < bo_num; i++)
+               MPLAYER_CLOSE_FD(tfd[i]);
 
        return ret_val;
 }
@@ -1425,13 +1421,11 @@ int player_disp_set_memory_buffer(muse_module_h module)
 
        /* don't call bo unmap/unref here *
         * it will be released at player_disp_deinit_memory_buffer() during _destroy */
-
-       close(tfd);
+       MPLAYER_CLOSE_FD(tfd);
        return ret;
 
 ERROR:
-       if (tfd > INVALID_DEFAULT_VALUE)
-               close(tfd);
+       MPLAYER_CLOSE_FD(tfd);
 
        if (bo)
                tbm_bo_unref(bo);
@@ -2467,8 +2461,7 @@ push_media_stream_exit2:
        else if (push_media.buf_type == PUSH_MEDIA_BUF_TYPE_RAW && buf)
                muse_server_ipc_delete_data(buf);
 push_media_stream_exit1:
-       if (tfd > INVALID_DEFAULT_VALUE)
-               close(tfd);
+       MPLAYER_CLOSE_FD(tfd);
 
        if (jobj)
                muse_core_msg_object_free(jobj);

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 745fdd58868badddca58e8427650f93b830d19c9..e7a94c111918c979a7d0410b5c0f246e62f22dea 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.124
+Version:    0.2.125
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0