diff options
| -rw-r--r-- | test/2246-trace-stream/expected-stdout.txt | 244 | ||||
| -rw-r--r-- | test/2246-trace-stream/src/NonStreamTraceParser.java | 2 |
2 files changed, 119 insertions, 127 deletions
diff --git a/test/2246-trace-stream/expected-stdout.txt b/test/2246-trace-stream/expected-stdout.txt index 37f4aea518..da5e84c837 100644 --- a/test/2246-trace-stream/expected-stdout.txt +++ b/test/2246-trace-stream/expected-stdout.txt @@ -119,130 +119,122 @@ ...<< main Main doSomeWorkThrow ()V Main.java ...>> main Main$VMDebug $noinline$stopMethodTracing ()V Main.java ***** non streaming test - dual clock ******* -.>> TestThread2246 java.lang.Thread run ()V Thread.java -..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass -...>> TestThread2246 Main lambda$testTracing$0 (IZLBaseTraceParser;I)V Main.java -....>> TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -......>> TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -.......>> TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -.......<< TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -......<< TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -.....<< TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -....<< TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -....>> TestThread2246 Main <init> ()V Main.java -.....>> TestThread2246 java.lang.Object <init> ()V Object.java -.....<< TestThread2246 java.lang.Object <init> ()V Object.java -....<< TestThread2246 Main <init> ()V Main.java -....>> TestThread2246 Main $noinline$doSomeWork ()V Main.java -.....>> TestThread2246 Main callOuterFunction ()V Main.java -......>> TestThread2246 Main callLeafFunction ()V Main.java -......<< TestThread2246 Main callLeafFunction ()V Main.java -.....<< TestThread2246 Main callOuterFunction ()V Main.java -.....>> TestThread2246 Main callLeafFunction ()V Main.java -.....<< TestThread2246 Main callLeafFunction ()V Main.java -....<< TestThread2246 Main $noinline$doSomeWork ()V Main.java -....>> TestThread2246 Main$VMDebug $noinline$stopMethodTracing ()V Main.java -.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -......>> TestThread2246 dalvik.system.VMDebug stopMethodTracing ()V VMDebug.java -.>> main Main main ([Ljava/lang/String;)V Main.java -..>> main Main testTracing (ZILBaseTraceParser;I)V Main.java -...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -.....>> main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -......>> main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -......<< main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -.....<< main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -....<< main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -...<< main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -...>> main Main $noinline$doSomeWork ()V Main.java -....>> main Main callOuterFunction ()V Main.java -.....>> main Main callLeafFunction ()V Main.java -.....<< main Main callLeafFunction ()V Main.java -....<< main Main callOuterFunction ()V Main.java -....>> main Main callLeafFunction ()V Main.java -....<< main Main callLeafFunction ()V Main.java -...<< main Main $noinline$doSomeWork ()V Main.java -...>> main Main doSomeWorkThrow ()V Main.java -....>> main Main callThrowFunction ()V Main.java -.....>> main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java -......>> main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java -.......>> main java.lang.Object <init> ()V Object.java -.......<< main java.lang.Object <init> ()V Object.java -.......>> main java.util.Collections emptyList ()Ljava/util/List; Collections.java -.......<< main java.util.Collections emptyList ()Ljava/util/List; Collections.java -.......>> main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java -........>> main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java -........<< main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java -.......<< main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java -......<< main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java -.....<< main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java -....<<E main Main callThrowFunction ()V Main.java -...<< main Main doSomeWorkThrow ()V Main.java -...>> main Main$VMDebug $noinline$stopMethodTracing ()V Main.java -....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -.....>> main dalvik.system.VMDebug stopMethodTracing ()V VMDebug.java +.>> TestThread2246 java.lang.Thread run ()V Thread.java +..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass +...>> TestThread2246 Main lambda$testTracing$0 (IZLBaseTraceParser;I)V Main.java +....>> TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +......>> TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +.......>> TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +.......<< TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +......<< TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +.....<< TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +....<< TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +....>> TestThread2246 Main <init> ()V Main.java +.....>> TestThread2246 java.lang.Object <init> ()V Object.java +.....<< TestThread2246 java.lang.Object <init> ()V Object.java +....<< TestThread2246 Main <init> ()V Main.java +....>> TestThread2246 Main $noinline$doSomeWork ()V Main.java +.....>> TestThread2246 Main callOuterFunction ()V Main.java +......>> TestThread2246 Main callLeafFunction ()V Main.java +......<< TestThread2246 Main callLeafFunction ()V Main.java +.....<< TestThread2246 Main callOuterFunction ()V Main.java +.....>> TestThread2246 Main callLeafFunction ()V Main.java +.....<< TestThread2246 Main callLeafFunction ()V Main.java +....<< TestThread2246 Main $noinline$doSomeWork ()V Main.java +....>> TestThread2246 Main$VMDebug $noinline$stopMethodTracing ()V Main.java +.>> main Main main ([Ljava/lang/String;)V Main.java +..>> main Main testTracing (ZILBaseTraceParser;I)V Main.java +...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +.....>> main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +......>> main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +......<< main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +.....<< main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +....<< main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +...<< main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +...>> main Main $noinline$doSomeWork ()V Main.java +....>> main Main callOuterFunction ()V Main.java +.....>> main Main callLeafFunction ()V Main.java +.....<< main Main callLeafFunction ()V Main.java +....<< main Main callOuterFunction ()V Main.java +....>> main Main callLeafFunction ()V Main.java +....<< main Main callLeafFunction ()V Main.java +...<< main Main $noinline$doSomeWork ()V Main.java +...>> main Main doSomeWorkThrow ()V Main.java +....>> main Main callThrowFunction ()V Main.java +.....>> main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java +......>> main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java +.......>> main java.lang.Object <init> ()V Object.java +.......<< main java.lang.Object <init> ()V Object.java +.......>> main java.util.Collections emptyList ()Ljava/util/List; Collections.java +.......<< main java.util.Collections emptyList ()Ljava/util/List; Collections.java +.......>> main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java +........>> main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java +........<< main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java +.......<< main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java +......<< main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java +.....<< main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java +....<<E main Main callThrowFunction ()V Main.java +...<< main Main doSomeWorkThrow ()V Main.java +...>> main Main$VMDebug $noinline$stopMethodTracing ()V Main.java ***** non streaming test - wall clock ******* -.>> TestThread2246 java.lang.Thread run ()V Thread.java -..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass -...>> TestThread2246 Main lambda$testTracing$0 (IZLBaseTraceParser;I)V Main.java -....>> TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -......>> TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -.......>> TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -.......<< TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -......<< TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -.....<< TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -....<< TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -....>> TestThread2246 Main <init> ()V Main.java -.....>> TestThread2246 java.lang.Object <init> ()V Object.java -.....<< TestThread2246 java.lang.Object <init> ()V Object.java -....<< TestThread2246 Main <init> ()V Main.java -....>> TestThread2246 Main $noinline$doSomeWork ()V Main.java -.....>> TestThread2246 Main callOuterFunction ()V Main.java -......>> TestThread2246 Main callLeafFunction ()V Main.java -......<< TestThread2246 Main callLeafFunction ()V Main.java -.....<< TestThread2246 Main callOuterFunction ()V Main.java -.....>> TestThread2246 Main callLeafFunction ()V Main.java -.....<< TestThread2246 Main callLeafFunction ()V Main.java -....<< TestThread2246 Main $noinline$doSomeWork ()V Main.java -....>> TestThread2246 Main$VMDebug $noinline$stopMethodTracing ()V Main.java -.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -......>> TestThread2246 dalvik.system.VMDebug stopMethodTracing ()V VMDebug.java -.>> main Main main ([Ljava/lang/String;)V Main.java -..>> main Main testTracing (ZILBaseTraceParser;I)V Main.java -...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -.....>> main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -......>> main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -......<< main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java -.....<< main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java -....<< main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -...<< main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java -...>> main Main $noinline$doSomeWork ()V Main.java -....>> main Main callOuterFunction ()V Main.java -.....>> main Main callLeafFunction ()V Main.java -.....<< main Main callLeafFunction ()V Main.java -....<< main Main callOuterFunction ()V Main.java -....>> main Main callLeafFunction ()V Main.java -....<< main Main callLeafFunction ()V Main.java -...<< main Main $noinline$doSomeWork ()V Main.java -...>> main Main doSomeWorkThrow ()V Main.java -....>> main Main callThrowFunction ()V Main.java -.....>> main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java -......>> main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java -.......>> main java.lang.Object <init> ()V Object.java -.......<< main java.lang.Object <init> ()V Object.java -.......>> main java.util.Collections emptyList ()Ljava/util/List; Collections.java -.......<< main java.util.Collections emptyList ()Ljava/util/List; Collections.java -.......>> main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java -........>> main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java -........<< main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java -.......<< main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java -......<< main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java -.....<< main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java -....<<E main Main callThrowFunction ()V Main.java -...<< main Main doSomeWorkThrow ()V Main.java -...>> main Main$VMDebug $noinline$stopMethodTracing ()V Main.java -....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java -.....>> main dalvik.system.VMDebug stopMethodTracing ()V VMDebug.java +.>> TestThread2246 java.lang.Thread run ()V Thread.java +..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass +...>> TestThread2246 Main lambda$testTracing$0 (IZLBaseTraceParser;I)V Main.java +....>> TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +.....>> TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +......>> TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +.......>> TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +.......<< TestThread2246 dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +......<< TestThread2246 dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +.....<< TestThread2246 java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +....<< TestThread2246 Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +....>> TestThread2246 Main <init> ()V Main.java +.....>> TestThread2246 java.lang.Object <init> ()V Object.java +.....<< TestThread2246 java.lang.Object <init> ()V Object.java +....<< TestThread2246 Main <init> ()V Main.java +....>> TestThread2246 Main $noinline$doSomeWork ()V Main.java +.....>> TestThread2246 Main callOuterFunction ()V Main.java +......>> TestThread2246 Main callLeafFunction ()V Main.java +......<< TestThread2246 Main callLeafFunction ()V Main.java +.....<< TestThread2246 Main callOuterFunction ()V Main.java +.....>> TestThread2246 Main callLeafFunction ()V Main.java +.....<< TestThread2246 Main callLeafFunction ()V Main.java +....<< TestThread2246 Main $noinline$doSomeWork ()V Main.java +....>> TestThread2246 Main$VMDebug $noinline$stopMethodTracing ()V Main.java +.>> main Main main ([Ljava/lang/String;)V Main.java +..>> main Main testTracing (ZILBaseTraceParser;I)V Main.java +...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +....>> main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +.....>> main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +......>> main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +......<< main dalvik.system.VMDebug startMethodTracingFd (Ljava/lang/String;IIIZIZ)V VMDebug.java +.....<< main dalvik.system.VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V VMDebug.java +....<< main java.lang.reflect.Method invoke (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; Method.java +...<< main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java +...>> main Main $noinline$doSomeWork ()V Main.java +....>> main Main callOuterFunction ()V Main.java +.....>> main Main callLeafFunction ()V Main.java +.....<< main Main callLeafFunction ()V Main.java +....<< main Main callOuterFunction ()V Main.java +....>> main Main callLeafFunction ()V Main.java +....<< main Main callLeafFunction ()V Main.java +...<< main Main $noinline$doSomeWork ()V Main.java +...>> main Main doSomeWorkThrow ()V Main.java +....>> main Main callThrowFunction ()V Main.java +.....>> main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java +......>> main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java +.......>> main java.lang.Object <init> ()V Object.java +.......<< main java.lang.Object <init> ()V Object.java +.......>> main java.util.Collections emptyList ()Ljava/util/List; Collections.java +.......<< main java.util.Collections emptyList ()Ljava/util/List; Collections.java +.......>> main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java +........>> main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java +........<< main java.lang.Throwable nativeFillInStackTrace ()Ljava/lang/Object; Throwable.java +.......<< main java.lang.Throwable fillInStackTrace ()Ljava/lang/Throwable; Throwable.java +......<< main java.lang.Throwable <init> (Ljava/lang/String;)V Throwable.java +.....<< main java.lang.Exception <init> (Ljava/lang/String;)V Exception.java +....<<E main Main callThrowFunction ()V Main.java +...<< main Main doSomeWorkThrow ()V Main.java +...>> main Main$VMDebug $noinline$stopMethodTracing ()V Main.java diff --git a/test/2246-trace-stream/src/NonStreamTraceParser.java b/test/2246-trace-stream/src/NonStreamTraceParser.java index d9658a4289..f106c49bb8 100644 --- a/test/2246-trace-stream/src/NonStreamTraceParser.java +++ b/test/2246-trace-stream/src/NonStreamTraceParser.java @@ -66,7 +66,7 @@ public class NonStreamTraceParser extends BaseTraceParser { line = readLine(); while (!line.startsWith(START_SECTION_ID)) { String[] methodInfo = line.split("\t", 2); - methodIdMap.put(Integer.decode(methodInfo[0]), methodInfo[1]); + methodIdMap.put(Integer.decode(methodInfo[0]), methodInfo[1].replace('\t', ' ')); line = readLine(); } |