add logs and error handling code 04/139404/1
authorDoyoun Kang <doyoun.kang@samsung.com>
Wed, 19 Jul 2017 01:00:08 +0000 (10:00 +0900)
committerDoyoun Kang <doyoun.kang@samsung.com>
Wed, 19 Jul 2017 01:00:08 +0000 (10:00 +0900)
Change-Id: I6059d0d25e6e06514704a0a4064b2efa942b4d20

src/e_mod_processmgr.c [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index 9ac3c55..cb4d600
@@ -96,10 +96,16 @@ _e_processmgr_process_is_focused(int pid)
 static Eldbus_Message *
 _e_processmgr_process_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
-   Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+   Eldbus_Message *reply = NULL;
    int pid = -1;
    int status = 0;
    int is_focused = 0;
+   Eina_Bool ret;
+
+   ELOGF("PROCESSMGR", "Get request - GetProcStatus", NULL, NULL);
+
+   reply = eldbus_message_method_return_new(msg);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL);
 
    if (!eldbus_message_arguments_get(msg, "i", &pid))
      {
@@ -110,7 +116,8 @@ _e_processmgr_process_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED
    status = e_process_state_get(pid);
    is_focused = _e_processmgr_process_is_focused(pid);
 
-   eldbus_message_arguments_append(reply, "ii", status, is_focused);
+   ret = eldbus_message_arguments_append(reply, "ii", status, is_focused);
+   ELOGF("PROCESSMGR", "Reply result:%d, state:%d, is_focused:%d", NULL, NULL, ret, status, is_focused);
 
    return reply;
 }
@@ -135,7 +142,7 @@ _process_id_get(E_Client *ec)
    return pid;
 }
 
-static void
+static Eina_Bool
 _msg_window_info_append(Eldbus_Message_Iter *iter)
 {
    Eldbus_Message_Iter *array_of_win;
@@ -145,6 +152,8 @@ _msg_window_info_append(Eldbus_Message_Iter *iter)
    Evas_Object *o;
    int noti_level;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(iter, EINA_FALSE);
+
    eldbus_message_iter_arguments_append(iter, "a("VALUE_TYPE_FOR_VISIBLE_WINS")", &array_of_win);
 
    // append info.
@@ -239,14 +248,22 @@ _msg_window_info_append(Eldbus_Message_Iter *iter)
      }
 
    eldbus_message_iter_container_close(iter, array_of_win);
+   return EINA_TRUE;
 }
 
 static Eldbus_Message *
 _e_processmgr_visible_window_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
-   Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+   Eldbus_Message *reply = NULL;
+   Eina_Bool ret;
+
+   ELOGF("PROCESSMGR", "Get request - GetVisibleWinInfo", NULL, NULL);
 
-   _msg_window_info_append(eldbus_message_iter_get(reply));
+   reply = eldbus_message_method_return_new(msg);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL);
+
+   ret = _msg_window_info_append(eldbus_message_iter_get(reply));
+   ELOGF("PROCESSMGR", "Reply result:%d", NULL, NULL, ret);
 
    return reply;
 }
@@ -257,14 +274,19 @@ _e_processmgr_focus_pid_get(const Eldbus_Service_Interface *iface EINA_UNUSED, c
    Eldbus_Message *reply = NULL;
    E_Client *ec;
    int pid = -1;
+   Eina_Bool ret;
+
+   ELOGF("PROCESSMGR", "Get request - GetFocusProc", NULL, NULL);
 
    reply = eldbus_message_method_return_new(msg);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL);
 
    ec = e_client_focused_get();
    if (ec)
      pid = _process_id_get(ec);
 
-   eldbus_message_arguments_append(reply, "i", pid);
+   ret = eldbus_message_arguments_append(reply, "i", pid);
+   ELOGF("PROCESSMGR", "Reply result:%d, pid:%d", NULL, NULL, ret, pid);
 
    return reply;
 }