Code refactorying

Change-Id: I08eb8d84e24cd8ed853f473c78ac2789d2fecdf7

diff --git a/server/include/muse_server_private.h b/server/include/muse_server_private.h
index 296cc6c..ecbacda 100644 (file)
--- a/server/include/muse_server_private.h
+++ b/server/include/muse_server_private.h
@@ -63,7 +63,7 @@ typedef enum {
 
 typedef struct _muse_server *muse_server_h;
 
-typedef struct connection_msg {
+typedef struct ms_diag_msg {
        gboolean thread_stop;
        int cmd;
 } ms_diag_msg_t;

diff --git a/server/src/muse_server_connection.c b/server/src/muse_server_connection.c
index 2ffab95..78712fa 100644 (file)
--- a/server/src/muse_server_connection.c
+++ b/server/src/muse_server_connection.c
@@ -58,6 +58,7 @@ static void _ms_connection_module_instance_info(muse_module_h m, ms_connection_t
 
        dm = g_new0(ms_diag_msg_t, 1);
        dm->cmd = cmd;
+
        g_async_queue_push(ms->diag.msg_aq, (gpointer)dm);
 
        LOGW("total number of modules = %d ( %s) - %s %p from pid %d %s client (count %d)",

diff --git a/server/src/muse_server_ipc.c b/server/src/muse_server_ipc.c
index 4d8ae88..358ec13 100644 (file)
--- a/server/src/muse_server_ipc.c
+++ b/server/src/muse_server_ipc.c
@@ -107,7 +107,8 @@ static void _ms_ipc_module_cleanup(muse_module_h m)
 
        memset(m, 0, sizeof(muse_module_t));
 
-       free(m);
+       LOGI("[module %p] EXIT", m);
+       g_free(m);
 }
 
 static gboolean _ms_ipc_module_instance_creation_is_allowed(int module_idx)
@@ -254,11 +255,10 @@ static gpointer _ms_ipc_dispatch_worker(gpointer data)
        muse_return_val_if_fail(data, NULL);
 
        m = (muse_module_h)data;
-       muse_return_val_if_fail(m, NULL);
 
        fd = m->ch[MUSE_CHANNEL_MSG].sock_fd;
 
-       LOGD("Enter %d", fd);
+       LOGD("Enter %d modlue %p", fd, m);
 
        while (attempt_to_dispatch) {
                memset(m->recv_msg, 0x00, sizeof(m->recv_msg));
@@ -323,8 +323,9 @@ static gpointer _ms_ipc_dispatch_worker(gpointer data)
 static gboolean _ms_ipc_data_processing(int fd, muse_recv_data_head_t *header, muse_channel_info_t *ch)
 {
        char *raw_data = NULL;
+       muse_server_h ms = ms_get_instance();
 
-       muse_return_val_if_fail(ms_get_instance(), FALSE);
+       muse_return_val_if_fail(ms, FALSE);
 
        if (!(fd > 0 && header && ch)) {
                LOGE("invalid param %d %p %p", fd, header, ch);
@@ -371,7 +372,7 @@ _PROCESSING_FAILED:
 
        MUSE_G_FREE(raw_data);
 
-       ms_log_process_info(ms_get_instance()->pid);
+       ms_log_process_info(ms->pid);
 
        return FALSE;
 }
@@ -410,21 +411,22 @@ static gpointer _ms_ipc_data_worker(gpointer data)
 gboolean ms_ipc_create_msg_dispatch_worker(muse_module_h m)
 {
        GError *error = NULL;
+       muse_server_h ms = ms_get_instance();
 
        LOGD("Enter");
 
-       muse_return_val_if_fail(ms_get_instance(), FALSE);
+       muse_return_val_if_fail(ms, FALSE);
        muse_return_val_if_fail(ms_is_server_ready(), FALSE);
-
        muse_return_val_if_fail(muse_server_module_is_valid(m), FALSE);
 
-       SECURE_LOGD("[PID %d %p] module's msg channel fd : %d", m->pid, m, m->ch[MUSE_CHANNEL_MSG].sock_fd);
+       SECURE_LOGD("[PID %d module %p] module's msg channel fd : %d", m->pid, m, m->ch[MUSE_CHANNEL_MSG].sock_fd);
 
        m->ch[MUSE_CHANNEL_MSG].thread = g_thread_try_new(MSG_THREAD_NAME, _ms_ipc_dispatch_worker, (gpointer)m, &error);
-       if (!m->ch[MUSE_CHANNEL_MSG].thread && error) {
+
+       if (!m->ch[MUSE_CHANNEL_MSG].thread) {
                LOGE("thread creation failed : %s", error->message);
                g_error_free(error);
-               ms_log_process_info(ms_get_instance()->pid);
+               ms_log_process_info(ms->pid);
        }
 
        muse_return_val_if_fail(m->ch[MUSE_CHANNEL_MSG].thread, FALSE);
@@ -436,18 +438,19 @@ gboolean ms_ipc_create_msg_dispatch_worker(muse_module_h m)
 gboolean ms_ipc_create_data_dispatch_worker(muse_module_h m)
 {
        GError *error = NULL;
+       muse_server_h ms = ms_get_instance();
 
        LOGD("Enter");
 
-       muse_return_val_if_fail(ms_get_instance(), FALSE);
+       muse_return_val_if_fail(ms, FALSE);
        muse_return_val_if_fail(ms_is_server_ready(), FALSE);
        muse_return_val_if_fail(muse_server_module_is_valid(m), TRUE);
 
        m->ch[MUSE_CHANNEL_DATA].thread = g_thread_try_new(DATA_THREAD_NAME, _ms_ipc_data_worker, (gpointer)m, &error);
-       if (!m->ch[MUSE_CHANNEL_DATA].thread && error) {
+       if (!m->ch[MUSE_CHANNEL_DATA].thread) {
                LOGE("thread creation failed : %s", error->message);
                g_error_free(error);
-               ms_log_process_info(ms_get_instance()->pid);
+               ms_log_process_info(ms->pid);
                ms_cmd_dispatch(m, MUSE_MODULE_COMMAND_RESOURCE_NOT_AVAILABLE);
                muse_core_connection_close(m->ch[MUSE_CHANNEL_MSG].sock_fd);
        }

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index da93f64..567a364 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -140,7 +140,7 @@ static void _ms_create_new_server_from_fd(int fd[], int type)
        gettimeofday(&muse_server->tv_s, NULL);
 
        for (i = 0; i < MUSE_CHANNEL_MAX; i++) {
-               if (!_ms_attach(fd[i], _ms_connection_handler, (gpointer)(intptr_t) i)) {
+               if (!_ms_attach(fd[i], _ms_connection_handler, GINT_TO_POINTER(i))) {
                        snprintf(err_msg, sizeof(err_msg), "Fail to attach server fd %d", fd[i]);
 
                        LOGE("%s", err_msg);
@@ -257,7 +257,7 @@ static gboolean _ms_connection_handler(GIOChannel *source, GIOCondition conditio
        int server_sockfd, client_sockfd, pid, idx, len;
        socklen_t client_len;
        struct sockaddr_un client_address;
-       muse_channel_e channel = (muse_channel_e)data;
+       muse_channel_e channel = GPOINTER_TO_INT(data);
        muse_module_h m = NULL;
        muse_module_h peeked_m = NULL;
        muse_module_h candidate_m = NULL;
@@ -265,7 +265,7 @@ static gboolean _ms_connection_handler(GIOChannel *source, GIOCondition conditio
        GQueue *instance_queue = NULL;
        ms_connection_t *connection = NULL;
 
-       LOGI("Enter");
+       LOGI("Enter [%s channel]", channel_name[channel]);
 
        muse_return_val_if_fail(muse_server, FALSE);
 
@@ -395,7 +395,6 @@ out:
                        muse_core_connection_close(m->ch[MUSE_CHANNEL_MSG].sock_fd);
        }
 
-
        _ms_unlock_state();
 
        LOGE("FALSE");
@@ -473,7 +472,7 @@ static gpointer _ms_diag_check_connection_event_thread(gpointer data)
                if (!dm)
                        continue;
 
-               LOGD("[%p] pop message (thread stop ? %d [%s])", dm, dm->thread_stop, ms_get_command_string(dm->cmd));
+               LOGD("[%p] POP message (thread stop ? %d [%s])", dm, dm->thread_stop, ms_get_command_string(dm->cmd));
 
                if (dm->thread_stop) {
                        g_free(dm);