Mercurial > hg > truffle

changeset 5027:b0fe44319c71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow multiple entries in methodFilter
author Christian Wimmer <Christian.Wimmer@Oracle.com>
date Mon, 05 Mar 2012 16:07:42 -0800
parents b11561111585
children a775efb8fcec
files graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java	Mon Mar 05 09:55:54 2012 -0800
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java	Mon Mar 05 16:07:42 2012 -0800
@@ -39,7 +39,7 @@
     private final String meterFilter;
     private final String timerFilter;
     private final String dumpFilter;
-    private final String methodFilter;
+    private final String[] methodFilter;
     private final List<DebugDumpHandler> dumpHandlers = new ArrayList<>();
 
     public HotSpotDebugConfig(String logFilter, String meterFilter, String timerFilter, String dumpFilter, String methodFilter) {
@@ -47,7 +47,7 @@
         this.meterFilter = meterFilter;
         this.timerFilter = timerFilter;
         this.dumpFilter = dumpFilter;
-        this.methodFilter = methodFilter;
+        this.methodFilter = methodFilter == null ? null : methodFilter.split(",");
         dumpHandlers.add(new IdealGraphPrinterDumpHandler(GraalOptions.PrintIdealGraphAddress, GraalOptions.PrintIdealGraphPort));
         dumpHandlers.add(new CFGPrinterObserver());
     }
@@ -89,9 +89,11 @@
         } else {
             for (Object o : Debug.context()) {
                 if (o instanceof RiMethod) {
-                    RiMethod riMethod = (RiMethod) o;
-                    if (CiUtil.format("%H.%n", riMethod).contains(methodFilter)) {
-                        return true;
+                    String methodName = CiUtil.format("%H.%n", (RiMethod) o);
+                    for (String filter : methodFilter) {
+                        if (methodName.contains(filter)) {
+                            return true;
+                        }
                     }
                 }
             }
@@ -107,7 +109,7 @@
         add(sb, "Meter", meterFilter);
         add(sb, "Time", timerFilter);
         add(sb, "Dump", dumpFilter);
-        add(sb, "MethodFilter", methodFilter);
+        add(sb, "MethodFilter", Arrays.toString(methodFilter));
         return sb.toString();
     }