Revert^4 "Add spin loop to mutex, overhaul monitor"
This reverts commit ead89ef62768faa06fedd279b86bccbed1464673.
PS1 is identical to Revert^2.
This fixes a shutdown issue caused by prematurely hanging when we
block while trying to acquire system mutexes during shutdown.
Only refuse to wake up after shutdown is well under way.
Bug: 140590186
Bug: 121302864
Test: Build and boot AOSP.
Test: art/test/testrunner/testrunner.py --host -b -t 1932-monitor-events-misc
Test: art/test/testrunner/testrunner.py --host -b -t 004-ThreadStress
Test: art/test/testrunner/testrunner.py --host -b -t 132-daemon-locks-shutdown
Test: 132-daemon-locks-shutdown repeated with increased thread counts and multiple
concurrent tests.
Change-Id: Ic19d32652a2a05c1ca843b3e9c6e29e6770262da
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 02705bc..559bee7 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -1289,6 +1289,12 @@
"tests": ["909-attach-agent", "126-miranda-multidex"],
"zipapex": true,
"bug": "b/135507613",
- "description": ["These tests run dalvikvm multiple times, this can messup the zipapex runner"]
+ "description": ["These tests run dalvikvm multiple times, this can mess up the",
+ "zipapex runner."]
+ },
+ {
+ "tests": ["2029-contended-monitors"],
+ "variant": "interpreter | interp-ac | gcstress | trace",
+ "description": ["Slow test. Prone to timeouts."]
}
]