Patchwork Fix -list-thread-groups --available logic and add test

login
register
mail settings
Submitter Simon Marchi
Date Oct. 4, 2017, 4 p.m.
Message ID <1507132859-27807-1-git-send-email-simon.marchi@ericsson.com>
Download mbox | patch
Permalink /patch/23326/
State New
Headers show

Comments

Simon Marchi - Oct. 4, 2017, 4 p.m.
New in v2:

- Match more precisely process entry in output.  Actually, match two, to
  test that giving more than one pid works.

Commit

  Use std::set in mi-main.c
  52f9abe4c739f42cc5f80b2629276493ac6306f9

changed the logic of the "-list-thread-groups --available" by mistake
when a pid is passed.  It prints all the processes except the one
specified by the given pid.  The correct behavior is to only print the
process corresponding to that pid.  this patch fixes that and adds a test.

gdb/ChangeLog:

	* mi/mi-main.c (list_available_thread_groups): Reverse filter logic.

gdb/testsuite/ChangeLog:

	* gdb.mi/list-thread-groups-available.exp: New file.
	* gdb.mi/list-thread-groups-available.c: New file.
---
 gdb/mi/mi-main.c                                   |  2 +-
 .../gdb.mi/list-thread-groups-available.c          | 29 +++++++++
 .../gdb.mi/list-thread-groups-available.exp        | 69 ++++++++++++++++++++++
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 gdb/testsuite/gdb.mi/list-thread-groups-available.c
 create mode 100644 gdb/testsuite/gdb.mi/list-thread-groups-available.exp
Pedro Alves - Oct. 4, 2017, 4:13 p.m.
On 10/04/2017 05:00 PM, Simon Marchi wrote:
> New in v2:
> 
> - Match more precisely process entry in output.  Actually, match two, to
>   test that giving more than one pid works.
> 

Great, thanks!

I noticed something else.  Don't we need to kill/reap
the spawned spawn_id's?

There's kill_wait_spawned_process for that, but it operators
on build, not on target.

Maybe it'd be OK to limit the test to local testing,
and so you'd use can_spawn_for_attach instead of
use_gdb_stub.

Hmm, actually, I do think that you should do that, given:

proc can_spawn_for_attach { } {
    # We use exp_pid to get the inferior's pid, assuming that gives
    # back the pid of the program.  On remote boards, that would give
    # us instead the PID of e.g., the ssh client, etc.
    if [is_remote target] then {
        return 0
    }

(the "we" above refers to spawn_id_get_pid.)

Thanks,
Pedro Alves
Simon Marchi - Oct. 4, 2017, 4:30 p.m.
On 2017-10-04 12:13 PM, Pedro Alves wrote:
> On 10/04/2017 05:00 PM, Simon Marchi wrote:
>> New in v2:
>>
>> - Match more precisely process entry in output.  Actually, match two, to
>>   test that giving more than one pid works.
>>
> 
> Great, thanks!
> 
> I noticed something else.  Don't we need to kill/reap
> the spawned spawn_id's?
> 
> There's kill_wait_spawned_process for that, but it operators
> on build, not on target.

I just assumed dejagnu/expect/tcl did that for us.  I looked at the process list just after
running the test and there are no leftover test processes.  I'll add some calls to
kill_wait_spawned_process anyhow.  If I replace use_gdb_stub with can_spawn_for_attach, as you
suggest, it should work since we know that build == target.

> Maybe it'd be OK to limit the test to local testing,
> and so you'd use can_spawn_for_attach instead of
> use_gdb_stub.
> 
> Hmm, actually, I do think that you should do that, given:
> 
> proc can_spawn_for_attach { } {
>     # We use exp_pid to get the inferior's pid, assuming that gives
>     # back the pid of the program.  On remote boards, that would give
>     # us instead the PID of e.g., the ssh client, etc.
>     if [is_remote target] then {
>         return 0
>     }
> 
> (the "we" above refers to spawn_id_get_pid.)

Good point, thanks.

Simon

Patch

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 83b1fcf..289445f 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -801,7 +801,7 @@  list_available_thread_groups (const std::set<int> &ids, int recurse)
       /* At present, the target will return all available processes
 	 and if information about specific ones was required, we filter
 	 undesired processes here.  */
-      if (!ids.empty () && ids.find (pid_i) != ids.end ())
+      if (!ids.empty () && ids.find (pid_i) == ids.end ())
 	continue;
 
       ui_out_emit_tuple tuple_emitter (uiout, NULL);
diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.c b/gdb/testsuite/gdb.mi/list-thread-groups-available.c
new file mode 100644
index 0000000..56daec9
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.c
@@ -0,0 +1,29 @@ 
+/* Copyright 2017 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <unistd.h>
+
+int
+main ()
+{
+  int i;
+
+  for (i = 0; i < 30; i++)
+    sleep (1);
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
new file mode 100644
index 0000000..b766b3a
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
@@ -0,0 +1,69 @@ 
+# Copyright 2017 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that -list-thread-groups --available works.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+standard_testfile
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "failed to compile"
+    return -1
+}
+
+if [mi_gdb_start] {
+    continue
+}
+
+if [use_gdb_stub] {
+    continue
+}
+
+set string_re {(?:[^\\"]|\\.)*}
+
+set id_re "id=\"$decimal\""
+set type_re "type=\"process\""
+set description_re "description=\"$string_re\""
+set user_re "user=\"$string_re\""
+set cores_re "cores=\[\"$decimal\"(,\"$decimal\")*\]"
+
+# List all available processes.
+set process_entry_re "{${id_re},${type_re}(,$description_re)?(,$user_re)?(,$cores_re)?}"
+
+mi_gdb_test \
+    "-list-thread-groups --available" \
+    "\\^done,groups=\\\[${process_entry_re}(,$process_entry_re)*\\\]" \
+    "list available thread groups"
+
+# List specific processes, make sure there are two entries.
+set spawn_id_1 [remote_spawn target $binfile]
+set pid_1 [spawn_id_get_pid $spawn_id_1]
+set id_re_1 "id=\"$pid_1\""
+
+set spawn_id_2 [remote_spawn target $binfile]
+set pid_2 [spawn_id_get_pid $spawn_id_2]
+set id_re_2 "id=\"$pid_2\""
+
+set process_entry_re_1 "{${id_re_1},${type_re}(,$description_re)?(,$user_re)?(,$cores_re)?}"
+set process_entry_re_2 "{${id_re_2},${type_re}(,$description_re)?(,$user_re)?(,$cores_re)?}"
+
+set process_list_re "(${process_entry_re_1},${process_entry_re_2}|${process_entry_re_2},${process_entry_re_1})"
+
+mi_gdb_test \
+    "-list-thread-groups --available i${pid_1} i${pid_2}" \
+    "\\^done,groups=\\\[${process_list_re}\\\]" \
+    "list available thread groups with filter"