[e_info] add the name suboption for the kill

Change-Id: I05d6c929c06e00c56af2509db8a5830aa46f64cf
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 1c593a630f8e44b4e912dde090cddfd63db9eb8d..2786c95e9d49b0f72cae3c03759ba2f07ffb7e1b 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -71,7 +71,7 @@ typedef struct _E_Pending_Commit_Info
 #define VALUE_TYPE_REPLY_RESLIST "ssi"
 #define VALUE_TYPE_FOR_INPUTDEV "ssi"
 #define VALUE_TYPE_FOR_PENDING_COMMIT "uiuu"
-#define VALUE_TYPE_REQUEST_FOR_KILL "t"
+#define VALUE_TYPE_REQUEST_FOR_KILL "uts"
 #define VALUE_TYPE_REPLY_KILL "s"
 
 static E_Info_Client e_info_client;
@@ -2631,7 +2631,7 @@ arg_err:
 #define KILL_USAGE \
   "[COMMAND] [ARG]...\n" \
   "\t-id                  : the identifier for the resource whose creator is to be killed. (Usage: enlightenment_info -kill -id [id])\n" \
-  "\t-name(no implement)  : the name for the resource whose creator is to be killed. (Usage: enlightenment_info -kill -name [name])\n" \
+  "\t-name                : the name for the resource whose creator is to be killed. (Usage: enlightenment_info -kill -name [name])\n" \
   "\t-pid(no implement)   : the pid for the resource whose creator is to be killed. (Usage: enlightenment_info -kill -pid [pid])\n" \
   "\t-all(no implement)   : kill all clients with top level windows\n" \
   "\t-help\n" \
@@ -2664,14 +2664,19 @@ _e_info_client_cb_kill_client(const Eldbus_Message *msg)
    const char *name = NULL, *text = NULL;
    Eina_Bool res;
    const char *result = NULL;
+   Eldbus_Message_Iter *array_of_string;
 
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, VALUE_TYPE_REPLY_KILL, &result);
+   res = eldbus_message_arguments_get(msg, "a"VALUE_TYPE_REPLY_KILL, &array_of_string);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
 
-   printf("%s\n", result);
+   while (eldbus_message_iter_get_and_next(array_of_string, 's', &result))
+     {
+        printf("%s\n", result);
+     }
+
    return;
 
 finish:
@@ -2684,13 +2689,18 @@ finish:
 static void
 _e_info_client_proc_kill_client(int argc, char **argv)
 {
+   const static int KILL_ID_MODE = 1;
+   const static int KILL_NAME_MODE = 2;
    Eina_Bool res;
-   uint64_t win;
+   uint64_t uint64_value;
+   const char *str_value = "";
+   uint32_t mode;
 
    if (argc == 2)
      {
+        mode = KILL_ID_MODE;
         printf("Select the window whose client you wish to kill\n");
-        if (_e_get_window_under_touch((Ecore_Window)&win))
+        if (_e_get_window_under_touch((Ecore_Window *)&uint64_value))
           {
              printf("Error: cannot get window under touch\n");
              return;
@@ -2700,13 +2710,19 @@ _e_info_client_proc_kill_client(int argc, char **argv)
      {
         if (eina_streq(argv[2], "-id"))
           {
+             mode = KILL_ID_MODE;
              if (strlen(argv[3]) >= 2 && argv[3][0] == '0' && argv[3][1] == 'x')
-               res = _util_string_to_ulong(argv[3], (unsigned long *)&win, 16);
+               res = _util_string_to_ulong(argv[3], (unsigned long *)&uint64_value, 16);
              else
-               res = _util_string_to_ulong(argv[3], (unsigned long *)&win, 10);
+               res = _util_string_to_ulong(argv[3], (unsigned long *)&uint64_value, 10);
 
              EINA_SAFETY_ON_FALSE_RETURN(res);
           }
+        else if (eina_streq(argv[2], "-name"))
+          {
+             mode = KILL_NAME_MODE;
+             str_value = argv[3];
+          }
         else
           goto arg_err;
      }
@@ -2716,7 +2732,7 @@ _e_info_client_proc_kill_client(int argc, char **argv)
    res = _e_info_client_eldbus_message_with_args("kill_client",
                                                  _e_info_client_cb_kill_client,
                                                  VALUE_TYPE_REQUEST_FOR_KILL,
-                                                 win);
+                                                 mode, uint64_value, str_value);
    EINA_SAFETY_ON_FALSE_RETURN(res);
 
    return;

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 0ea10be7a62ac718db8da5d9a0fe371998e2a277..7f1ae4ff32c790c8a649fe2124dddaf03f213f0d 100755 (executable)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -86,7 +86,7 @@ static Eina_List *module_hook = NULL;
 #define VALUE_TYPE_REPLY_RESLIST "ssi"
 #define VALUE_TYPE_FOR_INPUTDEV "ssi"
 #define VALUE_TYPE_FOR_PENDING_COMMIT "uiuu"
-#define VALUE_TYPE_REQUEST_FOR_KILL "t"
+#define VALUE_TYPE_REQUEST_FOR_KILL "uts"
 #define VALUE_TYPE_REPLY_KILL "s"
 
 enum
@@ -3070,16 +3070,58 @@ _e_info_server_ec_find_by_win(Ecore_Window win)
    return NULL;
 }
 
+static int
+_e_info_server_ec_kill_by_name(const char *name, Eldbus_Message_Iter *array_of_string)
+{
+   E_Client *ec;
+   Evas_Object *o;
+   int count = 0;
+   char result[1024];
+
+   for (o = evas_object_top_get(e_comp->evas); o; o = evas_object_below_get(o))
+     {
+        const char *ec_name, *find;
+
+        ec = evas_object_data_get(o, "E_Client");
+        if (!ec) continue;
+        if (e_client_util_ignored_get(ec)) continue;
+
+        ec_name = e_client_util_name_get(ec) ?: "NO NAME";
+
+        find = strstr(ec_name, name);
+
+        if (find)
+          {
+             count++;
+             e_client_act_kill_begin(ec);
+             snprintf(result, sizeof(result),
+                       "[Server] killing creator(%s) of resource 0x%lx",
+                       ec_name, (unsigned long)e_client_util_win_get(ec));
+             eldbus_message_iter_arguments_append(array_of_string, VALUE_TYPE_REPLY_KILL, result);
+          }
+     }
+
+   return count;
+}
+
 static Eldbus_Message *
 _e_info_server_cb_kill_client(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
+   const static int KILL_ID_MODE = 1;
+   const static int KILL_NAME_MODE = 2;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+   Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
    Eina_Bool res;
    char result[1024];
    E_Client *ec;
-   uint64_t win;
-
-   res = eldbus_message_arguments_get(msg, VALUE_TYPE_REQUEST_FOR_KILL, &win);
+   uint64_t uint64_value;
+   uint32_t mode;
+   const char *str_value;
+   int count;
+   Eldbus_Message_Iter *array_of_string;
+
+   res = eldbus_message_arguments_get(msg, VALUE_TYPE_REQUEST_FOR_KILL,
+                                      &mode, &uint64_value, &str_value);
    if (res != EINA_TRUE)
      {
         snprintf(result, sizeof(result),
@@ -3087,21 +3129,41 @@ _e_info_server_cb_kill_client(const Eldbus_Service_Interface *iface EINA_UNUSED,
         goto finish;
      }
 
-   ec = _e_info_server_ec_find_by_win((Ecore_Window)win);
-   if (!ec)
+   eldbus_message_iter_arguments_append(iter, "a"VALUE_TYPE_REPLY_KILL, &array_of_string);
+
+   if (mode == KILL_ID_MODE)
      {
-        snprintf(result, sizeof(result),
-                "[Server] Error: cannot find the E_Client.");
-        goto finish;
-     }
+        Ecore_Window win = uint64_value;
+
+        ec = _e_info_server_ec_find_by_win(win);
+        if (!ec)
+          {
+             snprintf(result, sizeof(result),
+                     "[Server] Error: cannot find the E_Client.");
+             goto finish;
+          }
 
-   e_client_act_kill_begin(ec);
+        e_client_act_kill_begin(ec);
 
-   snprintf(result, sizeof(result),
-           "[Server] killing creator(%s) of resource 0x%lx", e_client_util_name_get(ec) ?: "NO NAME", (unsigned long)win);
+        snprintf(result, sizeof(result),
+                "[Server] killing creator(%s) of resource 0x%lx",
+                e_client_util_name_get(ec) ?: "NO NAME", (unsigned long)win);
+     }
+   else if (mode == KILL_NAME_MODE)
+     {
+        count = _e_info_server_ec_kill_by_name(str_value, array_of_string);
+        snprintf(result, sizeof(result),
+                  "\n[Server] killed %d client(s)", count);
+     }
+   else
+     {
+        snprintf(result, sizeof(result),
+                 "[Server] Error: wrong mode.");
+     }
 
 finish:
-   eldbus_message_arguments_append(reply, VALUE_TYPE_REPLY_KILL, result);
+   eldbus_message_iter_arguments_append(array_of_string, VALUE_TYPE_REPLY_KILL, result);
+   eldbus_message_iter_container_close(iter, array_of_string);
 
    return reply;
 }
@@ -3147,7 +3209,7 @@ static const Eldbus_Method methods[] = {
    { "frender", ELDBUS_ARGS({"i", "frender"}), ELDBUS_ARGS({"s", "force_render_result"}), _e_info_server_cb_force_render, 0},
    { "screen_rotation", ELDBUS_ARGS({"i", "value"}), NULL, _e_info_server_cb_screen_rotation, 0},
    { "get_win_under_touch", NULL, ELDBUS_ARGS({"i", "result"}), _e_info_server_cb_get_win_under_touch, 0 },
-   { "kill_client", ELDBUS_ARGS({VALUE_TYPE_REQUEST_FOR_KILL, "window"}), ELDBUS_ARGS({VALUE_TYPE_REPLY_KILL, "kill result"}), _e_info_server_cb_kill_client, 0 },
+   { "kill_client", ELDBUS_ARGS({VALUE_TYPE_REQUEST_FOR_KILL, "window"}), ELDBUS_ARGS({"a"VALUE_TYPE_REPLY_KILL, "kill result"}), _e_info_server_cb_kill_client, 0 },
    { NULL, NULL, NULL, NULL, 0 }
 };