Add backtrace.mask flag to mask .java lines in backtrace.

ashanbrown · Feb 14, 2012 · 9f4d431 · 9f4d431
1 parent 4a59c65
commit 9f4d431
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/org/jruby/RubyInstanceConfig.java b/src/org/jruby/RubyInstanceConfig.java
@@ -333,6 +333,8 @@ public enum ProfilingMode {
     private TraceType traceType =
             TraceType.traceTypeFor(SafePropertyAccessor.getProperty("jruby.backtrace.style", "ruby_framed"));
 
+    private boolean backtraceMask = SafePropertyAccessor.getBoolean("jruby.backtrace.mask");
+
     public static final boolean ERRNO_BACKTRACE
             = SafePropertyAccessor.getBoolean("jruby.errno.backtrace", false);
 
@@ -642,6 +644,10 @@ public String getPropertyHelp() {
                 .append("       Log errors during reification (reify.classes=true). Default is false. \n")
                 .append("    reflected.handles=true|false\n")
                 .append("       Use reflection for binding methods, not generated bytecode. Default is false.\n")
+                .append("    backtrace.style=normal|raw|full|mri\n")
+                .append("       Set the style of exception backtraces. Default is normal.\n")
+                .append("    backtrace.mask=true|false\n")
+                .append("       Mask .java lines in Ruby backtraces. Default is false.\n")
                 .append("\nDEBUGGING/LOGGING:\n")
                 .append("    debug.loadService=true|false\n")
                 .append("       LoadService logging\n")
@@ -1826,6 +1832,24 @@ public TraceType getTraceType() {
     public void setTraceType(TraceType traceType) {
         this.traceType = traceType;
     }
+
+    /**
+     * Whether to mask .java lines in the Ruby backtrace, as MRI does for C calls.
+     *
+     * @return true if masking; false otherwise
+     */
+    public boolean getBacktraceMask() {
+        return backtraceMask;
+    }
+
+    /**
+     * Set whether to mask .java lines in the Ruby backtrace.
+     *
+     * @param backtraceMask true to mask; false otherwise
+     */
+    public void setBacktraceMask(boolean backtraceMask) {
+        this.backtraceMask = backtraceMask;
+    }
 
     public static boolean hasLoadedNativeExtensions() {
         return loadedNativeExtensions;

diff --git a/src/org/jruby/runtime/backtrace/TraceType.java b/src/org/jruby/runtime/backtrace/TraceType.java
@@ -88,7 +88,7 @@ public BacktraceData getBacktraceData(ThreadContext context, Thread thread, bool
                         thread.getStackTrace(),
                         context.createBacktrace2(0, nativeException),
                         false,
-                        false,
+                        context.runtime.getInstanceConfig().getBacktraceMask(),
                         this);
             }
         },