rubyrun_instrumentor__.rb in rubyrun-0.9.9.1

- old
+ new

@@ -66,11 +66,11 @@
   # 5. Exclude inherited instances, private, protected, and singleton methods.
   # The way this works is that if m is one of these non-inherited instance
   # methods or singleton methods then it should NOT be excluded. Otherwise
   # it is assumed it is an inherited one and hence excluded.  
   def is_non_negotiably_excluded?(type, klass, id)    
-    return true if is_in?(RUBYRUN_FIREWALL_HASH, klass, id)
+    return true if is_in?(RUBYRUN_FIREWALL_HASH, klass, id, mode='strict')
     return true if id.id2name[-1,1] == '='  
     if id.id2name[0, RUBYRUN_PREFIX_LENGTH] == RUBYRUN_PREFIX
       $rubyrun_prev_method = id.id2name
       return true
     end
@@ -198,10 +198,10 @@
     t2 = Time.new
     if rubyrun_trace
       (t2 - t1) >= RUBYRUN_HIGHLIGHT_THRESHOLD ? (type = "* #{sprintf("%6.2f", t2-t1)} Exit ") : (type = "  #{sprintf("%6.2f", t2-t1)} Exit ")
       enter_trace(tid, type, nil, nil, klass, mid, nil) 
     end
-    report_rails_timing(klass, mid, t2, t1, tid) if $rubyrun_thread_local[tid] && (t2 - t1) > 0
+    report_rails_timing(klass, mid, t2, t1, tid) if $rubyrun_thread_local[tid] 
     result
   end
   
   # Instrument Thread.new by wrapping target proc with a 
   # begin-rescue clause around the application block.
\ No newline at end of file