[FIX] msg_t type change

 - char *payload changed to payload[0]

diff --git a/daemon/da_protocol.c b/daemon/da_protocol.c
index 29becc8..749ca8e 100644 (file)
--- a/daemon/da_protocol.c
+++ b/daemon/da_protocol.c
@@ -29,11 +29,6 @@ void inline free_msg_data(struct msg_data_t *msg)
        free(msg);
 }
 
-void inline free_msg_payload(struct msg_t *msg)
-{
-       free(msg->payload);
-}
-
 void free_sys_info(struct system_info_t *sys_info)
 {
        if (sys_info->cpu_frequency)
@@ -671,11 +666,6 @@ static void concat_add_user_space_inst(struct user_space_inst_t *from,
        return;
 }
 
-void reset_msg(struct msg_t *msg)
-{
-       if (msg->len)
-               free(msg->payload);
-}
 
 static void reset_app_info(struct app_info_t *app_info)
 {
@@ -739,6 +729,21 @@ static void reset_user_space_inst(struct user_space_inst_t *us)
        us->app_num = 0;
 }
 
+void reset_system_info(struct system_info_t *sys_info)
+{
+       LOGI("clean\n");
+
+       if (sys_info->thread_load)
+               free(sys_info->thread_load);
+       if (sys_info->process_load)
+               free(sys_info->process_load);
+       if (sys_info->cpu_frequency)
+               free(sys_info->cpu_frequency);
+       if (sys_info->cpu_load)
+               free(sys_info->cpu_load);
+       memset(sys_info, 0, sizeof(*sys_info));
+}
+
 static void reset_prof_session(struct prof_session_t *prof_session)
 {
        reset_app_info(&prof_session->app_info);
@@ -761,18 +766,12 @@ static struct msg_t *gen_binary_info_reply(struct app_info_t *app_info)
                return NULL;
        }
 
-       msg = malloc(sizeof(*msg));
-       if (!msg) {
-               LOGE("Cannot alloc bin info msg\n");
-               return NULL;
-       }
-
-       msg->payload = malloc(sizeof(ret_id) +
+       msg = malloc(sizeof(*msg) +
+                             sizeof(ret_id) +
                              sizeof(binary_type) +
                              strlen(binary_path) + 1);
-       if (!msg->payload) {
-               LOGE("Cannot alloc bin info msg payload\n");
-               free(msg);
+       if (!msg) {
+               LOGE("Cannot alloc bin info msg\n");
                return NULL;
        }
 
@@ -794,18 +793,13 @@ static struct msg_t *gen_target_info_reply(struct target_info_t *target_info)
        char *p = NULL;
        uint32_t ret_id = ERR_NO;
 
-       msg = malloc(sizeof(*msg));
-       if (!msg) {
-               LOGE("Cannot alloc target info msg\n");
-               return NULL;
-       }
-
-       msg->payload = malloc(sizeof(ret_id) +
+       msg = malloc(sizeof(*msg) +
+                             sizeof(ret_id) +
                              sizeof(*target_info) -
                              sizeof(target_info->network_type) +
                              strlen(target_info->network_type) + 1);
-       if (!msg->payload) {
-               LOGE("Cannot alloc target info msg payload\n");
+       if (!msg) {
+               LOGE("Cannot alloc target info msg\n");
                free(msg);
                return NULL;
        }
@@ -832,14 +826,8 @@ static struct msg_t *gen_target_info_reply(struct target_info_t *target_info)
 static int send_reply(struct msg_t *msg)
 {
        if (send(manager.host.control_socket,
-                msg, MSG_CMD_HDR_LEN, MSG_NOSIGNAL) == -1) {
-               LOGE("Cannot send reply header: %s\n", strerror(errno));
-               return 1;
-       }
-
-       if (send(manager.host.control_socket,
-                msg->payload, msg->len, MSG_NOSIGNAL) == -1) {
-               LOGE("Cannot send reply payload: %s\n", strerror(errno));
+                msg, MSG_CMD_HDR_LEN + msg->len, MSG_NOSIGNAL) == -1) {
+               LOGE("Cannot send reply : %s\n", strerror(errno));
                return 1;
        }
 
@@ -851,7 +839,7 @@ static int sendACKToHost(enum HostMessageT resp, enum ErrorCode err_code,
 {
        if (manager.host.control_socket != -1)
        {
-               struct msg_reply_t *msg;
+               struct msg_t *msg;
                uint32_t err = err_code;
                int loglen = sizeof(*msg) - sizeof(msg->payload) +
                                         sizeof(err) + //return ID
@@ -960,7 +948,7 @@ int host_message_handler(struct msg_t *msg)
                // TODO: start app launch timer
 
                //write to device
-               //ioctl_send_msg(msg);
+               // ioctl_send_msg(msg);
 
                // success
                sendACKToHost(msg->id, ERR_NO, 0, 0);
@@ -1007,7 +995,6 @@ int host_message_handler(struct msg_t *msg)
                }
 
                reset_app_info(&app_info);
-               reset_msg(msg_reply);
                free(msg_reply);
                break;
        case NMSG_SWAP_INST_ADD:

diff --git a/daemon/da_protocol.h b/daemon/da_protocol.h
index de7d1f3..92fd1cc 100644 (file)
--- a/daemon/da_protocol.h
+++ b/daemon/da_protocol.h
@@ -121,15 +121,10 @@ struct msg_data_t {
 struct msg_t {
        uint32_t id;
        uint32_t len;
-       char *payload;
-};
-
-struct msg_reply_t {
-       uint32_t id;
-       uint32_t len;
        char payload[0];
 };
 
+
 enum app_type_t {
        APP_TYPE_TIZEN = 1,
        APP_TYPE_RUNNING = 2,
@@ -287,6 +282,7 @@ void stop_replay();
 
 void reset_msg(struct msg_t *msg);
 void reset_replay_event_seq(struct replay_event_seq_t *res);
+void reset_system_info(struct system_info_t *sys);
 
 extern struct prof_session_t prof_session;
 

diff --git a/daemon/daemon.c b/daemon/daemon.c
index ccac967..b2affd3 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -677,31 +677,34 @@ static int hostServerHandler(int efd)
 static int controlSocketHandler(int efd)
 {
        ssize_t recv_len;
-       struct msg_t msg;
+       struct msg_t msg_head;
+       struct msg_t *msg;
        int res = 0;
 
        // Receive header
        recv_len = recv(manager.host.control_socket,
-                      &msg,
+                      &msg_head,
                       MSG_CMD_HDR_LEN, 0);
        // error or close request from host
        if (recv_len == -1 || recv_len == 0)
                return -11;
        else {
-               if (msg.len > 0) {
-                       msg.payload = malloc(msg.len);
-                       if (!msg.payload) {
-                               LOGE("Cannot alloc msg payload\n");
-                               sendACKCodeToHost(MSG_NOTOK, ERR_WRONG_MESSAGE_FORMAT);
-                               return -1;
-                       }
+               msg = malloc(MSG_CMD_HDR_LEN + msg_head.len);
+               if (!msg) {
+                       LOGE("Cannot alloc msg\n");
+                       sendACKCodeToHost(MSG_NOTOK, ERR_WRONG_MESSAGE_FORMAT);
+                       return -1;
+               }
+               msg->id = msg_head.id;
+               msg->len = msg_head.len;
+               if (msg->len > 0) {
                        // Receive payload (if exists)
                        recv_len = recv(manager.host.control_socket,
-                                       msg.payload,
-                                       msg.len, MSG_WAITALL);
+                                       msg->payload,
+                                       msg->len, MSG_WAITALL);
                }
-               res = host_message_handler(&msg);
-               reset_msg(&msg);
+               res = host_message_handler(msg);
+               free(msg);
        }
 
        return res;

diff --git a/daemon/threads.c b/daemon/threads.c
index 557c02d..fa809fe 100644 (file)
--- a/daemon/threads.c
+++ b/daemon/threads.c
@@ -139,7 +139,7 @@ static void* recvThread(void* data)
                else if(log.type == MSG_MSG)
                {
                        // don't send to host
-                       LOGI("EXTRA MSG %d|%d|%s\n", log.type, log.length, log.data);
+                       LOGI("EXTRA MSG type=%d;len=%d;data='%s'\n", log.type, log.length, log.data);
                        continue;
                }
 #ifdef PRINT_TARGET_LOG