changeset 4851:9ea643afcaaf

Merge
author dcubed
date Tue, 28 May 2013 11:35:57 -0700
parents 4cc7d4d5dc92 01c2bdd24bb5
children 9e86c5544295 a1ebd310d5c1
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/runtime/contended/OopMaps.java	Tue May 28 08:54:55 2013 -0700
+++ b/test/runtime/contended/OopMaps.java	Tue May 28 11:35:57 2013 -0700
@@ -41,12 +41,15 @@
 /*
  * @test
  * @bug     8015270
+ * @bug     8015493
  * @summary \@Contended: fix multiple issues in the layout code
  *
- * @run main/othervm -XX:-RestrictContended OopMaps
+ * @run main/othervm -XX:-RestrictContended -XX:ContendedPaddingWidth=128 -Xmx128m OopMaps
  */
 public class OopMaps {
 
+    public static final int COUNT = 10000;
+
     public static void main(String[] args) throws Exception {
         Object o01 = new Object();
         Object o02 = new Object();
@@ -63,7 +66,6 @@
         Object o13 = new Object();
         Object o14 = new Object();
 
-        final int COUNT = 100000;
         R1[] rs = new R1[COUNT];
 
         for (int i = 0; i < COUNT; i++) {