diff options
| author | Marc Khouzam | 2012-01-20 03:13:36 +0000 |
|---|---|---|
| committer | Marc Khouzam | 2012-01-20 03:30:09 +0000 |
| commit | 03c9a71f0ad446078bd0847199ac6385a8809f74 (patch) | |
| tree | af0264cc94464e7c585e37aee49df6a3f7d8a9b1 | |
| parent | d4e6125b32ccae9e41c3e72af4ea262085be700f (diff) | |
| download | org.eclipse.cdt-03c9a71f0ad446078bd0847199ac6385a8809f74.tar.gz org.eclipse.cdt-03c9a71f0ad446078bd0847199ac6385a8809f74.tar.xz org.eclipse.cdt-03c9a71f0ad446078bd0847199ac6385a8809f74.zip | |
Bug 369168: threadOSId is not extracted for non-pthread programs
2 files changed, 9 insertions, 0 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThread.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThread.java index 679ee148d95..65d73a7b372 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThread.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThread.java @@ -119,6 +119,7 @@ public class MIThread { private static Pattern fgOsIdPattern1 = Pattern.compile("([Tt][Hh][Rr][Ee][Aa][Dd]\\s*)(0x[0-9a-fA-F]+|-?\\d+)(\\s*\\([Ll][Ww][Pp]\\s*)(\\d*)", 0); //$NON-NLS-1$ private static Pattern fgOsIdPattern2 = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*\\d+\\.(\\d+)", 0); //$NON-NLS-1$ private static Pattern fgOsIdPattern3 = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*(\\S+)", 0); //$NON-NLS-1$ + private static Pattern fgOsIdPattern4 = Pattern.compile("[Pp][Rr][Oo][Cc][Ee][Ss][Ss]\\s*(\\S+)", 0); //$NON-NLS-1$ static String parseOsId(String str) { // General format: @@ -127,6 +128,8 @@ public class MIThread { // "Thread 162.32942" // ^^^^^ // "thread abc123" + // + // "process 12345" => Linux without pthread. The process as one thread, the process thread. // ^^^^^^ // PLEASE UPDATE MIThreadTests.java IF YOU TWEAK THIS CODE @@ -145,6 +148,11 @@ public class MIThread { return matcher.group(1); } + matcher = fgOsIdPattern4.matcher(str); + if (matcher.find()) { + return matcher.group(1); + } + return null; } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThreadTests.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThreadTests.java index d0bde2e256c..e057709132f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThreadTests.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThreadTests.java @@ -12,6 +12,7 @@ public class MIThreadTests { assertEquals("abc123", MIThread.parseOsId("Thread abc123")); assertEquals("abc123", MIThread.parseOsId("thread abc123")); assertEquals("abc123", MIThread.parseOsId("THREAD abc123")); + assertEquals("abc123", MIThread.parseOsId("process abc123")); } @Test |