summaryrefslogtreecommitdiffstats
path: root/test/079-phantom
diff options
context:
space:
mode:
authorDmitry Petrochenko <dmitry.petrochenko@intel.com>2014-05-16 13:24:40 +0700
committerDmitry Petrochenko <dmitry.petrochenko@intel.com>2014-05-23 16:23:45 +0700
commitfa658b079d4795ec72867b7cc4561884714d69b7 (patch)
treeac863de724f331b9be21714a832b751cd6877048 /test/079-phantom
parent2054b925a635642bedd912c6da37ffa9f1d21c6d (diff)
downloadart-fa658b079d4795ec72867b7cc4561884714d69b7.zip
art-fa658b079d4795ec72867b7cc4561884714d69b7.tar.gz
art-fa658b079d4795ec72867b7cc4561884714d69b7.tar.bz2
x86_64: Fix 079-Phantom hang with QCG enabled
The 079 test creates "sWatcher" thread. In case of unexpected failure (e.g. Exception thrown) the sWatcher thread remains alive and it blocks VM shutdown. We mark the sWarcher thread as daemon and let VM to stop that thread during shutdown cause by unexpected error. Change-Id: I0cb0b8bbeb15de47b72ddae1a32fcfea3ef8720e Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Diffstat (limited to 'test/079-phantom')
-rw-r--r--test/079-phantom/src/Bitmap.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/079-phantom/src/Bitmap.java b/test/079-phantom/src/Bitmap.java
index 9d03cbd..85eb3cc 100644
--- a/test/079-phantom/src/Bitmap.java
+++ b/test/079-phantom/src/Bitmap.java
@@ -29,6 +29,7 @@ public class Bitmap {
new ReferenceQueue<PhantomWrapper>();
private static BitmapWatcher sWatcher = new BitmapWatcher(sPhantomQueue);
static {
+ sWatcher.setDaemon(true);
sWatcher.start();
};