diff options
| author | YoungHun Kim <yh8004.kim@samsung.com> | 2017-09-11 11:50:28 +0900 |
|---|---|---|
| committer | YoungHun Kim <yh8004.kim@samsung.com> | 2017-09-11 12:20:02 +0900 |
| commit | fad04f1e851c1a35c501e801bdd885c6cc67682a (patch) | |
| tree | f8b46973ba67b9077d39c1a15e7c3746eb1350fa /client | |
| parent | 561ac217b71b9bb65c21205359be18280e2e01ac (diff) | |
| download | mmsvc-core-fad04f1e851c1a35c501e801bdd885c6cc67682a.tar.gz mmsvc-core-fad04f1e851c1a35c501e801bdd885c6cc67682a.tar.bz2 mmsvc-core-fad04f1e851c1a35c501e801bdd885c6cc67682a.zip | |
Disable the client signal handler at VD product
Change-Id: I254574bb158ed69bd1440d0552c39248767bcff1
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | client/src/muse_client.c | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 5d36a7a..c6883ae 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -33,7 +33,9 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") +IF(${MUSE_USE_CLIENT_SIGHANDLER}) SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-init,_muse_client_constructor") +ENDIF(${MUSE_USE_CLIENT_SIGHANDLER}) aux_source_directory(src CLI_SOURCES) ADD_LIBRARY(${fw_name} SHARED ${CLI_SOURCES}) diff --git a/client/src/muse_client.c b/client/src/muse_client.c index a593728..1be5e74 100644 --- a/client/src/muse_client.c +++ b/client/src/muse_client.c @@ -27,6 +27,13 @@ #endif #define LOG_TAG "MUSED_CLIENT" +GMutex g_muse_client_mutex; +GHashTable *g_muse_client_table; +int g_muse_client_table_id; + +const char *UDS_files[MUSE_CHANNEL_MAX] = {MUSE_SOCK_FILE0, MUSE_SOCK_FILE1}; + +#ifdef MUSE_USE_CLIENT_SIGHANDLER /* signal handler */ struct sigaction muse_client_int_old_action; struct sigaction muse_client_abrt_old_action; @@ -34,19 +41,16 @@ struct sigaction muse_client_segv_old_action; struct sigaction muse_client_term_old_action; struct sigaction muse_client_sys_old_action; -GMutex g_muse_client_mutex; -GHashTable *g_muse_client_table; -int g_muse_client_table_id; - -const char *UDS_files[MUSE_CHANNEL_MAX] = {MUSE_SOCK_FILE0, MUSE_SOCK_FILE1}; - static gboolean _muse_client_table_remove_func(gpointer key, gpointer value, gpointer user_data); static void _muse_client_sigaction(int signo, siginfo_t *siginfo, void *context); static void _muse_client_constructor(void) __attribute__((constructor)); +#endif + static int _muse_client_new(muse_channel_e channel); static void _muse_client_table_new(void); static gpointer _muse_client_get_fd_ptr(int sock_fd); +#ifdef MUSE_USE_CLIENT_SIGHANDLER static gboolean _muse_client_table_remove_func(gpointer key, gpointer value, gpointer user_data) { int sock_fd = GPOINTER_TO_INT(key); @@ -124,6 +128,7 @@ static void _muse_client_constructor(void) return; } +#endif static int _muse_client_new(muse_channel_e channel) { |