diff options
author | Ji Yong Min <jiyong.min@samsung.com> | 2016-01-07 14:11:10 +0900 |
---|---|---|
committer | Jiyong Min <jiyong.min@samsung.com> | 2016-02-02 02:49:05 -0800 |
commit | 6ab5231cee62e80ed0a20629ad6f58ae8e0d8989 (patch) | |
tree | 20237fbb9bfd4103b5036304f6327d0c61bbd4f8 /server/thumb-server.c | |
parent | d52ab3b570a5362c1570e63eb54c2df84031a79e (diff) | |
download | libmedia-thumbnail-6ab5231cee62e80ed0a20629ad6f58ae8e0d8989.tar.gz libmedia-thumbnail-6ab5231cee62e80ed0a20629ad6f58ae8e0d8989.tar.bz2 libmedia-thumbnail-6ab5231cee62e80ed0a20629ad6f58ae8e0d8989.zip |
Remove to execute dcm by thumb-serversubmit/tizen_ivi/20160217.000003submit/tizen_ivi/20160217.000000submit/tizen_common/20160218.142243submit/tizen/20160211.044444accepted/tizen/wearable/20160211.083352accepted/tizen/tv/20160211.083330accepted/tizen/mobile/20160211.083312accepted/tizen/ivi/20160218.023845
Change-Id: I66656db4c934490023fdd293ff6ce1851d2e35ef
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
Diffstat (limited to 'server/thumb-server.c')
-rwxr-xr-x | server/thumb-server.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/server/thumb-server.c b/server/thumb-server.c index a927a7b..743d339 100755 --- a/server/thumb-server.c +++ b/server/thumb-server.c @@ -27,10 +27,6 @@ #include <pthread.h> #include <vconf.h> -#ifdef _SUPPORT_DCM -#include "thumb-server-dcm.h" -#endif /* _SUPPORT_DCM */ - #ifdef LOG_TAG #undef LOG_TAG #endif @@ -53,44 +49,6 @@ static void _media_thumb_signal_handler(void *user_data) } #endif -#ifdef _SUPPORT_DCM -void _thumb_server_signal_handler(int n) -{ - int stat, pid, dcm_pid; - - dcm_pid = thumb_server_dcm_get_server_pid(); - - while ((pid = waitpid(-1, &stat, WNOHANG)) > 0) { - /* check pid of child process of thumbnail thread */ - if (pid == dcm_pid) { - thumb_err("[%d] Dcm-svc server is stopped by media-thumb-server", pid); - thumb_server_dcm_reset_server_status(); - } else { - thumb_err("[%d] is stopped", pid); - } - } - - return; -} - -static void _thumb_server_add_signal_handler(void) -{ - struct sigaction sigset; - - /* Add signal handler */ - sigemptyset(&sigset.sa_mask); - sigaddset(&sigset.sa_mask, SIGCHLD); - sigset.sa_flags = SA_RESTART |SA_NODEFER; - sigset.sa_handler = _thumb_server_signal_handler; - - if (sigaction(SIGCHLD, &sigset, NULL) < 0) { - thumb_err("sigaction failed [%s]", strerror(errno)); - } - - signal(SIGPIPE, SIG_IGN); -} -#endif - int main(void) { int sockfd = -1; @@ -121,10 +79,6 @@ int main(void) return -1; } -#ifdef _SUPPORT_DCM - _thumb_server_add_signal_handler(); -#endif - g_thumb_server_mainloop = g_main_loop_new(context, FALSE); context = g_main_loop_get_context(g_thumb_server_mainloop); @@ -141,13 +95,6 @@ int main(void) g_source_set_callback(source_evas_init, _thumb_daemon_start_jobs, NULL, NULL); g_source_attach(source_evas_init, context); -#ifdef _SUPPORT_DCM - thumb_dbg("[GD] _thumb_server_dcm_thread created"); - /* Create dcm thread */ - GThread *dcm_thread = NULL; - dcm_thread = g_thread_new("dcm_thread", (GThreadFunc)_thumb_server_dcm_thread, NULL); -#endif /* _SUPPORT_DCM */ - /* Would be used when glib 2.32 is installed GSource *sig_handler_src = NULL; sig_handler_src = g_unix_signal_source_new (SIGTERM); @@ -165,10 +112,6 @@ int main(void) g_io_channel_unref(channel); _thumb_daemon_finish_jobs(); -#ifdef _SUPPORT_DCM - /* Finish dcm thread */ - g_thread_join(dcm_thread); -#endif /* _SUPPORT_DCM */ g_main_loop_unref(g_thumb_server_mainloop); ms_cynara_finish(); |