diff options
| author | Massimiliano Mantione <massi@mono-cvs.ximian.com> | 2009-06-12 11:57:06 +0400 |
|---|---|---|
| committer | Massimiliano Mantione <massi@mono-cvs.ximian.com> | 2009-06-12 11:57:06 +0400 |
| commit | 2f2a08041a4fa884995504279dc93c83df06e5eb (patch) | |
| tree | 22ad87de9b9c52b09108074aea65d9173d4e56ab | |
| parent | 7e673274b65be2c20857f3d495ae8aea3a22ebb4 (diff) | |
Properly merged the fix for call stack execution time attribution.
svn path=/trunk/mono-tools/; revision=135974
| -rw-r--r-- | Mono.Profiler/profiler-decoder-library/ChangeLog | 4 | ||||
| -rw-r--r-- | Mono.Profiler/profiler-decoder-library/ObjectModel.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Mono.Profiler/profiler-decoder-library/ChangeLog b/Mono.Profiler/profiler-decoder-library/ChangeLog index 2b8b4e92..1269f706 100644 --- a/Mono.Profiler/profiler-decoder-library/ChangeLog +++ b/Mono.Profiler/profiler-decoder-library/ChangeLog @@ -1,4 +1,8 @@ 2009-06-12 Massimiliano Mantione <massi@ximian.com> + * ObjectModel.cs (CallStack.MethodExit and CallStack.PopMethod): + properly merged the fix for call stack execution time attribution. + +2009-06-12 Massimiliano Mantione <massi@ximian.com> * ObjectModel.cs: added method execution time accounting on individual stack frames in the call tree. diff --git a/Mono.Profiler/profiler-decoder-library/ObjectModel.cs b/Mono.Profiler/profiler-decoder-library/ObjectModel.cs index 4d2ef4c3..76e4e20f 100644 --- a/Mono.Profiler/profiler-decoder-library/ObjectModel.cs +++ b/Mono.Profiler/profiler-decoder-library/ObjectModel.cs @@ -585,10 +585,6 @@ namespace Mono.Profiler { stackTop = StackFrame.FrameFactory (method, counter, false, stackTop); } internal void MethodExit (LoadedMethod method, ulong counter) { - StackTrace trace = StackTrace.NewStackTrace (this); - if (trace != null) { - trace.RegisterCall (counter); - } PopMethod (method, counter, false); } internal void TopMethodExit (ulong counter) { |