jdk-sandbox: comparison hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java

equal deleted inserted replaced

-:5431282d8ce1
+:0fc9cc73ce45
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 UNSAFE.putChar(base, offset, '\u0123');
 // Compare
 {
-boolean r = UNSAFE.compareAndSwapChar(base, offset, '\u0123', '\u4567');
+boolean r = UNSAFE.compareAndSetChar(base, offset, '\u0123', '\u4567');
-assertEquals(r, true, "success compareAndSwap char");
+assertEquals(r, true, "success compareAndSet char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u4567', "success compareAndSwap char value");
+assertEquals(x, '\u4567', "success compareAndSet char value");
 }
 {
-boolean r = UNSAFE.compareAndSwapChar(base, offset, '\u0123', '\u89AB');
+boolean r = UNSAFE.compareAndSetChar(base, offset, '\u0123', '\u89AB');
-assertEquals(r, false, "failing compareAndSwap char");
+assertEquals(r, false, "failing compareAndSet char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u4567', "failing compareAndSwap char value");
+assertEquals(x, '\u4567', "failing compareAndSet char value");
 }
 // Advanced compare
 {
-char r = UNSAFE.compareAndExchangeCharVolatile(base, offset, '\u4567', '\u0123');
+char r = UNSAFE.compareAndExchangeChar(base, offset, '\u4567', '\u0123');
-assertEquals(r, '\u4567', "success compareAndExchangeVolatile char");
+assertEquals(r, '\u4567', "success compareAndExchange char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u0123', "success compareAndExchangeVolatile char value");
+assertEquals(x, '\u0123', "success compareAndExchange char value");
 }
 {
-char r = UNSAFE.compareAndExchangeCharVolatile(base, offset, '\u4567', '\u89AB');
+char r = UNSAFE.compareAndExchangeChar(base, offset, '\u4567', '\u89AB');
-assertEquals(r, '\u0123', "failing compareAndExchangeVolatile char");
+assertEquals(r, '\u0123', "failing compareAndExchange char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u0123', "failing compareAndExchangeVolatile char value");
+assertEquals(x, '\u0123', "failing compareAndExchange char value");
 }
 {
 char r = UNSAFE.compareAndExchangeCharAcquire(base, offset, '\u0123', '\u4567');
 assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
 }
 {
 boolean success = false;
 for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
-success = UNSAFE.weakCompareAndSwapChar(base, offset, '\u0123', '\u4567');
+success = UNSAFE.weakCompareAndSetCharPlain(base, offset, '\u0123', '\u4567');
 }
-assertEquals(success, true, "weakCompareAndSwap char");
+assertEquals(success, true, "weakCompareAndSetPlain char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u4567', "weakCompareAndSwap char value");
+assertEquals(x, '\u4567', "weakCompareAndSetPlain char value");
 }
 {
 boolean success = false;
 for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
-success = UNSAFE.weakCompareAndSwapCharAcquire(base, offset, '\u4567', '\u0123');
+success = UNSAFE.weakCompareAndSetCharAcquire(base, offset, '\u4567', '\u0123');
 }
-assertEquals(success, true, "weakCompareAndSwapAcquire char");
+assertEquals(success, true, "weakCompareAndSetAcquire char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u0123', "weakCompareAndSwapAcquire char");
+assertEquals(x, '\u0123', "weakCompareAndSetAcquire char");
 }
 {
 boolean success = false;
 for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
-success = UNSAFE.weakCompareAndSwapCharRelease(base, offset, '\u0123', '\u4567');
+success = UNSAFE.weakCompareAndSetCharRelease(base, offset, '\u0123', '\u4567');
 }
-assertEquals(success, true, "weakCompareAndSwapRelease char");
+assertEquals(success, true, "weakCompareAndSetRelease char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u4567', "weakCompareAndSwapRelease char");
+assertEquals(x, '\u4567', "weakCompareAndSetRelease char");
 }
 {
 boolean success = false;
 for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
-success = UNSAFE.weakCompareAndSwapCharVolatile(base, offset, '\u4567', '\u0123');
+success = UNSAFE.weakCompareAndSetChar(base, offset, '\u4567', '\u0123');
 }
-assertEquals(success, true, "weakCompareAndSwapVolatile char");
+assertEquals(success, true, "weakCompareAndSet char");
 char x = UNSAFE.getChar(base, offset);
-assertEquals(x, '\u0123', "weakCompareAndSwapVolatile char");
+assertEquals(x, '\u0123', "weakCompareAndSet char");
 }
 UNSAFE.putChar(base, offset, '\u4567');
 // Compare set and get
 char x = UNSAFE.getChar(address);
 assertEquals(x, '\u0123', "set char value");
 }
 }
 }

changeset 45514	0fc9cc73ce45
parent 42307	cefc81dc1d52