diff options
| author | 2023-04-26 15:54:34 +0000 | |
|---|---|---|
| committer | 2023-04-26 20:43:11 +0000 | |
| commit | 89fae872b0aa0c7186ee11bdf1f5732de3f66030 (patch) | |
| tree | cf4612dd6fb0cec8354efdd2af41b29e05b851bf | |
| parent | f3862dab54662b7b7e5d5cc90120b4fd2f3d43f6 (diff) | |
Revert "Update test to not trace thread start / join"
This reverts commit 04c7c63a3694074640eaad54c61a4c4bcb02cb6b.
Reason for revert: Causes breakages on luci:
https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cms/8691/overview
Change-Id: I77b8dd52fc2402170df9a000b30311580cf918dc
| -rw-r--r-- | test/2246-trace-stream/expected-stdout.txt | 88 | ||||
| -rw-r--r-- | test/2246-trace-stream/src/Main.java | 24 |
2 files changed, 58 insertions, 54 deletions
diff --git a/test/2246-trace-stream/expected-stdout.txt b/test/2246-trace-stream/expected-stdout.txt index 02139f3aa7..d6ad93c625 100644 --- a/test/2246-trace-stream/expected-stdout.txt +++ b/test/2246-trace-stream/expected-stdout.txt @@ -1,15 +1,7 @@ ***** streaming test ******* .>> TestThread2246 java.lang.Thread run ()V Thread.java ..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass -...>> TestThread2246 Main lambda$testTracing$0 (Ljava/io/FileOutputStream;ZLBaseTraceParser;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 lambda$testTracing$0 ()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 @@ -22,13 +14,9 @@ .....>> 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 (ZLBaseTraceParser;I)V Main.java -...>> main java.lang.Thread join ()V Thread.java -....>> main java.lang.Thread join (J)V Thread.java -.....>> main java.lang.Object wait (J)V Object.java -......>> main java.lang.Object wait (JI)V Object.java +...<< TestThread2246 Main lambda$testTracing$0 ()V Main.java +..<< TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass +.<< TestThread2246 java.lang.Thread run ()V Thread.java .>> main Main main ([Ljava/lang/String;)V Main.java ..>> main Main testTracing (ZLBaseTraceParser;I)V Main.java ...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java @@ -39,6 +27,26 @@ .....<< 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 java.lang.Thread start ()V Thread.java +....>> main java.lang.ThreadGroup add (Ljava/lang/Thread;)V ThreadGroup.java +....<< main java.lang.ThreadGroup add (Ljava/lang/Thread;)V ThreadGroup.java +....>> main java.lang.Thread nativeCreate (Ljava/lang/Thread;JZ)V Thread.java +....<< main java.lang.Thread nativeCreate (Ljava/lang/Thread;JZ)V Thread.java +...<< main java.lang.Thread start ()V Thread.java +...>> main java.lang.Thread join ()V Thread.java +....>> main java.lang.Thread join (J)V Thread.java +.....>> main java.lang.System currentTimeMillis ()J System.java +.....<< main java.lang.System currentTimeMillis ()J System.java +.....>> main java.lang.Thread isAlive ()Z Thread.java +.....<< main java.lang.Thread isAlive ()Z Thread.java +.....>> main java.lang.Object wait (J)V Object.java +......>> main java.lang.Object wait (JI)V Object.java +......<< main java.lang.Object wait (JI)V Object.java +.....<< main java.lang.Object wait (J)V Object.java +.....>> main java.lang.Thread isAlive ()Z Thread.java +.....<< main java.lang.Thread isAlive ()Z Thread.java +....<< main java.lang.Thread join (J)V Thread.java +...<< main java.lang.Thread join ()V Thread.java ...>> main Main $noinline$doSomeWork ()V Main.java ....>> main Main callOuterFunction ()V Main.java .....>> main Main callLeafFunction ()V Main.java @@ -67,15 +75,7 @@ ***** non streaming test ******* .>> TestThread2246 java.lang.Thread run ()V Thread.java ..>> TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass -...>> TestThread2246 Main lambda$testTracing$0 (Ljava/io/FileOutputStream;ZLBaseTraceParser;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 lambda$testTracing$0 ()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 @@ -88,15 +88,15 @@ .....>> 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 (ZLBaseTraceParser;I)V Main.java -...>> main java.lang.Thread join ()V Thread.java -....>> main java.lang.Thread join (J)V Thread.java -.....>> main java.lang.Object wait (J)V Object.java -......>> main java.lang.Object wait (JI)V Object.java +...<< TestThread2246 Main lambda$testTracing$0 ()V Main.java +..<< TestThread2246 Main$$ExternalSyntheticLambda0 run ()V D8$$SyntheticClass +.<< TestThread2246 java.lang.Thread run ()V Thread.java +.>> TestThread2246 java.lang.ThreadGroup threadTerminated (Ljava/lang/Thread;)V ThreadGroup.java +..>> TestThread2246 java.lang.ThreadGroup remove (Ljava/lang/Thread;)V ThreadGroup.java +...>> TestThread2246 java.lang.System arraycopy (Ljava/lang/Object;ILjava/lang/Object;II)V System.java +...<< TestThread2246 java.lang.System arraycopy (Ljava/lang/Object;ILjava/lang/Object;II)V System.java +..<< TestThread2246 java.lang.ThreadGroup remove (Ljava/lang/Thread;)V ThreadGroup.java +.<< TestThread2246 java.lang.ThreadGroup threadTerminated (Ljava/lang/Thread;)V ThreadGroup.java .>> main Main main ([Ljava/lang/String;)V Main.java ..>> main Main testTracing (ZLBaseTraceParser;I)V Main.java ...>> main Main$VMDebug startMethodTracing (Ljava/lang/String;Ljava/io/FileDescriptor;IIZIZ)V Main.java @@ -107,6 +107,26 @@ .....<< 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 java.lang.Thread start ()V Thread.java +....>> main java.lang.ThreadGroup add (Ljava/lang/Thread;)V ThreadGroup.java +....<< main java.lang.ThreadGroup add (Ljava/lang/Thread;)V ThreadGroup.java +....>> main java.lang.Thread nativeCreate (Ljava/lang/Thread;JZ)V Thread.java +....<< main java.lang.Thread nativeCreate (Ljava/lang/Thread;JZ)V Thread.java +...<< main java.lang.Thread start ()V Thread.java +...>> main java.lang.Thread join ()V Thread.java +....>> main java.lang.Thread join (J)V Thread.java +.....>> main java.lang.System currentTimeMillis ()J System.java +.....<< main java.lang.System currentTimeMillis ()J System.java +.....>> main java.lang.Thread isAlive ()Z Thread.java +.....<< main java.lang.Thread isAlive ()Z Thread.java +.....>> main java.lang.Object wait (J)V Object.java +......>> main java.lang.Object wait (JI)V Object.java +......<< main java.lang.Object wait (JI)V Object.java +.....<< main java.lang.Object wait (J)V Object.java +.....>> main java.lang.Thread isAlive ()Z Thread.java +.....<< main java.lang.Thread isAlive ()Z Thread.java +....<< main java.lang.Thread join (J)V Thread.java +...<< main java.lang.Thread join ()V Thread.java ...>> main Main $noinline$doSomeWork ()V Main.java ....>> main Main callOuterFunction ()V Main.java .....>> main Main callLeafFunction ()V Main.java diff --git a/test/2246-trace-stream/src/Main.java b/test/2246-trace-stream/src/Main.java index e76f1bde7e..daada7d1b1 100644 --- a/test/2246-trace-stream/src/Main.java +++ b/test/2246-trace-stream/src/Main.java @@ -47,38 +47,22 @@ public class Main { FileOutputStream out_file = new FileOutputStream(file); Main m = new Main(); Thread t = new Thread(() -> { - try { - VMDebug.startMethodTracing( - file.getPath(), out_file.getFD(), 0, 0, false, 0, streaming); - Main m1 = new Main(); - m1.$noinline$doSomeWork(); - VMDebug.$noinline$stopMethodTracing(); - out_file.close(); - parser.CheckTraceFileFormat(file, expected_version); - file.delete(); - } catch (Exception e) { - System.out.println("Exception in thread " + e); - e.printStackTrace(); - } + Main m1 = new Main(); + m1.$noinline$doSomeWork(); }, "TestThread2246"); try { if (VMDebug.getMethodTracingMode() != 0) { VMDebug.$noinline$stopMethodTracing(); } + VMDebug.startMethodTracing(file.getPath(), out_file.getFD(), 0, 0, false, 0, streaming); t.start(); t.join(); - - file = createTempFile(); - FileOutputStream main_out_file = new FileOutputStream(file); - VMDebug.startMethodTracing( - file.getPath(), main_out_file.getFD(), 0, 0, false, 0, streaming); m.$noinline$doSomeWork(); m.doSomeWorkThrow(); VMDebug.$noinline$stopMethodTracing(); - main_out_file.close(); + out_file.close(); parser.CheckTraceFileFormat(file, expected_version); - file.delete(); } finally { if (out_file != null) { out_file.close(); |