You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/03 07:10:05 UTC
[1/8] ignite git commit: ignite-2080 Data alignment issues with Unsafe
Repository: ignite
Updated Branches:
refs/heads/ignite-2407 bc388fde8 -> b3194821c
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataInputOutputByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataInputOutputByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataInputOutputByteOrderSelfTest.java
new file mode 100644
index 0000000..f3ff781
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/io/GridUnsafeDataInputOutputByteOrderSelfTest.java
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.util.io;
+
+import java.io.ByteArrayInputStream;
+import java.util.Random;
+import junit.framework.TestCase;
+
+import static org.apache.ignite.GridTestIoUtils.getCharByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getDoubleByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getFloatByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getIntByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getLongByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getShortByByteLE;
+import static org.junit.Assert.assertArrayEquals;
+
+/**
+ * Grid unsafe data input/output byte order sanity tests.
+ */
+public class GridUnsafeDataInputOutputByteOrderSelfTest extends TestCase {
+ /** Array length. */
+ private static final int ARR_LEN = 16;
+
+ /** Length bytes. */
+ private static final int LEN_BYTES = 4;
+
+ /** Rnd. */
+ private static Random RND = new Random();
+
+ /** Out. */
+ private GridUnsafeDataOutput out;
+
+ /** In. */
+ private GridUnsafeDataInput in;
+
+ /** {@inheritDoc} */
+ @Override protected void setUp() throws Exception {
+ out = new GridUnsafeDataOutput(16 * 8+ LEN_BYTES);
+ in = new GridUnsafeDataInput();
+ in.inputStream(new ByteArrayInputStream(out.internalArray()));
+ }
+
+ /** {@inheritDoc} */
+ @Override public void tearDown() throws Exception {
+ in.close();
+ out.close();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShort() throws Exception {
+ short val = (short)RND.nextLong();
+
+ out.writeShort(val);
+
+ assertEquals(val, getShortByByteLE(out.internalArray()));
+ assertEquals(val, in.readShort());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShortArray() throws Exception {
+ short[] arr = new short[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (short)RND.nextLong();
+
+ out.writeShortArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getShortByByteLE(outArr, i * 2+ LEN_BYTES));
+
+ assertArrayEquals(arr, in.readShortArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testChar() throws Exception {
+ char val = (char)RND.nextLong();
+
+ out.writeChar(val);
+
+ assertEquals(val, getCharByByteLE(out.internalArray()));
+ assertEquals(val, in.readChar());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCharArray() throws Exception {
+ char[] arr = new char[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (char)RND.nextLong();
+
+ out.writeCharArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getCharByByteLE(outArr, i * 2+ LEN_BYTES));
+
+ assertArrayEquals(arr, in.readCharArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testInt() throws Exception {
+ int val = RND.nextInt();
+
+ out.writeInt(val);
+
+ assertEquals(val, getIntByByteLE(out.internalArray()));
+ assertEquals(val, in.readInt());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testIntArray() throws Exception {
+ int[] arr = new int[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextInt();
+
+ out.writeIntArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getIntByByteLE(outArr, i * 4+ LEN_BYTES));
+
+ assertArrayEquals(arr, in.readIntArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLong() throws Exception {
+ long val = RND.nextLong();
+
+ out.writeLong(val);
+
+ assertEquals(val, getLongByByteLE(out.internalArray()));
+ assertEquals(val, in.readLong());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLongArray() throws Exception {
+ long[] arr = new long[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextLong();
+
+ out.writeLongArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getLongByByteLE(outArr, i * 8+ LEN_BYTES));
+
+ assertArrayEquals(arr, in.readLongArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloat() throws Exception {
+ float val = RND.nextFloat();
+
+ out.writeFloat(val);
+
+ assertEquals(val, getFloatByByteLE(out.internalArray()), 0);
+ assertEquals(val, in.readFloat(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloatArray() throws Exception {
+ float[] arr = new float[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextFloat();
+
+ out.writeFloatArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getFloatByByteLE(outArr, i * 4+ LEN_BYTES), 0);
+
+ assertArrayEquals(arr, in.readFloatArray(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDouble() throws Exception {
+ double val = RND.nextDouble();
+
+ out.writeDouble(val);
+
+ assertEquals(val, getDoubleByByteLE(out.internalArray()), 0);
+ assertEquals(val, in.readDouble(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDoubleArray() throws Exception {
+ double[] arr = new double[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextDouble();
+
+ out.writeDoubleArray(arr);
+
+ byte[] outArr = out.internalArray();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getDoubleByByteLE(outArr, i * 8+ LEN_BYTES), 0);
+
+ assertArrayEquals(arr, in.readDoubleArray(), 0);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java
index 37e7afe..1bbae51 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java
@@ -50,7 +50,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentLinkedDeque8;
import org.jsr166.ThreadLocalRandom8;
-import sun.misc.Unsafe;
/**
* Tests synchronization performance vs. lock.
@@ -948,16 +947,14 @@ public class GridBasicPerformanceTest {
GridTimer t = new GridTimer("unsafe");
- Unsafe unsafe = GridUnsafe.unsafe();
-
int mem = 1024;
for (int i = 0; i < MAX; i++) {
- addrs[i] = unsafe.allocateMemory(mem);
+ addrs[i] = GridUnsafe.allocateMemory(mem);
- unsafe.putByte(addrs[i] + RAND.nextInt(mem), (byte)RAND.nextInt(mem));
+ GridUnsafe.putByte(addrs[i] + RAND.nextInt(mem), (byte)RAND.nextInt(mem));
- v = unsafe.getByte(addrs[i] + RAND.nextInt(mem));
+ v = GridUnsafe.getByte(addrs[i] + RAND.nextInt(mem));
}
X.println("Unsafe [time=" + t.stop() + "ms, v=" + v + ']');
@@ -965,7 +962,7 @@ public class GridBasicPerformanceTest {
Thread.sleep(5000L);
for (long l : addrs)
- unsafe.freeMemory(l);
+ GridUnsafe.freeMemory(l);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 2d5b2c5..7bb2cf3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -1101,7 +1101,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
// On Windows and Mac machines two nodes can reside on the same port
// (if one node has localHost="127.0.0.1" and another has localHost="0.0.0.0").
// So two nodes do not even discover each other.
- if (U.isWindows() || U.isMacOs())
+ if (U.isWindows() || U.isMacOs() || U.isSolaris())
return;
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 27511ff..3c83d86 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -206,7 +206,7 @@ public abstract class GridAbstractTest extends TestCase {
* @throws Exception If failed.
*/
protected <T> T allocateInstance(Class<T> cls) throws Exception {
- return (T)GridUnsafe.unsafe().allocateInstance(cls);
+ return (T)GridUnsafe.allocateInstance(cls);
}
/**
@@ -215,7 +215,7 @@ public abstract class GridAbstractTest extends TestCase {
*/
@Nullable protected <T> T allocateInstance0(Class<T> cls) {
try {
- return (T)GridUnsafe.unsafe().allocateInstance(cls);
+ return (T)GridUnsafe.allocateInstance(cls);
}
catch (InstantiationException e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 5eb7b66..3ec55d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -46,6 +46,8 @@ import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompac
import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompactSimpleNameLowerCaseMappersSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBinariesDefaultMappersSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBinariesSimpleNameMappersSelfTest;
+import org.apache.ignite.internal.binary.streams.BinaryHeapStreamByteOrderSelfTest;
+import org.apache.ignite.internal.binary.streams.BinaryOffheapStreamByteOrderSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest;
@@ -132,6 +134,10 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite {
suite.addTestSuite(BinaryTxCacheLocalEntriesSelfTest.class);
suite.addTestSuite(BinaryAtomicCacheLocalEntriesSelfTest.class);
+ // Byte order
+ suite.addTestSuite(BinaryHeapStreamByteOrderSelfTest.class);
+ suite.addTestSuite(BinaryOffheapStreamByteOrderSelfTest.class);
+
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
index 1065fbd..e4a2bee 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
@@ -19,6 +19,8 @@ package org.apache.ignite.testsuites;
import java.util.Set;
import junit.framework.TestSuite;
+import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2ByteOrderSelfTest;
+import org.apache.ignite.internal.util.io.GridUnsafeDataInputOutputByteOrderSelfTest;
import org.apache.ignite.internal.util.io.GridUnsafeDataOutputArraySizingSelfTest;
import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest;
import org.apache.ignite.marshaller.optimized.OptimizedMarshallerEnumSelfTest;
@@ -55,8 +57,10 @@ public class IgniteMarshallerSelfTestSuite extends TestSuite {
GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, OptimizedObjectStreamSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, GridUnsafeDataOutputArraySizingSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, GridUnsafeDataInputOutputByteOrderSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerNodeFailoverTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerSerialPersistentFieldsSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, DirectByteBufferStreamImplV2ByteOrderSelfTest.class, ignoredTests);
return suite;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
index 0efdf2b..b940c72 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.processors.hadoop.counter.HadoopPerformanceCou
import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopConcurrentHashMultimap;
import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopMultimap;
import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopSkipList;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -56,8 +57,6 @@ import org.apache.ignite.thread.IgniteThread;
import static org.apache.ignite.internal.processors.hadoop.HadoopJobProperty.PARTITION_HASHMAP_SIZE;
import static org.apache.ignite.internal.processors.hadoop.HadoopJobProperty.SHUFFLE_REDUCER_NO_SORTING;
import static org.apache.ignite.internal.processors.hadoop.HadoopJobProperty.get;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.UNSAFE;
/**
* Shuffle job.
@@ -299,7 +298,7 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
/** */
@Override public void copyTo(long ptr) {
- UNSAFE.copyMemory(buf, BYTE_ARR_OFF + off, null, ptr, size);
+ GridUnsafe.copyMemory(buf, GridUnsafe.BYTE_ARR_OFF + off, null, ptr, size);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
index 87a0ee0..69dfe64 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
@@ -24,13 +24,11 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.hadoop.HadoopJobId;
import org.apache.ignite.internal.processors.hadoop.message.HadoopMessage;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.UNSAFE;
-
/**
* Shuffle message.
*/
@@ -167,11 +165,11 @@ public class HadoopShuffleMessage implements HadoopMessage {
private void add(byte marker, long ptr, int size) {
buf[off++] = marker;
- UNSAFE.putInt(buf, BYTE_ARR_OFF + off, size);
+ GridUnsafe.putInt(buf, GridUnsafe.BYTE_ARR_OFF + off, size);
off += 4;
- UNSAFE.copyMemory(null, ptr, buf, BYTE_ARR_OFF + off, size);
+ GridUnsafe.copyMemory(null, ptr, buf, GridUnsafe.BYTE_ARR_OFF + off, size);
off += size;
}
@@ -183,7 +181,7 @@ public class HadoopShuffleMessage implements HadoopMessage {
for (int i = 0; i < off;) {
byte marker = buf[i++];
- int size = UNSAFE.getInt(buf, BYTE_ARR_OFF + i);
+ int size = GridUnsafe.getInt(buf, GridUnsafe.BYTE_ARR_OFF + i);
i += 4;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataOutStream.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataOutStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataOutStream.java
index 99d8963..f7b1a73 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataOutStream.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataOutStream.java
@@ -20,11 +20,9 @@ package org.apache.ignite.internal.processors.hadoop.shuffle.streams;
import java.io.DataOutput;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.UNSAFE;
-
/**
* Data output stream.
*/
@@ -69,7 +67,7 @@ public class HadoopDataOutStream extends OutputStream implements DataOutput {
/** {@inheritDoc} */
@Override public void write(byte[] b, int off, int len) {
- UNSAFE.copyMemory(b, BYTE_ARR_OFF + off, null, move(len), len);
+ GridUnsafe.copyMemory(b, GridUnsafe.BYTE_ARR_OFF + off, null, move(len), len);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopConcurrentHashMultimapSelftest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopConcurrentHashMultimapSelftest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopConcurrentHashMultimapSelftest.java
index d5deaac..a37d74b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopConcurrentHashMultimapSelftest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopConcurrentHashMultimapSelftest.java
@@ -36,14 +36,12 @@ import org.apache.ignite.internal.processors.hadoop.HadoopJobInfo;
import org.apache.ignite.internal.processors.hadoop.HadoopTaskContext;
import org.apache.ignite.internal.processors.hadoop.HadoopTaskInput;
import org.apache.ignite.internal.util.GridRandom;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.io.GridDataInput;
import org.apache.ignite.internal.util.io.GridUnsafeDataInput;
import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
import org.apache.ignite.internal.util.typedef.X;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.UNSAFE;
-
/**
*
*/
@@ -162,7 +160,7 @@ public class HadoopConcurrentHashMultimapSelftest extends HadoopAbstractMapTest
private void read(long ptr, int size, Writable w) {
assert size == 4 : size;
- UNSAFE.copyMemory(null, ptr, buf, BYTE_ARR_OFF, size);
+ GridUnsafe.copyMemory(null, ptr, buf, GridUnsafe.BYTE_ARR_OFF, size);
dataInput.bytes(buf, size);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopSkipListSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopSkipListSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopSkipListSelfTest.java
index 969eeab..f70ef2f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopSkipListSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopSkipListSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.hadoop.HadoopJobInfo;
import org.apache.ignite.internal.processors.hadoop.HadoopTaskContext;
import org.apache.ignite.internal.processors.hadoop.HadoopTaskInput;
import org.apache.ignite.internal.util.GridRandom;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.io.GridDataInput;
import org.apache.ignite.internal.util.io.GridUnsafeDataInput;
import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory;
@@ -45,8 +46,6 @@ import org.apache.ignite.internal.util.typedef.X;
import static java.lang.Math.abs;
import static java.lang.Math.ceil;
import static java.lang.Math.max;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.UNSAFE;
/**
* Skip list tests.
@@ -201,7 +200,7 @@ public class HadoopSkipListSelfTest extends HadoopAbstractMapTest {
private void read(long ptr, int size, Writable w) {
assert size == 4 : size;
- UNSAFE.copyMemory(null, ptr, buf, BYTE_ARR_OFF, size);
+ GridUnsafe.copyMemory(null, ptr, buf, GridUnsafe.BYTE_ARR_OFF, size);
dataInput.bytes(buf, size);
[6/8] ignite git commit: Minor exception message fix
Posted by sb...@apache.org.
Minor exception message fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57194e2a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57194e2a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57194e2a
Branch: refs/heads/ignite-2407
Commit: 57194e2a6bb82719d63f658f8c1429569003214e
Parents: a87decd
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Tue Feb 2 16:35:42 2016 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Tue Feb 2 16:35:42 2016 -0800
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/57194e2a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 8f23b05..193e28e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -118,7 +118,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_PUBLIC_KEEP_ALIVE_TIME;
import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_PUBLIC_THREADPOOL_QUEUE_CAP;
import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_KEEP_ALIVE_TIME;
-import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_MAX_THREAD_CNT;
import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SYSTEM_THREADPOOL_QUEUE_CAP;
import static org.apache.ignite.internal.IgniteComponentType.SPRING;
import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.RESTART_JVM;
@@ -986,7 +985,7 @@ public class IgnitionEx {
if (old != null) {
if (name == null)
- throw new IgniteCheckedException("Default grid instance has already been started.");
+ throw new IgniteCheckedException("Default Ignite instance has already been started.");
else
throw new IgniteCheckedException("Ignite instance with this name has already been started: " + name);
}
[4/8] ignite git commit: ignite-2080 Data alignment issues with Unsafe
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
index 1a4c4bb..7958793 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
@@ -38,41 +38,22 @@ import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemTy
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-import sun.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+import static org.apache.ignite.internal.util.GridUnsafe.BYTE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.CHAR_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.DOUBLE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.FLOAT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.INT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.LONG_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.SHORT_ARR_OFF;
+
/**
* Direct marshalling I/O stream (version 2).
*/
public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- private static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
- private static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
-
- /** */
- private static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
-
- /** */
- private static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
-
- /** */
- private static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
-
- /** */
- private static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
-
- /** */
- private static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
-
- /** */
- private static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
-
- /** */
private static final byte[] BYTE_ARR_EMPTY = new byte[0];
/** */
@@ -343,7 +324,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putByte(heapArr, baseOff + pos, val);
+ GridUnsafe.putByte(heapArr, baseOff + pos, val);
buf.position(pos + 1);
}
@@ -356,7 +337,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putShort(heapArr, baseOff + pos, val);
+ long off = baseOff + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(heapArr, off, val);
+ else
+ GridUnsafe.putShort(heapArr, off, val);
buf.position(pos + 2);
}
@@ -377,12 +363,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
while ((val & 0xFFFF_FF80) != 0) {
byte b = (byte)(val | 0x80);
- UNSAFE.putByte(heapArr, baseOff + pos++, b);
+ GridUnsafe.putByte(heapArr, baseOff + pos++, b);
val >>>= 7;
}
- UNSAFE.putByte(heapArr, baseOff + pos++, (byte)val);
+ GridUnsafe.putByte(heapArr, baseOff + pos++, (byte)val);
buf.position(pos);
}
@@ -403,12 +389,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
while ((val & 0xFFFF_FFFF_FFFF_FF80L) != 0) {
byte b = (byte)(val | 0x80);
- UNSAFE.putByte(heapArr, baseOff + pos++, b);
+ GridUnsafe.putByte(heapArr, baseOff + pos++, b);
val >>>= 7;
}
- UNSAFE.putByte(heapArr, baseOff + pos++, (byte)val);
+ GridUnsafe.putByte(heapArr, baseOff + pos++, (byte)val);
buf.position(pos);
}
@@ -421,7 +407,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putFloat(heapArr, baseOff + pos, val);
+ long off = baseOff + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putFloatLE(heapArr, off, val);
+ else
+ GridUnsafe.putFloat(heapArr, off, val);
buf.position(pos + 4);
}
@@ -434,7 +425,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putDouble(heapArr, baseOff + pos, val);
+ long off = baseOff + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putDoubleLE(heapArr, off, val);
+ else
+ GridUnsafe.putDouble(heapArr, off, val);
buf.position(pos + 8);
}
@@ -447,7 +443,12 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putChar(heapArr, baseOff + pos, val);
+ long off = baseOff + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(heapArr, off, val);
+ else
+ GridUnsafe.putChar(heapArr, off, val);
buf.position(pos + 2);
}
@@ -460,7 +461,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putBoolean(heapArr, baseOff + pos, val);
+ GridUnsafe.putBoolean(heapArr, baseOff + pos, val);
buf.position(pos + 1);
}
@@ -485,7 +486,10 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeShortArray(short[] val) {
if (val != null)
- lastFinished = writeArray(val, SHORT_ARR_OFF, val.length, val.length << 1);
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, SHORT_ARR_OFF, val.length, 2, 1);
+ else
+ lastFinished = writeArray(val, SHORT_ARR_OFF, val.length, val.length << 1);
else
writeInt(-1);
}
@@ -493,7 +497,10 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeIntArray(int[] val) {
if (val != null)
- lastFinished = writeArray(val, INT_ARR_OFF, val.length, val.length << 2);
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, INT_ARR_OFF, val.length, 4, 2);
+ else
+ lastFinished = writeArray(val, INT_ARR_OFF, val.length, val.length << 2);
else
writeInt(-1);
}
@@ -501,7 +508,10 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeLongArray(long[] val) {
if (val != null)
- lastFinished = writeArray(val, LONG_ARR_OFF, val.length, val.length << 3);
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, LONG_ARR_OFF, val.length, 8, 3);
+ else
+ lastFinished = writeArray(val, LONG_ARR_OFF, val.length, val.length << 3);
else
writeInt(-1);
}
@@ -509,7 +519,10 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeFloatArray(float[] val) {
if (val != null)
- lastFinished = writeArray(val, FLOAT_ARR_OFF, val.length, val.length << 2);
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, FLOAT_ARR_OFF, val.length, 4, 2);
+ else
+ lastFinished = writeArray(val, FLOAT_ARR_OFF, val.length, val.length << 2);
else
writeInt(-1);
}
@@ -517,15 +530,22 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeDoubleArray(double[] val) {
if (val != null)
- lastFinished = writeArray(val, DOUBLE_ARR_OFF, val.length, val.length << 3);
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, DOUBLE_ARR_OFF, val.length, 8, 3);
+ else
+ lastFinished = writeArray(val, DOUBLE_ARR_OFF, val.length, val.length << 3);
else
writeInt(-1);
}
/** {@inheritDoc} */
@Override public void writeCharArray(char[] val) {
- if (val != null)
- lastFinished = writeArray(val, CHAR_ARR_OFF, val.length, val.length << 1);
+ if (val != null) {
+ if (BIG_ENDIAN)
+ lastFinished = writeArrayLE(val, CHAR_ARR_OFF, val.length, 2, 1);
+ else
+ lastFinished = writeArray(val, CHAR_ARR_OFF, val.length, val.length << 1);
+ }
else
writeInt(-1);
}
@@ -533,7 +553,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeBooleanArray(boolean[] val) {
if (val != null)
- lastFinished = writeArray(val, BOOLEAN_ARR_OFF, val.length, val.length);
+ lastFinished = writeArray(val, GridUnsafe.BOOLEAN_ARR_OFF, val.length, val.length);
else
writeInt(-1);
}
@@ -793,7 +813,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 1);
- return UNSAFE.getByte(heapArr, baseOff + pos);
+ return GridUnsafe.getByte(heapArr, baseOff + pos);
}
else
return 0;
@@ -808,7 +828,9 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 2);
- return UNSAFE.getShort(heapArr, baseOff + pos);
+ long off = baseOff + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(heapArr, off) : GridUnsafe.getShort(heapArr, off);
}
else
return 0;
@@ -823,7 +845,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
while (buf.hasRemaining()) {
int pos = buf.position();
- byte b = UNSAFE.getByte(heapArr, baseOff + pos);
+ byte b = GridUnsafe.getByte(heapArr, baseOff + pos);
buf.position(pos + 1);
@@ -860,7 +882,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
while (buf.hasRemaining()) {
int pos = buf.position();
- byte b = UNSAFE.getByte(heapArr, baseOff + pos);
+ byte b = GridUnsafe.getByte(heapArr, baseOff + pos);
buf.position(pos + 1);
@@ -897,7 +919,9 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 4);
- return UNSAFE.getFloat(heapArr, baseOff + pos);
+ long off = baseOff + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getFloatLE(heapArr, off) : GridUnsafe.getFloat(heapArr, off);
}
else
return 0;
@@ -912,7 +936,9 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 8);
- return UNSAFE.getDouble(heapArr, baseOff + pos);
+ long off = baseOff + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getDoubleLE(heapArr, off) : GridUnsafe.getDouble(heapArr, off);
}
else
return 0;
@@ -927,7 +953,9 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 2);
- return UNSAFE.getChar(heapArr, baseOff + pos);
+ long off = baseOff + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getCharLE(heapArr, off) : GridUnsafe.getChar(heapArr, off);
}
else
return 0;
@@ -942,7 +970,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
buf.position(pos + 1);
- return UNSAFE.getBoolean(heapArr, baseOff + pos);
+ return GridUnsafe.getBoolean(heapArr, baseOff + pos);
}
else
return false;
@@ -955,37 +983,55 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public short[] readShortArray() {
- return readArray(SHORT_ARR_CREATOR, 1, SHORT_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(SHORT_ARR_CREATOR, 2, 1, SHORT_ARR_OFF);
+ else
+ return readArray(SHORT_ARR_CREATOR, 1, SHORT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public int[] readIntArray() {
- return readArray(INT_ARR_CREATOR, 2, INT_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(INT_ARR_CREATOR, 4, 2, INT_ARR_OFF);
+ else
+ return readArray(INT_ARR_CREATOR, 2, INT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public long[] readLongArray() {
- return readArray(LONG_ARR_CREATOR, 3, LONG_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(LONG_ARR_CREATOR, 8, 3, LONG_ARR_OFF);
+ else
+ return readArray(LONG_ARR_CREATOR, 3, LONG_ARR_OFF);
}
/** {@inheritDoc} */
@Override public float[] readFloatArray() {
- return readArray(FLOAT_ARR_CREATOR, 2, FLOAT_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(FLOAT_ARR_CREATOR, 4, 2, FLOAT_ARR_OFF);
+ else
+ return readArray(FLOAT_ARR_CREATOR, 2, FLOAT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public double[] readDoubleArray() {
- return readArray(DOUBLE_ARR_CREATOR, 3, DOUBLE_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(DOUBLE_ARR_CREATOR, 8, 3, DOUBLE_ARR_OFF);
+ else
+ return readArray(DOUBLE_ARR_CREATOR, 3, DOUBLE_ARR_OFF);
}
/** {@inheritDoc} */
@Override public char[] readCharArray() {
- return readArray(CHAR_ARR_CREATOR, 1, CHAR_ARR_OFF);
+ if (BIG_ENDIAN)
+ return readArrayLE(CHAR_ARR_CREATOR, 2, 1, CHAR_ARR_OFF);
+ else
+ return readArray(CHAR_ARR_CREATOR, 1, CHAR_ARR_OFF);
}
/** {@inheritDoc} */
@Override public boolean[] readBooleanArray() {
- return readArray(BOOLEAN_ARR_CREATOR, 0, BOOLEAN_ARR_OFF);
+ return readArray(BOOLEAN_ARR_CREATOR, 0, GridUnsafe.BOOLEAN_ARR_OFF);
}
/** {@inheritDoc} */
@@ -1274,14 +1320,8 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
assert bytes >= 0;
assert bytes >= arrOff;
- if (arrOff == -1) {
- writeInt(len);
-
- if (!lastFinished)
- return false;
-
- arrOff = 0;
- }
+ if (writeArrayLength(len))
+ return false;
int toWrite = bytes - arrOff;
int pos = buf.position();
@@ -1289,7 +1329,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
if (toWrite <= remaining) {
if (toWrite > 0) {
- UNSAFE.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, toWrite);
+ GridUnsafe.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, toWrite);
buf.position(pos + toWrite);
}
@@ -1300,7 +1340,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
}
else {
if (remaining > 0) {
- UNSAFE.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, remaining);
+ GridUnsafe.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, remaining);
buf.position(pos + remaining);
@@ -1312,6 +1352,80 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
}
/**
+ * @param arr Array.
+ * @param off Offset.
+ * @param len Length.
+ * @param typeSize Primitive type size in bytes. Needs for byte reverse.
+ * @return Whether array was fully written.
+ */
+ private boolean writeArrayLE(Object arr, long off, int len, int typeSize, int shiftCnt) {
+ assert arr != null;
+ assert arr.getClass().isArray() && arr.getClass().getComponentType().isPrimitive();
+ assert off > 0;
+ assert len >= 0;
+
+ int bytes = len << shiftCnt;
+
+ assert bytes >= arrOff;
+
+ if (writeArrayLength(len))
+ return false;
+
+ int toWrite = (bytes - arrOff) >> shiftCnt;
+ int remaining = buf.remaining() >> shiftCnt;
+
+ if (toWrite <= remaining) {
+ writeArrayLE(arr, off, toWrite, typeSize);
+
+ arrOff = -1;
+
+ return true;
+ }
+ else {
+ if (remaining > 0)
+ writeArrayLE(arr, off, remaining, typeSize);
+
+ return false;
+ }
+ }
+
+ /**
+ * @param arr Array.
+ * @param off Offset.
+ * @param len Length.
+ * @param typeSize Primitive type size in bytes.
+ */
+ private void writeArrayLE(Object arr, long off, int len, int typeSize) {
+ int pos = buf.position();
+
+ for (int i = 0; i < len; i++) {
+ for (int j = 0; j < typeSize; j++) {
+ byte b = GridUnsafe.getByteField(arr, off + arrOff + (typeSize - j - 1));
+
+ GridUnsafe.putByte(heapArr, baseOff + pos++, b);
+ }
+
+ buf.position(pos);
+ arrOff += typeSize;
+ }
+ }
+
+ /**
+ * @param len Length.
+ */
+ private boolean writeArrayLength(int len) {
+ if (arrOff == -1) {
+ writeInt(len);
+
+ if (!lastFinished)
+ return true;
+
+ arrOff = 0;
+ }
+ return false;
+ }
+
+ /**
* @param creator Array creator.
* @param lenShift Array length shift size.
* @param off Base offset.
@@ -1351,7 +1465,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
lastFinished = toRead <= remaining;
if (lastFinished) {
- UNSAFE.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, toRead);
+ GridUnsafe.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, toRead);
buf.position(pos + toRead);
@@ -1364,7 +1478,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
return arr;
}
else {
- UNSAFE.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, remaining);
+ GridUnsafe.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, remaining);
buf.position(pos + remaining);
@@ -1375,6 +1489,95 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
}
/**
+ * @param creator Array creator.
+ * @param typeSize Primitive type size in bytes.
+ * @param lenShift Array length shift size.
+ * @param off Base offset.
+ * @return Array or special value if it was not fully read.
+ */
+ @SuppressWarnings("unchecked")
+ private <T> T readArrayLE(ArrayCreator<T> creator, int typeSize, int lenShift, long off) {
+ assert creator != null;
+
+ if (tmpArr == null) {
+ int len = readInt();
+
+ if (!lastFinished)
+ return null;
+
+ switch (len) {
+ case -1:
+ lastFinished = true;
+
+ return null;
+
+ case 0:
+ lastFinished = true;
+
+ return creator.create(0);
+
+ default:
+ tmpArr = creator.create(len);
+ tmpArrBytes = len << lenShift;
+ }
+ }
+
+ int toRead = (tmpArrBytes - tmpArrOff) >> lenShift;
+ int remaining = buf.remaining() >> lenShift;
+
+ lastFinished = toRead <= buf.remaining();
+
+ if (lastFinished) {
+ readArrayLE(typeSize, off, toRead);
+
+ T arr = (T)tmpArr;
+
+ tmpArr = null;
+ tmpArrBytes = 0;
+ tmpArrOff = 0;
+
+ return arr;
+ }
+ else {
+ for (int i = 0; i < remaining; i++) {
+ int pos = buf.position();
+
+ for (int j = 0; j < typeSize; j++) {
+ byte b = GridUnsafe.getByte(heapArr, baseOff + pos + (typeSize - j - 1));
+
+ GridUnsafe.putByteField(tmpArr, off + tmpArrOff + j, b);
+ }
+
+ buf.position(pos + typeSize);
+ tmpArrOff += typeSize;
+ }
+
+ tmpArrOff += buf.remaining();
+
+ return null;
+ }
+ }
+
+ /**
+ * @param typeSize Primitive type size in bytes.
+ * @param off Offset.
+ * @param toRead To read.
+ */
+ private void readArrayLE(int typeSize, long off, int toRead) {
+ for (int i = 0; i < toRead; i++) {
+ int pos = buf.position();
+
+ for (int j = 0; j < typeSize; j++) {
+ byte b = GridUnsafe.getByte(heapArr, baseOff + pos + (typeSize - j - 1));
+
+ GridUnsafe.putByteField(tmpArr, off + tmpArrOff++, b);
+ }
+
+ buf.position(pos + typeSize);
+ }
+ }
+
+ /**
* @param type Type.
* @param val Value.
* @param writer Writer.
@@ -1583,7 +1786,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
/**
* Array creator.
*/
- private static interface ArrayCreator<T> {
+ private interface ArrayCreator<T> {
/**
* @param len Array length or {@code -1} if array was not fully read.
* @return New array.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 845e204..3a7bc8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -103,9 +103,6 @@ import static org.jsr166.ConcurrentLinkedDeque8.Node;
* Cache eviction manager.
*/
public class GridCacheEvictionManager extends GridCacheManagerAdapter {
- /** Unsafe instance. */
- private static final sun.misc.Unsafe unsafe = GridUnsafe.unsafe();
-
/** Attribute name used to queue node in entry metadata. */
private static final int META_KEY = GridMetadataAwareAdapter.EntryKey.CACHE_EVICTION_MANAGER_KEY.key();
@@ -985,7 +982,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
continue;
// Lock entry.
- unsafe.monitorEnter(entry);
+ GridUnsafe.monitorEnter(entry);
locked.add(entry);
@@ -1028,7 +1025,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
for (ListIterator<GridCacheEntryEx> it = locked.listIterator(locked.size()); it.hasPrevious();) {
GridCacheEntryEx e = it.previous();
- unsafe.monitorExit(e);
+ GridUnsafe.monitorExit(e);
}
// Remove entries and fire events outside the locks.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
index ea036af..82e115c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import sun.misc.Unsafe;
/**
* GridCacheSwapEntry over offheap pointer.
@@ -41,9 +40,6 @@ import sun.misc.Unsafe;
*/
public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
private final long ptr;
/** */
@@ -70,17 +66,17 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
long readPtr = ptr + GridCacheSwapEntryImpl.VERSION_OFFSET;
- boolean verEx = UNSAFE.getByte(readPtr++) != 0;
+ boolean verEx = GridUnsafe.getByte(readPtr++) != 0;
ver = U.readVersion(readPtr, verEx);
readPtr += verEx ? GridCacheSwapEntryImpl.VERSION_EX_SIZE : GridCacheSwapEntryImpl.VERSION_SIZE;
- type = UNSAFE.getByte(readPtr + 4);
+ type = GridUnsafe.getByte(readPtr + 4);
valPtr = readPtr;
- assert (ptr + size) > (UNSAFE.getInt(valPtr) + valPtr + 5);
+ assert (ptr + size) > (GridUnsafe.getInt(valPtr) + valPtr + 5);
}
/**
@@ -94,11 +90,11 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
ptr += GridCacheSwapEntryImpl.VERSION_OFFSET; // Skip ttl, expire time.
- boolean verEx = UNSAFE.getByte(ptr++) != 0;
+ boolean verEx = GridUnsafe.getByte(ptr++) != 0;
ptr += verEx ? GridCacheSwapEntryImpl.VERSION_EX_SIZE : GridCacheSwapEntryImpl.VERSION_SIZE;
- assert (ptr + size) > (UNSAFE.getInt(ptr) + ptr + 5);
+ assert (ptr + size) > (GridUnsafe.getInt(ptr) + ptr + 5);
return ptr;
}
@@ -108,7 +104,7 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
* @return TTL.
*/
public static long timeToLive(long ptr) {
- return UNSAFE.getLong(ptr);
+ return GridUnsafe.getLong(ptr);
}
/**
@@ -116,7 +112,7 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
* @return Expire time.
*/
public static long expireTime(long ptr) {
- return UNSAFE.getLong(ptr + GridCacheSwapEntryImpl.EXPIRE_TIME_OFFSET);
+ return GridUnsafe.getLong(ptr + GridCacheSwapEntryImpl.EXPIRE_TIME_OFFSET);
}
/**
@@ -126,7 +122,7 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
public static GridCacheVersion version(long ptr) {
long addr = ptr + GridCacheSwapEntryImpl.VERSION_OFFSET;
- boolean verEx = UNSAFE.getByte(addr) != 0;
+ boolean verEx = GridUnsafe.getByte(addr) != 0;
addr++;
@@ -165,12 +161,12 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry {
/** {@inheritDoc} */
@Override public long ttl() {
- return UNSAFE.getLong(ptr);
+ return GridUnsafe.getLong(ptr);
}
/** {@inheritDoc} */
@Override public long expireTime() {
- return UNSAFE.getLong(ptr + GridCacheSwapEntryImpl.EXPIRE_TIME_OFFSET);
+ return GridUnsafe.getLong(ptr + GridCacheSwapEntryImpl.EXPIRE_TIME_OFFSET);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
index 6b1266f..02f74e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
@@ -26,19 +26,12 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import sun.misc.Unsafe;
/**
* Swap entry.
*/
public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- private static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
static final int EXPIRE_TIME_OFFSET = 8;
/** */
@@ -108,7 +101,7 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
* @return TTL.
*/
public static long timeToLive(byte[] bytes) {
- return UNSAFE.getLong(bytes, BYTE_ARR_OFF);
+ return GridUnsafe.getLong(bytes, GridUnsafe.BYTE_ARR_OFF);
}
/**
@@ -116,7 +109,7 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
* @return Expire time.
*/
public static long expireTime(byte[] bytes) {
- return UNSAFE.getLong(bytes, BYTE_ARR_OFF + EXPIRE_TIME_OFFSET);
+ return GridUnsafe.getLong(bytes, GridUnsafe.BYTE_ARR_OFF + EXPIRE_TIME_OFFSET);
}
/**
@@ -124,9 +117,9 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
* @return Version.
*/
public static GridCacheVersion version(byte[] bytes) {
- long off = BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
+ long off = GridUnsafe.BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
- boolean verEx = UNSAFE.getByte(bytes, off++) != 0;
+ boolean verEx = GridUnsafe.getByte(bytes, off++) != 0;
return U.readVersion(bytes, off, verEx);
}
@@ -136,21 +129,21 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
* @return Value if value is byte array, otherwise {@code null}.
*/
@Nullable public static IgniteBiTuple<byte[], Byte> getValue(byte[] bytes) {
- long off = BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
+ long off = GridUnsafe.BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
- boolean verEx = UNSAFE.getByte(bytes, off++) != 0;
+ boolean verEx = GridUnsafe.getByte(bytes, off++) != 0;
off += verEx ? VERSION_EX_SIZE : VERSION_SIZE;
- int arrLen = UNSAFE.getInt(bytes, off);
+ int arrLen = GridUnsafe.getInt(bytes, off);
off += 4;
- byte type = UNSAFE.getByte(bytes, off++);
+ byte type = GridUnsafe.getByte(bytes, off++);
byte[] valBytes = new byte[arrLen];
- UNSAFE.copyMemory(bytes, off, valBytes, BYTE_ARR_OFF, arrLen);
+ GridUnsafe.copyMemory(bytes, off, valBytes, GridUnsafe.BYTE_ARR_OFF, arrLen);
return new IgniteBiTuple<>(valBytes, type);
}
@@ -235,25 +228,25 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
byte[] arr = new byte[size];
- long off = BYTE_ARR_OFF;
+ long off = GridUnsafe.BYTE_ARR_OFF;
- UNSAFE.putLong(arr, off, ttl);
+ GridUnsafe.putLong(arr, off, ttl);
off += 8;
- UNSAFE.putLong(arr, off, expireTime);
+ GridUnsafe.putLong(arr, off, expireTime);
off += 8;
off = U.writeVersion(arr, off, ver);
- UNSAFE.putInt(arr, off, len);
+ GridUnsafe.putInt(arr, off, len);
off += 4;
- UNSAFE.putByte(arr, off++, type);
+ GridUnsafe.putByte(arr, off++, type);
- UNSAFE.copyMemory(valBytes.array(), BYTE_ARR_OFF, arr, off, len);
+ GridUnsafe.copyMemory(valBytes.array(), GridUnsafe.BYTE_ARR_OFF, arr, off, len);
off += len;
@@ -271,21 +264,21 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
*/
public static GridCacheSwapEntryImpl unmarshal(byte[] arr, boolean valOnly) {
if (valOnly) {
- long off = BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
+ long off = GridUnsafe.BYTE_ARR_OFF + VERSION_OFFSET; // Skip ttl, expire time.
- boolean verEx = UNSAFE.getByte(arr, off++) != 0;
+ boolean verEx = GridUnsafe.getByte(arr, off++) != 0;
off += verEx ? VERSION_EX_SIZE : VERSION_SIZE;
- int arrLen = UNSAFE.getInt(arr, off);
+ int arrLen = GridUnsafe.getInt(arr, off);
off += 4;
- byte type = UNSAFE.getByte(arr, off++);
+ byte type = GridUnsafe.getByte(arr, off++);
byte[] valBytes = new byte[arrLen];
- UNSAFE.copyMemory(arr, off, valBytes, BYTE_ARR_OFF, arrLen);
+ GridUnsafe.copyMemory(arr, off, valBytes, GridUnsafe.BYTE_ARR_OFF, arrLen);
return new GridCacheSwapEntryImpl(ByteBuffer.wrap(valBytes),
type,
@@ -296,31 +289,31 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
null);
}
- long off = BYTE_ARR_OFF;
+ long off = GridUnsafe.BYTE_ARR_OFF;
- long ttl = UNSAFE.getLong(arr, off);
+ long ttl = GridUnsafe.getLong(arr, off);
off += 8;
- long expireTime = UNSAFE.getLong(arr, off);
+ long expireTime = GridUnsafe.getLong(arr, off);
off += 8;
- boolean verEx = UNSAFE.getBoolean(arr, off++);
+ boolean verEx = GridUnsafe.getBoolean(arr, off++);
GridCacheVersion ver = U.readVersion(arr, off, verEx);
off += verEx ? VERSION_EX_SIZE : VERSION_SIZE;
- int arrLen = UNSAFE.getInt(arr, off);
+ int arrLen = GridUnsafe.getInt(arr, off);
off += 4;
- byte type = UNSAFE.getByte(arr, off++);
+ byte type = GridUnsafe.getByte(arr, off++);
byte[] valBytes = new byte[arrLen];
- UNSAFE.copyMemory(arr, off, valBytes, BYTE_ARR_OFF, arrLen);
+ GridUnsafe.copyMemory(arr, off, valBytes, GridUnsafe.BYTE_ARR_OFF, arrLen);
off += arrLen;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index a21331e..0fef6f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -102,7 +102,6 @@ import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.spi.IgniteNodeValidationResult;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
@@ -113,9 +112,6 @@ import static org.apache.ignite.IgniteSystemProperties.getBoolean;
public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorImpl implements
CacheObjectBinaryProcessor {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
public static final IgniteProductVersion BINARY_CFG_CHECK_SINCE = IgniteProductVersion.fromString("1.5.6");
/** */
@@ -430,11 +426,11 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectException {
assert ptr > 0 : ptr;
- int size = UNSAFE.getInt(ptr);
+ int size = GridUnsafe.getInt(ptr);
ptr += 4;
- byte type = UNSAFE.getByte(ptr++);
+ byte type = GridUnsafe.getByte(ptr++);
if (type != CacheObject.TYPE_BYTE_ARR) {
assert size > 0 : size;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index b806906..f6f57ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -138,9 +138,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
private static final int DEFERRED_UPDATE_RESPONSE_TIMEOUT =
Integer.getInteger(IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT, 500);
- /** Unsafe instance. */
- private static final sun.misc.Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Update reply closure. */
private CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse> updateReplyClos;
@@ -2463,10 +2460,10 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
try {
GridDhtCacheEntry entry = entryExx(key, topVer);
- UNSAFE.monitorEnter(entry);
+ GridUnsafe.monitorEnter(entry);
if (entry.obsolete())
- UNSAFE.monitorExit(entry);
+ GridUnsafe.monitorExit(entry);
else
return Collections.singletonList(entry);
}
@@ -2506,13 +2503,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (entry == null)
continue;
- UNSAFE.monitorEnter(entry);
+ GridUnsafe.monitorEnter(entry);
if (entry.obsolete()) {
// Unlock all locked.
for (int j = 0; j <= i; j++) {
if (locked.get(j) != null)
- UNSAFE.monitorExit(locked.get(j));
+ GridUnsafe.monitorExit(locked.get(j));
}
// Clear entries.
@@ -2561,7 +2558,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
// That's why releasing locks in the finally block..
for (GridCacheMapEntry entry : locked) {
if (entry != null)
- UNSAFE.monitorExit(entry);
+ GridUnsafe.monitorExit(entry);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index fed3e33..8e5fe9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -89,9 +89,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
/** */
private static final long serialVersionUID = 0L;
- /** Unsafe instance. */
- private static final sun.misc.Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** */
private GridCachePreloader preldr;
@@ -1553,12 +1550,12 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
for (int i = 0; i < locked.size(); i++) {
GridCacheEntryEx entry = locked.get(i);
- UNSAFE.monitorEnter(entry);
+ GridUnsafe.monitorEnter(entry);
if (entry.obsolete()) {
// Unlock all locked.
for (int j = 0; j <= i; j++)
- UNSAFE.monitorExit(locked.get(j));
+ GridUnsafe.monitorExit(locked.get(j));
// Clear entries.
locked.clear();
@@ -1589,7 +1586,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
*/
private void unlockEntries(Iterable<GridCacheEntryEx> locked) {
for (GridCacheEntryEx entry : locked)
- UNSAFE.monitorExit(entry);
+ GridUnsafe.monitorExit(entry);
AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 5b764b6..54dd69e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -51,9 +51,6 @@ import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
*
*/
public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter implements IgniteCacheObjectProcessor {
- /** */
- private static final sun.misc.Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Immutable classes. */
private static final Collection<Class<?>> IMMUTABLE_CLS = new HashSet<>();
@@ -138,9 +135,9 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
{
assert valPtr != 0;
- int size = UNSAFE.getInt(valPtr);
+ int size = GridUnsafe.getInt(valPtr);
- byte type = UNSAFE.getByte(valPtr + 4);
+ byte type = GridUnsafe.getByte(valPtr + 4);
byte[] bytes = U.copyMemory(valPtr + 5, size);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformAbstractMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformAbstractMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformAbstractMemory.java
index e305c71..606a23c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformAbstractMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformAbstractMemory.java
@@ -17,13 +17,15 @@
package org.apache.ignite.internal.processors.platform.memory;
+import org.apache.ignite.internal.util.GridUnsafe;
+
/**
* Interop memory chunk abstraction.
*/
public abstract class PlatformAbstractMemory implements PlatformMemory {
/** Stream factory. */
- private static final StreamFactory STREAM_FACTORY = PlatformMemoryUtils.LITTLE_ENDIAN ?
- new LittleEndianStreamFactory() : new BigEndianStreamFactory();
+ private static final StreamFactory STREAM_FACTORY = GridUnsafe.BIG_ENDIAN ?
+ new BigEndianStreamFactory() : new LittleEndianStreamFactory();
/** Cross-platform memory pointer. */
protected long memPtr;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformBigEndianOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformBigEndianOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformBigEndianOutputStreamImpl.java
index 2f6ad5c..b16f42f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformBigEndianOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformBigEndianOutputStreamImpl.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.platform.memory;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.UNSAFE;
+import org.apache.ignite.internal.util.GridUnsafe;
/**
* Interop output stream implementation working with BIG ENDIAN architecture.
@@ -46,7 +46,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (short item : val) {
- UNSAFE.putShort(startPos, Short.reverseBytes(item));
+ GridUnsafe.putShort(startPos, Short.reverseBytes(item));
startPos += 2;
}
@@ -68,7 +68,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (char item : val) {
- UNSAFE.putChar(startPos, Character.reverseBytes(item));
+ GridUnsafe.putChar(startPos, Character.reverseBytes(item));
startPos += 2;
}
@@ -90,7 +90,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (int item : val) {
- UNSAFE.putInt(startPos, Integer.reverseBytes(item));
+ GridUnsafe.putInt(startPos, Integer.reverseBytes(item));
startPos += 4;
}
@@ -117,7 +117,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (float item : val) {
- UNSAFE.putInt(startPos, Integer.reverseBytes(Float.floatToIntBits(item)));
+ GridUnsafe.putInt(startPos, Integer.reverseBytes(Float.floatToIntBits(item)));
startPos += 4;
}
@@ -139,7 +139,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (long item : val) {
- UNSAFE.putLong(startPos, Long.reverseBytes(item));
+ GridUnsafe.putLong(startPos, Long.reverseBytes(item));
startPos += 8;
}
@@ -156,7 +156,7 @@ public class PlatformBigEndianOutputStreamImpl extends PlatformOutputStreamImpl
long startPos = data + pos;
for (double item : val) {
- UNSAFE.putLong(startPos, Long.reverseBytes(Double.doubleToLongBits(item)));
+ GridUnsafe.putLong(startPos, Long.reverseBytes(Double.doubleToLongBits(item)));
startPos += 8;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStreamImpl.java
index 13da8c5..5e26905 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformInputStreamImpl.java
@@ -18,16 +18,7 @@
package org.apache.ignite.internal.processors.platform.memory;
import org.apache.ignite.IgniteException;
-
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.BOOLEAN_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.CHAR_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.DOUBLE_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.FLOAT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.INT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.LONG_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.SHORT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.UNSAFE;
+import org.apache.ignite.internal.util.GridUnsafe;
/**
* Interop input stream implementation.
@@ -64,14 +55,14 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public byte readByte() {
ensureEnoughData(1);
- return UNSAFE.getByte(data + pos++);
+ return GridUnsafe.getByte(data + pos++);
}
/** {@inheritDoc} */
@Override public byte[] readByteArray(int cnt) {
byte[] res = new byte[cnt];
- copyAndShift(res, BYTE_ARR_OFF, cnt);
+ copyAndShift(res, GridUnsafe.BYTE_ARR_OFF, cnt);
return res;
}
@@ -85,7 +76,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public boolean[] readBooleanArray(int cnt) {
boolean[] res = new boolean[cnt];
- copyAndShift(res, BOOLEAN_ARR_OFF, cnt);
+ copyAndShift(res, GridUnsafe.BOOLEAN_ARR_OFF, cnt);
return res;
}
@@ -94,7 +85,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public short readShort() {
ensureEnoughData(2);
- short res = UNSAFE.getShort(data + pos);
+ short res = GridUnsafe.getShort(data + pos);
shift(2);
@@ -107,7 +98,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
short[] res = new short[cnt];
- copyAndShift(res, SHORT_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.SHORT_ARR_OFF, len);
return res;
}
@@ -116,7 +107,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public char readChar() {
ensureEnoughData(2);
- char res = UNSAFE.getChar(data + pos);
+ char res = GridUnsafe.getChar(data + pos);
shift(2);
@@ -129,7 +120,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
char[] res = new char[cnt];
- copyAndShift(res, CHAR_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.CHAR_ARR_OFF, len);
return res;
}
@@ -138,7 +129,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public int readInt() {
ensureEnoughData(4);
- int res = UNSAFE.getInt(data + pos);
+ int res = GridUnsafe.getInt(data + pos);
shift(4);
@@ -152,7 +143,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
if (delta > 0)
ensureEnoughData(delta);
- return UNSAFE.getByte(data + pos);
+ return GridUnsafe.getByte(data + pos);
}
/** {@inheritDoc} */
@@ -162,7 +153,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
if (delta > 0)
ensureEnoughData(delta);
- return UNSAFE.getShort(data + pos);
+ return GridUnsafe.getShort(data + pos);
}
/** {@inheritDoc} */
@@ -172,7 +163,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
if (delta > 0)
ensureEnoughData(delta);
- return UNSAFE.getInt(data + pos);
+ return GridUnsafe.getInt(data + pos);
}
/** {@inheritDoc} */
@@ -181,7 +172,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
int[] res = new int[cnt];
- copyAndShift(res, INT_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.INT_ARR_OFF, len);
return res;
}
@@ -190,7 +181,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public float readFloat() {
ensureEnoughData(4);
- float res = UNSAFE.getFloat(data + pos);
+ float res = GridUnsafe.getFloat(data + pos);
shift(4);
@@ -203,7 +194,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
float[] res = new float[cnt];
- copyAndShift(res, FLOAT_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.FLOAT_ARR_OFF, len);
return res;
}
@@ -212,7 +203,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public long readLong() {
ensureEnoughData(8);
- long res = UNSAFE.getLong(data + pos);
+ long res = GridUnsafe.getLong(data + pos);
shift(8);
@@ -225,7 +216,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
long[] res = new long[cnt];
- copyAndShift(res, LONG_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.LONG_ARR_OFF, len);
return res;
}
@@ -234,7 +225,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
@Override public double readDouble() {
ensureEnoughData(8);
- double res = UNSAFE.getDouble(data + pos);
+ double res = GridUnsafe.getDouble(data + pos);
shift(8);
@@ -247,7 +238,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
double[] res = new double[cnt];
- copyAndShift(res, DOUBLE_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.DOUBLE_ARR_OFF, len);
return res;
}
@@ -257,7 +248,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
if (len > remaining())
len = remaining();
- copyAndShift(arr, BYTE_ARR_OFF + off, len);
+ copyAndShift(arr, GridUnsafe.BYTE_ARR_OFF + off, len);
return len;
}
@@ -290,7 +281,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
if (dataCopy == null) {
dataCopy = new byte[len];
- UNSAFE.copyMemory(null, data, dataCopy, BYTE_ARR_OFF, dataCopy.length);
+ GridUnsafe.copyMemory(null, data, dataCopy, GridUnsafe.BYTE_ARR_OFF, dataCopy.length);
}
return dataCopy;
@@ -333,7 +324,7 @@ public class PlatformInputStreamImpl implements PlatformInputStream {
private void copyAndShift(Object target, long off, int cnt) {
ensureEnoughData(cnt);
- UNSAFE.copyMemory(null, data + pos, target, off, cnt);
+ GridUnsafe.copyMemory(null, data + pos, target, off, cnt);
shift(cnt);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryUtils.java
index 2520a47..894658c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformMemoryUtils.java
@@ -17,44 +17,12 @@
package org.apache.ignite.internal.processors.platform.memory;
-import java.nio.ByteOrder;
import org.apache.ignite.internal.util.GridUnsafe;
-import sun.misc.Unsafe;
/**
* Utility classes for memory management.
*/
public class PlatformMemoryUtils {
- /** Unsafe instance. */
- public static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** Array offset: boolean. */
- public static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
-
- /** Array offset: byte. */
- public static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** Array offset: short. */
- public static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
-
- /** Array offset: char. */
- public static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
-
- /** Array offset: int. */
- public static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
-
- /** Array offset: float. */
- public static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
-
- /** Array offset: long. */
- public static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
-
- /** Array offset: double. */
- public static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
-
- /** Whether little endian is used on the platform. */
- public static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
-
/** Header length. */
public static final int POOL_HDR_LEN = 64;
@@ -97,7 +65,7 @@ public class PlatformMemoryUtils {
* @return Data pointer.
*/
public static long data(long memPtr) {
- return UNSAFE.getLong(memPtr);
+ return GridUnsafe.getLong(memPtr);
}
/**
@@ -107,7 +75,7 @@ public class PlatformMemoryUtils {
* @return Capacity.
*/
public static int capacity(long memPtr) {
- return UNSAFE.getInt(memPtr + MEM_HDR_OFF_CAP);
+ return GridUnsafe.getInt(memPtr + MEM_HDR_OFF_CAP);
}
/**
@@ -119,7 +87,7 @@ public class PlatformMemoryUtils {
public static void capacity(long memPtr, int cap) {
assert !isExternal(memPtr) : "Attempt to update external memory chunk capacity: " + memPtr;
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
}
/**
@@ -129,7 +97,7 @@ public class PlatformMemoryUtils {
* @return Length.
*/
public static int length(long memPtr) {
- return UNSAFE.getInt(memPtr + MEM_HDR_OFF_LEN);
+ return GridUnsafe.getInt(memPtr + MEM_HDR_OFF_LEN);
}
/**
@@ -139,7 +107,7 @@ public class PlatformMemoryUtils {
* @param len Length.
*/
public static void length(long memPtr, int len) {
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_LEN, len);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_LEN, len);
}
/**
@@ -149,7 +117,7 @@ public class PlatformMemoryUtils {
* @return Flags.
*/
public static int flags(long memPtr) {
- return UNSAFE.getInt(memPtr + MEM_HDR_OFF_FLAGS);
+ return GridUnsafe.getInt(memPtr + MEM_HDR_OFF_FLAGS);
}
/**
@@ -161,7 +129,7 @@ public class PlatformMemoryUtils {
public static void flags(long memPtr, int flags) {
assert !isExternal(memPtr) : "Attempt to update external memory chunk flags: " + memPtr;
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_FLAGS, flags);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_FLAGS, flags);
}
/**
@@ -237,13 +205,13 @@ public class PlatformMemoryUtils {
public static long allocateUnpooled(int cap) {
assert cap > 0;
- long memPtr = UNSAFE.allocateMemory(MEM_HDR_LEN);
- long dataPtr = UNSAFE.allocateMemory(cap);
+ long memPtr = GridUnsafe.allocateMemory(MEM_HDR_LEN);
+ long dataPtr = GridUnsafe.allocateMemory(cap);
- UNSAFE.putLong(memPtr, dataPtr); // Write address.
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap); // Write capacity.
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_LEN, 0); // Write length.
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_FLAGS, 0); // Write flags.
+ GridUnsafe.putLong(memPtr, dataPtr); // Write address.
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap); // Write capacity.
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_LEN, 0); // Write length.
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_FLAGS, 0); // Write flags.
return memPtr;
}
@@ -262,12 +230,12 @@ public class PlatformMemoryUtils {
long dataPtr = data(memPtr);
- long newDataPtr = UNSAFE.reallocateMemory(dataPtr, cap);
+ long newDataPtr = GridUnsafe.reallocateMemory(dataPtr, cap);
if (dataPtr != newDataPtr)
- UNSAFE.putLong(memPtr, newDataPtr); // Write new data address if needed.
+ GridUnsafe.putLong(memPtr, newDataPtr); // Write new data address if needed.
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap); // Write new capacity.
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap); // Write new capacity.
}
/**
@@ -279,8 +247,8 @@ public class PlatformMemoryUtils {
assert !isExternal(memPtr) : "Attempt to release external memory chunk directly: " + memPtr;
assert !isPooled(memPtr) : "Attempt to release pooled memory chunk directly: " + memPtr;
- UNSAFE.freeMemory(data(memPtr));
- UNSAFE.freeMemory(memPtr);
+ GridUnsafe.freeMemory(data(memPtr));
+ GridUnsafe.freeMemory(memPtr);
}
/** --- POOLED MEMORY MANAGEMENT. --- */
@@ -291,9 +259,9 @@ public class PlatformMemoryUtils {
* @return Pool pointer.
*/
public static long allocatePool() {
- long poolPtr = UNSAFE.allocateMemory(POOL_HDR_LEN);
+ long poolPtr = GridUnsafe.allocateMemory(POOL_HDR_LEN);
- UNSAFE.setMemory(poolPtr, POOL_HDR_LEN, (byte)0);
+ GridUnsafe.setMemory(poolPtr, POOL_HDR_LEN, (byte)0);
flags(poolPtr + POOL_HDR_OFF_MEM_1, FLAG_POOLED);
flags(poolPtr + POOL_HDR_OFF_MEM_2, FLAG_POOLED);
@@ -309,23 +277,23 @@ public class PlatformMemoryUtils {
*/
public static void releasePool(long poolPtr) {
// Clean predefined memory chunks.
- long mem = UNSAFE.getLong(poolPtr + POOL_HDR_OFF_MEM_1);
+ long mem = GridUnsafe.getLong(poolPtr + POOL_HDR_OFF_MEM_1);
if (mem != 0)
- UNSAFE.freeMemory(mem);
+ GridUnsafe.freeMemory(mem);
- mem = UNSAFE.getLong(poolPtr + POOL_HDR_OFF_MEM_2);
+ mem = GridUnsafe.getLong(poolPtr + POOL_HDR_OFF_MEM_2);
if (mem != 0)
- UNSAFE.freeMemory(mem);
+ GridUnsafe.freeMemory(mem);
- mem = UNSAFE.getLong(poolPtr + POOL_HDR_OFF_MEM_3);
+ mem = GridUnsafe.getLong(poolPtr + POOL_HDR_OFF_MEM_3);
if (mem != 0)
- UNSAFE.freeMemory(mem);
+ GridUnsafe.freeMemory(mem);
// Clean pool chunk.
- UNSAFE.freeMemory(poolPtr);
+ GridUnsafe.freeMemory(poolPtr);
}
/**
@@ -376,24 +344,24 @@ public class PlatformMemoryUtils {
assert isPooled(memPtr);
assert !isAcquired(memPtr);
- long data = UNSAFE.getLong(memPtr);
+ long data = GridUnsafe.getLong(memPtr);
if (data == 0) {
// First allocation of the chunk.
- data = UNSAFE.allocateMemory(cap);
+ data = GridUnsafe.allocateMemory(cap);
- UNSAFE.putLong(memPtr, data);
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
+ GridUnsafe.putLong(memPtr, data);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
}
else {
// Ensure that we have enough capacity.
int curCap = capacity(memPtr);
if (cap > curCap) {
- data = UNSAFE.reallocateMemory(data, cap);
+ data = GridUnsafe.reallocateMemory(data, cap);
- UNSAFE.putLong(memPtr, data);
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
+ GridUnsafe.putLong(memPtr, data);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
}
}
@@ -411,17 +379,17 @@ public class PlatformMemoryUtils {
assert isPooled(memPtr);
assert isAcquired(memPtr);
- long data = UNSAFE.getLong(memPtr);
+ long data = GridUnsafe.getLong(memPtr);
assert data != 0;
int curCap = capacity(memPtr);
if (cap > curCap) {
- data = UNSAFE.reallocateMemory(data, cap);
+ data = GridUnsafe.reallocateMemory(data, cap);
- UNSAFE.putLong(memPtr, data);
- UNSAFE.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
+ GridUnsafe.putLong(memPtr, data);
+ GridUnsafe.putInt(memPtr + MEM_HDR_OFF_CAP, cap);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
index 59d8981..cb30336 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/memory/PlatformOutputStreamImpl.java
@@ -17,15 +17,7 @@
package org.apache.ignite.internal.processors.platform.memory;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.BOOLEAN_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.BYTE_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.CHAR_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.DOUBLE_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.FLOAT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.INT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.LONG_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.SHORT_ARR_OFF;
-import static org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils.UNSAFE;
+import org.apache.ignite.internal.util.GridUnsafe;
/**
* Interop output stream implementation.
@@ -59,12 +51,12 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
@Override public void writeByte(byte val) {
ensureCapacity(pos + 1);
- UNSAFE.putByte(data + pos++, val);
+ GridUnsafe.putByte(data + pos++, val);
}
/** {@inheritDoc} */
@Override public void writeByteArray(byte[] val) {
- copyAndShift(val, BYTE_ARR_OFF, val.length);
+ copyAndShift(val, GridUnsafe.BYTE_ARR_OFF, val.length);
}
/** {@inheritDoc} */
@@ -74,63 +66,63 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
/** {@inheritDoc} */
@Override public void writeBooleanArray(boolean[] val) {
- copyAndShift(val, BOOLEAN_ARR_OFF, val.length);
+ copyAndShift(val, GridUnsafe.BOOLEAN_ARR_OFF, val.length);
}
/** {@inheritDoc} */
@Override public void writeShort(short val) {
ensureCapacity(pos + 2);
- UNSAFE.putShort(data + pos, val);
+ GridUnsafe.putShort(data + pos, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void writeShortArray(short[] val) {
- copyAndShift(val, SHORT_ARR_OFF, val.length << 1);
+ copyAndShift(val, GridUnsafe.SHORT_ARR_OFF, val.length << 1);
}
/** {@inheritDoc} */
@Override public void writeChar(char val) {
ensureCapacity(pos + 2);
- UNSAFE.putChar(data + pos, val);
+ GridUnsafe.putChar(data + pos, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void writeCharArray(char[] val) {
- copyAndShift(val, CHAR_ARR_OFF, val.length << 1);
+ copyAndShift(val, GridUnsafe.CHAR_ARR_OFF, val.length << 1);
}
/** {@inheritDoc} */
@Override public void writeInt(int val) {
ensureCapacity(pos + 4);
- UNSAFE.putInt(data + pos, val);
+ GridUnsafe.putInt(data + pos, val);
shift(4);
}
/** {@inheritDoc} */
@Override public void writeIntArray(int[] val) {
- copyAndShift(val, INT_ARR_OFF, val.length << 2);
+ copyAndShift(val, GridUnsafe.INT_ARR_OFF, val.length << 2);
}
/** {@inheritDoc} */
@Override public void writeShort(int pos, short val) {
ensureCapacity(pos + 2);
- UNSAFE.putShort(data + pos, val);
+ GridUnsafe.putShort(data + pos, val);
}
/** {@inheritDoc} */
@Override public void writeInt(int pos, int val) {
ensureCapacity(pos + 4);
- UNSAFE.putInt(data + pos, val);
+ GridUnsafe.putInt(data + pos, val);
}
/** {@inheritDoc} */
@@ -140,21 +132,21 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
/** {@inheritDoc} */
@Override public void writeFloatArray(float[] val) {
- copyAndShift(val, FLOAT_ARR_OFF, val.length << 2);
+ copyAndShift(val, GridUnsafe.FLOAT_ARR_OFF, val.length << 2);
}
/** {@inheritDoc} */
@Override public void writeLong(long val) {
ensureCapacity(pos + 8);
- UNSAFE.putLong(data + pos, val);
+ GridUnsafe.putLong(data + pos, val);
shift(8);
}
/** {@inheritDoc} */
@Override public void writeLongArray(long[] val) {
- copyAndShift(val, LONG_ARR_OFF, val.length << 3);
+ copyAndShift(val, GridUnsafe.LONG_ARR_OFF, val.length << 3);
}
/** {@inheritDoc} */
@@ -164,12 +156,12 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
/** {@inheritDoc} */
@Override public void writeDoubleArray(double[] val) {
- copyAndShift(val, DOUBLE_ARR_OFF, val.length << 3);
+ copyAndShift(val, GridUnsafe.DOUBLE_ARR_OFF, val.length << 3);
}
/** {@inheritDoc} */
@Override public void write(byte[] arr, int off, int len) {
- copyAndShift(arr, BYTE_ARR_OFF + off, len);
+ copyAndShift(arr, GridUnsafe.BYTE_ARR_OFF + off, len);
}
/** {@inheritDoc} */
@@ -234,7 +226,7 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
/** {@inheritDoc} */
@Override public void unsafeWriteByte(byte val) {
- UNSAFE.putByte(data + pos++, val);
+ GridUnsafe.putByte(data + pos++, val);
}
/** {@inheritDoc} */
@@ -244,38 +236,38 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
/** {@inheritDoc} */
@Override public void unsafeWriteShort(short val) {
- UNSAFE.putShort(data + pos, val);
+ GridUnsafe.putShort(data + pos, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteShort(int pos, short val) {
- UNSAFE.putShort(data + pos, val);
+ GridUnsafe.putShort(data + pos, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteChar(char val) {
- UNSAFE.putChar(data + pos, val);
+ GridUnsafe.putChar(data + pos, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int val) {
- UNSAFE.putInt(data + pos, val);
+ GridUnsafe.putInt(data + pos, val);
shift(4);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int pos, int val) {
- UNSAFE.putInt(data + pos, val);
+ GridUnsafe.putInt(data + pos, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteLong(long val) {
- UNSAFE.putLong(data + pos, val);
+ GridUnsafe.putLong(data + pos, val);
shift(8);
}
@@ -335,7 +327,7 @@ public class PlatformOutputStreamImpl implements PlatformOutputStream {
private void copyAndShift(Object src, long off, int len) {
ensureCapacity(pos + len);
- UNSAFE.copyMemory(src, off, null, data + pos, len);
+ GridUnsafe.copyMemory(src, off, null, data + pos, len);
shift(len);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
index 319a633..dd85bcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
@@ -18,19 +18,14 @@
package org.apache.ignite.internal.util;
import java.util.Arrays;
-import sun.misc.Unsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.INT_ARR_OFF;
/**
* Lightweight identity hash table which maps objects to integer handles,
* assigned in ascending order.
*/
public class GridHandleTable {
- /** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- private static final long intArrOff = UNSAFE.arrayBaseOffset(int[].class);
-
/** Number of mappings in table/next available handle. */
private int size;
@@ -111,8 +106,8 @@ public class GridHandleTable {
* Resets table to its initial (empty) state.
*/
public void clear() {
- UNSAFE.copyMemory(spineEmpty, intArrOff, spine, intArrOff, spineEmpty.length << 2);
- UNSAFE.copyMemory(nextEmpty, intArrOff, next, intArrOff, nextEmpty.length << 2);
+ GridUnsafe.copyMemory(spineEmpty, INT_ARR_OFF, spine, INT_ARR_OFF, spineEmpty.length << 2);
+ GridUnsafe.copyMemory(nextEmpty, INT_ARR_OFF, next, INT_ARR_OFF, nextEmpty.length << 2);
Arrays.fill(objs, null);
@@ -153,7 +148,7 @@ public class GridHandleTable {
Arrays.fill(spineEmpty, -1);
- UNSAFE.copyMemory(spineEmpty, intArrOff, spine, intArrOff, spineEmpty.length << 2);
+ GridUnsafe.copyMemory(spineEmpty, INT_ARR_OFF, spine, INT_ARR_OFF, spineEmpty.length << 2);
for (int i = 0; i < this.size; i++) {
Object obj = objs[i];
@@ -171,7 +166,7 @@ public class GridHandleTable {
int newLen = (next.length << 1) + 1;
int[] newNext = new int[newLen];
- UNSAFE.copyMemory(next, intArrOff, newNext, intArrOff, size << 2);
+ GridUnsafe.copyMemory(next, INT_ARR_OFF, newNext, INT_ARR_OFF, size << 2);
next = newNext;
nextEmpty = new int[newLen];
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index 3371eb8..8a0b0ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -128,9 +128,6 @@ public final class GridJavaProcess {
public static GridJavaProcess exec(String clsName, String params, @Nullable IgniteLogger log,
@Nullable IgniteInClosure<String> printC, @Nullable GridAbsClosure procKilledC,
@Nullable String javaHome, @Nullable Collection<String> jvmArgs, @Nullable String cp) throws Exception {
- if (!(U.isLinux() || U.isMacOs() || U.isWindows()))
- throw new Exception("Your OS is not supported.");
-
GridJavaProcess gjProc = new GridJavaProcess();
gjProc.log = log;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
index a1fa892..4f23979 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpinReadWriteLock.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
/**
*
@@ -29,9 +28,6 @@ import sun.misc.Unsafe;
@GridToStringExclude
public class GridSpinReadWriteLock {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
private static final long PENDING_WLOCKS_OFFS;
/** */
@@ -42,10 +38,10 @@ public class GridSpinReadWriteLock {
*/
static {
try {
- STATE_OFFS = UNSAFE.objectFieldOffset(GridSpinReadWriteLock.class.getDeclaredField("state"));
+ STATE_OFFS = GridUnsafe.objectFieldOffset(GridSpinReadWriteLock.class.getDeclaredField("state"));
PENDING_WLOCKS_OFFS =
- UNSAFE.objectFieldOffset(GridSpinReadWriteLock.class.getDeclaredField("pendingWLocks"));
+ GridUnsafe.objectFieldOffset(GridSpinReadWriteLock.class.getDeclaredField("pendingWLocks"));
}
catch (NoSuchFieldException e) {
throw new Error(e);
@@ -403,7 +399,7 @@ public class GridSpinReadWriteLock {
* @return {@code True} on success.
*/
private boolean compareAndSet(long offs, int expect, int update) {
- return UNSAFE.compareAndSwapInt(this, offs, expect, update);
+ return GridUnsafe.compareAndSwapInt(this, offs, expect, update);
}
/** {@inheritDoc} */
[2/8] ignite git commit: ignite-2080 Data alignment issues with Unsafe
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
index 359d36c..3f58447 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMap.java
@@ -45,8 +45,23 @@ import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.REHASH;
*/
public class GridUnsafeMap implements GridOffHeapMap {
/** Header size. */
- private static final int HEADER = 4 /*hash*/ + 4 /*key-size*/ + 4 /*value-size*/ + 8 /*queue-address*/ +
- 8 /*next-address*/;
+ private static final int HEADER_SIZE = 8 /*queue-address*/ + 8 /*next-address*/ + 4 /*hash*/ + 4 /*key-size*/
+ + 4 /*value-size*/;
+
+ /** Header queue address offset. */
+ private static final long HEADER_QUEUE_ADDR_OFF = 0;
+
+ /** Header next address offset. */
+ private static final long HEADER_NEXT_ADDR_OFF = 8;
+
+ /** Header hash offset. */
+ private static final long HEADER_HASH_OFF = 16;
+
+ /** Header key size offset. */
+ private static final long HEADER_KEY_SIZE_OFF = 20;
+
+ /** Header value size. */
+ private static final long HEADER_VALUE_SIZE = 24;
/** Debug flag. */
private static final boolean DEBUG = false;
@@ -789,7 +804,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = Entry.readKeyLength(entryAddr, mem);
int valLen = Entry.readValueLength(entryAddr, mem);
- byte[] valBytes = mem.readBytes(entryAddr + HEADER + keyLen, valLen);
+ byte[] valBytes = mem.readBytes(entryAddr + HEADER_SIZE + keyLen, valLen);
bin.add(F.t(Entry.readKeyBytes(entryAddr, mem), valBytes));
}
@@ -860,9 +875,9 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = Entry.readKeyLength(entryAddr, mem);
int valLen = Entry.readValueLength(entryAddr, mem);
- T2<Long, Integer> keyPtr = new T2<>(entryAddr + HEADER, keyLen);
+ T2<Long, Integer> keyPtr = new T2<>(entryAddr + HEADER_SIZE, keyLen);
- T2<Long, Integer> valPtr = new T2<>(entryAddr + HEADER + keyLen, valLen);
+ T2<Long, Integer> valPtr = new T2<>(entryAddr + HEADER_SIZE + keyLen, valLen);
T res = c.apply(keyPtr, valPtr);
@@ -1033,7 +1048,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = Entry.readKeyLength(cur, mem);
int valLen = Entry.readValueLength(cur, mem);
- valBytes = mem.readBytes(cur + HEADER + keyLen, valLen);
+ valBytes = mem.readBytes(cur + HEADER_SIZE + keyLen, valLen);
}
if (rmvEvicted) {
@@ -1101,7 +1116,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
if (cnt + 1 > threshold)
rehash();
- int size = HEADER + keyBytes.length + valBytes.length;
+ int size = HEADER_SIZE + keyBytes.length + valBytes.length;
boolean poll = !mem.reserve(size);
@@ -1230,7 +1245,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
}
}
- size = HEADER + keyBytes.length + valBytes.length;
+ size = HEADER_SIZE + keyBytes.length + valBytes.length;
poll = !mem.reserve(size);
@@ -1332,7 +1347,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
keyLen = Entry.readKeyLength(cur, mem);
valLen = Entry.readValueLength(cur, mem);
- long valPtr = cur + HEADER + keyLen;
+ long valPtr = cur + HEADER_SIZE + keyLen;
if (!p.apply(valPtr, valLen))
return null;
@@ -1353,7 +1368,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
valLen = Entry.readValueLength(cur, mem);
}
- valBytes = mem.readBytes(cur + HEADER + keyLen, valLen);
+ valBytes = mem.readBytes(cur + HEADER_SIZE + keyLen, valLen);
}
else
valBytes = EMPTY_BYTES;
@@ -1445,7 +1460,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = Entry.readKeyLength(addr, mem);
int valLen = Entry.readValueLength(addr, mem);
- return new IgniteBiTuple<>(addr + HEADER + keyLen, valLen);
+ return new IgniteBiTuple<>(addr + HEADER_SIZE + keyLen, valLen);
}
addr = Entry.nextAddress(addr, mem);
@@ -1510,7 +1525,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = Entry.readKeyLength(addr, mem);
int valLen = Entry.readValueLength(addr, mem);
- return mem.readBytes(addr + HEADER + keyLen, valLen);
+ return mem.readBytes(addr + HEADER_SIZE + keyLen, valLen);
}
}
@@ -1570,7 +1585,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Entry memory size.
*/
static int size(byte[] keyBytes, byte[] valBytes) {
- return HEADER + keyBytes.length + valBytes.length;
+ return HEADER_SIZE + keyBytes.length + valBytes.length;
}
/**
@@ -1579,7 +1594,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Entry size.
*/
static int size(long addr, GridUnsafeMemory mem) {
- return HEADER + readKeyLength(addr, mem) + readValueLength(addr, mem);
+ return HEADER_SIZE + readKeyLength(addr, mem) + readValueLength(addr, mem);
}
/**
@@ -1588,7 +1603,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Hash.
*/
static int hash(long ptr, GridUnsafeMemory mem) {
- return mem.readInt(ptr);
+ return mem.readInt(ptr + HEADER_HASH_OFF);
}
/**
@@ -1597,7 +1612,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void hash(long ptr, int hash, GridUnsafeMemory mem) {
- mem.writeInt(ptr, hash);
+ mem.writeInt(ptr + HEADER_HASH_OFF, hash);
}
/**
@@ -1606,7 +1621,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Key length.
*/
static int readKeyLength(long ptr, GridUnsafeMemory mem) {
- int len = mem.readInt(ptr + 4);
+ int len = mem.readInt(ptr + HEADER_KEY_SIZE_OFF);
assert len >= 0 : "Invalid key length [addr=" + String.format("0x%08x", ptr) +
", len=" + Long.toHexString(len) + ']';
@@ -1622,7 +1637,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void writeKeyLength(long ptr, int len, GridUnsafeMemory mem) {
- mem.writeInt(ptr + 4, len);
+ mem.writeInt(ptr + HEADER_KEY_SIZE_OFF, len);
}
/**
@@ -1631,7 +1646,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Value length.
*/
static int readValueLength(long ptr, GridUnsafeMemory mem) {
- int len = mem.readInt(ptr + 8);
+ int len = mem.readInt(ptr + HEADER_VALUE_SIZE);
assert len >= 0 : "Invalid value length [addr=" + String.format("0x%08x", ptr) +
", len=" + Integer.toHexString(len) + ']';
@@ -1647,7 +1662,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void writeValueLength(long ptr, int len, GridUnsafeMemory mem) {
- mem.writeInt(ptr + 8, len);
+ mem.writeInt(ptr + HEADER_VALUE_SIZE, len);
}
/**
@@ -1656,7 +1671,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Queue address.
*/
static long queueAddress(long ptr, GridUnsafeMemory mem) {
- return mem.readLong(ptr + 12);
+ return mem.readLong(ptr + HEADER_QUEUE_ADDR_OFF);
}
/**
@@ -1665,7 +1680,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void queueAddress(long ptr, long qAddr, GridUnsafeMemory mem) {
- mem.writeLong(ptr + 12, qAddr);
+ mem.writeLong(ptr + HEADER_QUEUE_ADDR_OFF, qAddr);
}
/**
@@ -1675,7 +1690,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return {@code True} if changed to zero.
*/
static boolean clearQueueAddress(long ptr, long qAddr, GridUnsafeMemory mem) {
- return mem.casLong(ptr + 12, qAddr, 0);
+ return mem.casLong(ptr + HEADER_QUEUE_ADDR_OFF, qAddr, 0);
}
/**
@@ -1684,7 +1699,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @return Next address.
*/
static long nextAddress(long ptr, GridUnsafeMemory mem) {
- return mem.readLong(ptr + 20);
+ return mem.readLong(ptr + HEADER_NEXT_ADDR_OFF);
}
/**
@@ -1695,7 +1710,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void nextAddress(long ptr, long addr, GridUnsafeMemory mem) {
- mem.writeLong(ptr + 20, addr);
+ mem.writeLong(ptr + HEADER_NEXT_ADDR_OFF, addr);
}
/**
@@ -1706,7 +1721,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
static byte[] readKeyBytes(long ptr, GridUnsafeMemory mem) {
int keyLen = readKeyLength(ptr, mem);
- return mem.readBytes(ptr + HEADER, keyLen);
+ return mem.readBytes(ptr + HEADER_SIZE, keyLen);
}
/**
@@ -1715,7 +1730,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void writeKeyBytes(long ptr, byte[] keyBytes, GridUnsafeMemory mem) {
- mem.writeBytes(ptr + HEADER, keyBytes);
+ mem.writeBytes(ptr + HEADER_SIZE, keyBytes);
}
/**
@@ -1727,7 +1742,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
int keyLen = readKeyLength(ptr, mem);
int valLen = readValueLength(ptr, mem);
- return mem.readBytes(ptr + HEADER + keyLen, valLen);
+ return mem.readBytes(ptr + HEADER_SIZE + keyLen, valLen);
}
/**
@@ -1746,7 +1761,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
* @param mem Memory.
*/
static void writeValueBytes(long ptr, int keyLen, byte[] valBytes, GridUnsafeMemory mem) {
- mem.writeBytes(ptr + HEADER + keyLen, valBytes);
+ mem.writeBytes(ptr + HEADER_SIZE + keyLen, valBytes);
}
/**
@@ -1799,7 +1814,7 @@ public class GridUnsafeMap implements GridOffHeapMap {
static boolean keyEquals(long ptr, byte[] keyBytes, GridUnsafeMemory mem) {
long len = readKeyLength(ptr, mem);
- return len == keyBytes.length && mem.compare(ptr + HEADER, keyBytes);
+ return len == keyBytes.length && GridUnsafeMemory.compare(ptr + HEADER_SIZE, keyBytes);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
index cf0cb5c..87ba2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemory.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteBiTuple;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OFFHEAP_SAFE_RELEASE;
import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.ALLOCATE;
@@ -35,18 +34,9 @@ import static org.apache.ignite.internal.util.offheap.GridOffHeapEvent.RELEASE;
* Unsafe memory.
*/
public class GridUnsafeMemory {
- /** Unsafe handle. */
- public static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Free byte. */
private static final byte FREE = (byte)0;
- /** Byte array offset. */
- public static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** Address size. */
- private static final int ADDR_SIZE = UNSAFE.addressSize();
-
/** Safe offheap release flag. */
private static final boolean SAFE_RELEASE = IgniteSystemProperties.getBoolean(IGNITE_OFFHEAP_SAFE_RELEASE);
@@ -174,7 +164,7 @@ public class GridUnsafeMemory {
cnt.addAndGet(size);
try {
- long ptr = UNSAFE.allocateMemory(size);
+ long ptr = GridUnsafe.allocateMemory(size);
if (init)
fill(ptr, size, FREE);
@@ -198,7 +188,7 @@ public class GridUnsafeMemory {
* @param b Value.
*/
public void fill(long ptr, long size, byte b) {
- UNSAFE.setMemory(ptr, size, b);
+ GridUnsafe.setMemory(ptr, size, b);
}
/**
@@ -233,7 +223,7 @@ public class GridUnsafeMemory {
if (SAFE_RELEASE)
fill(ptr, size, (byte)0xAB);
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
cnt.addAndGet(-size);
@@ -247,7 +237,7 @@ public class GridUnsafeMemory {
* @return Long value.
*/
public long readLong(long ptr) {
- return UNSAFE.getLong(ptr);
+ return GridUnsafe.getLong(ptr);
}
/**
@@ -255,7 +245,7 @@ public class GridUnsafeMemory {
* @param v Long value.
*/
public void writeLong(long ptr, long v) {
- UNSAFE.putLong(ptr, v);
+ GridUnsafe.putLong(ptr, v);
}
/**
@@ -263,7 +253,7 @@ public class GridUnsafeMemory {
* @return Long value.
*/
public long readLongVolatile(long ptr) {
- return UNSAFE.getLongVolatile(null, ptr);
+ return GridUnsafe.getLongVolatile(null, ptr);
}
/**
@@ -271,7 +261,7 @@ public class GridUnsafeMemory {
* @param v Long value.
*/
public void writeLongVolatile(long ptr, long v) {
- UNSAFE.putLongVolatile(null, ptr, v);
+ GridUnsafe.putLongVolatile(null, ptr, v);
}
/**
@@ -281,7 +271,7 @@ public class GridUnsafeMemory {
* @return {@code true} If operation succeeded.
*/
public boolean casLong(long ptr, long exp, long v) {
- return UNSAFE.compareAndSwapLong(null, ptr, exp, v);
+ return GridUnsafe.compareAndSwapLong(null, ptr, exp, v);
}
/**
@@ -289,7 +279,7 @@ public class GridUnsafeMemory {
* @return Integer value.
*/
public int readInt(long ptr) {
- return UNSAFE.getInt(ptr);
+ return GridUnsafe.getInt(ptr);
}
/**
@@ -297,7 +287,7 @@ public class GridUnsafeMemory {
* @param v Integer value.
*/
public void writeInt(long ptr, int v) {
- UNSAFE.putInt(ptr, v);
+ GridUnsafe.putInt(ptr, v);
}
/**
@@ -305,7 +295,7 @@ public class GridUnsafeMemory {
* @return Integer value.
*/
public int readIntVolatile(long ptr) {
- return UNSAFE.getIntVolatile(null, ptr);
+ return GridUnsafe.getIntVolatile(null, ptr);
}
/**
@@ -313,7 +303,7 @@ public class GridUnsafeMemory {
* @param v Integer value.
*/
public void writeIntVolatile(long ptr, int v) {
- UNSAFE.putIntVolatile(null, ptr, v);
+ GridUnsafe.putIntVolatile(null, ptr, v);
}
/**
@@ -323,7 +313,7 @@ public class GridUnsafeMemory {
* @return {@code true} If operation succeeded.
*/
public boolean casInt(long ptr, int exp, int v) {
- return UNSAFE.compareAndSwapInt(null, ptr, exp, v);
+ return GridUnsafe.compareAndSwapInt(null, ptr, exp, v);
}
/**
@@ -331,7 +321,7 @@ public class GridUnsafeMemory {
* @return Float value.
*/
public float readFloat(long ptr) {
- return UNSAFE.getFloat(ptr);
+ return GridUnsafe.getFloat(ptr);
}
/**
@@ -339,7 +329,7 @@ public class GridUnsafeMemory {
* @param v Value.
*/
public void writeFloat(long ptr, float v) {
- UNSAFE.putFloat(ptr, v);
+ GridUnsafe.putFloat(ptr, v);
}
/**
@@ -347,7 +337,7 @@ public class GridUnsafeMemory {
* @return Double value.
*/
public double readDouble(long ptr) {
- return UNSAFE.getDouble(ptr);
+ return GridUnsafe.getDouble(ptr);
}
/**
@@ -355,7 +345,7 @@ public class GridUnsafeMemory {
* @param v Value.
*/
public void writeDouble(long ptr, double v) {
- UNSAFE.putDouble(ptr, v);
+ GridUnsafe.putDouble(ptr, v);
}
/**
@@ -363,7 +353,7 @@ public class GridUnsafeMemory {
* @return Short value.
*/
public short readShort(long ptr) {
- return UNSAFE.getShort(ptr);
+ return GridUnsafe.getShort(ptr);
}
/**
@@ -371,7 +361,7 @@ public class GridUnsafeMemory {
* @param v Short value.
*/
public void writeShort(long ptr, short v) {
- UNSAFE.putShort(ptr, v);
+ GridUnsafe.putShort(ptr, v);
}
/**
@@ -379,7 +369,7 @@ public class GridUnsafeMemory {
* @return Integer value.
*/
public byte readByte(long ptr) {
- return UNSAFE.getByte(ptr);
+ return GridUnsafe.getByte(ptr);
}
/**
@@ -387,7 +377,7 @@ public class GridUnsafeMemory {
* @return Integer value.
*/
public byte readByteVolatile(long ptr) {
- return UNSAFE.getByteVolatile(null, ptr);
+ return GridUnsafe.getByteVolatile(null, ptr);
}
/**
@@ -395,7 +385,7 @@ public class GridUnsafeMemory {
* @param v Integer value.
*/
public void writeByte(long ptr, byte v) {
- UNSAFE.putByte(ptr, v);
+ GridUnsafe.putByte(ptr, v);
}
/**
@@ -403,7 +393,7 @@ public class GridUnsafeMemory {
* @param v Integer value.
*/
public void writeByteVolatile(long ptr, byte v) {
- UNSAFE.putByteVolatile(null, ptr, v);
+ GridUnsafe.putByteVolatile(null, ptr, v);
}
/**
@@ -483,8 +473,8 @@ public class GridUnsafeMemory {
int words = size / 8;
for (int i = 0; i < words; i++) {
- long w1 = UNSAFE.getLong(ptr1);
- long w2 = UNSAFE.getLong(ptr2);
+ long w1 = GridUnsafe.getLong(ptr1);
+ long w2 = GridUnsafe.getLong(ptr2);
if (w1 != w2)
return false;
@@ -496,8 +486,8 @@ public class GridUnsafeMemory {
int left = size % 8;
for (int i = 0; i < left; i++) {
- byte b1 = UNSAFE.getByte(ptr1);
- byte b2 = UNSAFE.getByte(ptr2);
+ byte b1 = GridUnsafe.getByte(ptr1);
+ byte b2 = GridUnsafe.getByte(ptr2);
if (b1 != b2)
return false;
@@ -517,7 +507,7 @@ public class GridUnsafeMemory {
* @return {@code True} if equals.
*/
public static boolean compare(long ptr, byte[] bytes) {
- final int addrSize = ADDR_SIZE;
+ final int addrSize = GridUnsafe.ADDR_SIZE;
// Align reads to address size.
int off = (int)(ptr % addrSize);
@@ -527,7 +517,7 @@ public class GridUnsafeMemory {
if (align != addrSize) {
for (int i = 0; i < align && i < len; i++) {
- if (UNSAFE.getByte(ptr) != bytes[i])
+ if (GridUnsafe.getByte(ptr) != bytes[i])
return false;
ptr++;
@@ -550,19 +540,14 @@ public class GridUnsafeMemory {
for (int i = 0; i < words; i++) {
int step = i * addrSize + align;
- int word = UNSAFE.getInt(ptr);
+ int word = GridUnsafe.getInt(ptr);
- int comp = 0;
-
- comp |= (0xffL & bytes[step + 3]) << 24;
- comp |= (0xffL & bytes[step + 2]) << 16;
- comp |= (0xffL & bytes[step + 1]) << 8;
- comp |= (0xffL & bytes[step]);
+ int comp = GridUnsafe.getInt(bytes, GridUnsafe.BYTE_ARR_OFF + step);
if (word != comp)
return false;
- ptr += ADDR_SIZE;
+ ptr += GridUnsafe.ADDR_SIZE;
}
break;
@@ -571,23 +556,14 @@ public class GridUnsafeMemory {
for (int i = 0; i < words; i++) {
int step = i * addrSize + align;
- long word = UNSAFE.getLong(ptr);
-
- long comp = 0;
+ long word = GridUnsafe.getLong(ptr);
- comp |= (0xffL & bytes[step + 7]) << 56;
- comp |= (0xffL & bytes[step + 6]) << 48;
- comp |= (0xffL & bytes[step + 5]) << 40;
- comp |= (0xffL & bytes[step + 4]) << 32;
- comp |= (0xffL & bytes[step + 3]) << 24;
- comp |= (0xffL & bytes[step + 2]) << 16;
- comp |= (0xffL & bytes[step + 1]) << 8;
- comp |= (0xffL & bytes[step]);
+ long comp = GridUnsafe.getLong(bytes, GridUnsafe.BYTE_ARR_OFF + step);
if (word != comp)
return false;
- ptr += ADDR_SIZE;
+ ptr += GridUnsafe.ADDR_SIZE;
}
break;
@@ -596,7 +572,7 @@ public class GridUnsafeMemory {
if (left != 0) {
// Compare left overs byte by byte.
for (int i = 0; i < left; i++)
- if (UNSAFE.getByte(ptr + i) != bytes[i + align + words * ADDR_SIZE])
+ if (GridUnsafe.getByte(ptr + i) != bytes[i + align + words * GridUnsafe.ADDR_SIZE])
return false;
}
@@ -618,7 +594,7 @@ public class GridUnsafeMemory {
* @return The same array as passed in one.
*/
public byte[] readBytes(long ptr, byte[] arr) {
- UNSAFE.copyMemory(null, ptr, arr, BYTE_ARR_OFF, arr.length);
+ GridUnsafe.copyMemory(null, ptr, arr, GridUnsafe.BYTE_ARR_OFF, arr.length);
return arr;
}
@@ -631,7 +607,7 @@ public class GridUnsafeMemory {
* @return The same array as passed in one.
*/
public byte[] readBytes(long ptr, byte[] arr, int off, int len) {
- UNSAFE.copyMemory(null, ptr, arr, BYTE_ARR_OFF + off, len);
+ GridUnsafe.copyMemory(null, ptr, arr, GridUnsafe.BYTE_ARR_OFF + off, len);
return arr;
}
@@ -643,7 +619,7 @@ public class GridUnsafeMemory {
* @param arr Array.
*/
public void writeBytes(long ptr, byte[] arr) {
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF, null, ptr, arr.length);
}
/**
@@ -655,7 +631,7 @@ public class GridUnsafeMemory {
* @param len Length.
*/
public void writeBytes(long ptr, byte[] arr, int off, int len) {
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF + off, null, ptr, len);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF + off, null, ptr, len);
}
/**
@@ -666,7 +642,7 @@ public class GridUnsafeMemory {
* @param len Length in bytes.
*/
public void copyMemory(long srcPtr, long destPtr, long len) {
- UNSAFE.copyMemory(srcPtr, destPtr, len);
+ GridUnsafe.copyMemory(srcPtr, destPtr, len);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
index a4f4cdc..c5be139 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
@@ -47,7 +47,6 @@ import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerContext;
import org.apache.ignite.marshaller.MarshallerExclusions;
-import sun.misc.Unsafe;
import static java.lang.reflect.Modifier.isFinal;
import static java.lang.reflect.Modifier.isPrivate;
@@ -92,9 +91,6 @@ import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.co
* Class descriptor.
*/
class OptimizedClassDescriptor {
- /** Unsafe. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Class. */
private final Class<?> cls;
@@ -273,7 +269,7 @@ class OptimizedClassDescriptor {
type = PROPS;
try {
- dfltsFieldOff = UNSAFE.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
+ dfltsFieldOff = GridUnsafe.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
}
catch (NoSuchFieldException e) {
throw new IOException(e);
@@ -285,7 +281,7 @@ class OptimizedClassDescriptor {
type = HASH_MAP;
try {
- loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+ loadFactorFieldOff = GridUnsafe.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
}
catch (NoSuchFieldException e) {
throw new IOException(e);
@@ -295,7 +291,7 @@ class OptimizedClassDescriptor {
type = HASH_SET;
try {
- loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+ loadFactorFieldOff = GridUnsafe.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
}
catch (NoSuchFieldException e) {
throw new IOException(e);
@@ -307,8 +303,10 @@ class OptimizedClassDescriptor {
type = LINKED_HASH_MAP;
try {
- loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
- accessOrderFieldOff = UNSAFE.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
+ loadFactorFieldOff =
+ GridUnsafe.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+ accessOrderFieldOff =
+ GridUnsafe.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
}
catch (NoSuchFieldException e) {
throw new IOException(e);
@@ -318,7 +316,7 @@ class OptimizedClassDescriptor {
type = LINKED_HASH_SET;
try {
- loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+ loadFactorFieldOff = GridUnsafe.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
}
catch (NoSuchFieldException e) {
throw new IOException(e);
@@ -472,7 +470,7 @@ class OptimizedClassDescriptor {
fieldInfo = new FieldInfo(f,
serField.getName(),
- UNSAFE.objectFieldOffset(f),
+ GridUnsafe.objectFieldOffset(f),
fieldType(serField.getType()));
}
@@ -496,7 +494,7 @@ class OptimizedClassDescriptor {
if (!isStatic(mod) && !isTransient(mod)) {
FieldInfo fieldInfo = new FieldInfo(f, f.getName(),
- UNSAFE.objectFieldOffset(f), fieldType(f.getType()));
+ GridUnsafe.objectFieldOffset(f), fieldType(f.getType()));
clsFields.add(fieldInfo);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
index b2c98b2..b3caca2 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.AbstractMarshaller;
import org.jetbrains.annotations.Nullable;
@@ -274,9 +273,7 @@ public class OptimizedMarshaller extends AbstractMarshaller {
@SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
public static boolean available() {
try {
- Unsafe unsafe = GridUnsafe.unsafe();
-
- Class<? extends Unsafe> unsafeCls = unsafe.getClass();
+ Class<? extends Unsafe> unsafeCls = Unsafe.class;
unsafeCls.getMethod("allocateInstance", Class.class);
unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index da92b90..fa6f962 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -34,16 +34,12 @@ import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.marshaller.MarshallerContext;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
-import sun.misc.Unsafe;
/**
* Miscellaneous utility methods to facilitate {@link OptimizedMarshaller}.
*/
class OptimizedMarshallerUtils {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
static final long HASH_SET_MAP_OFF;
/** */
@@ -158,12 +154,12 @@ class OptimizedMarshallerUtils {
long mapOff;
try {
- mapOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+ mapOff = GridUnsafe.objectFieldOffset(HashSet.class.getDeclaredField("map"));
}
catch (NoSuchFieldException e) {
try {
// Workaround for legacy IBM JRE.
- mapOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("backingMap"));
+ mapOff = GridUnsafe.objectFieldOffset(HashSet.class.getDeclaredField("backingMap"));
}
catch (NoSuchFieldException e2) {
throw new IgniteException("Initialization failure.", e2);
@@ -358,7 +354,7 @@ class OptimizedMarshallerUtils {
* @return Byte value.
*/
static byte getByte(Object obj, long off) {
- return UNSAFE.getByte(obj, off);
+ return GridUnsafe.getByteField(obj, off);
}
/**
@@ -369,7 +365,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setByte(Object obj, long off, byte val) {
- UNSAFE.putByte(obj, off, val);
+ GridUnsafe.putByteField(obj, off, val);
}
/**
@@ -380,7 +376,7 @@ class OptimizedMarshallerUtils {
* @return Short value.
*/
static short getShort(Object obj, long off) {
- return UNSAFE.getShort(obj, off);
+ return GridUnsafe.getShortField(obj, off);
}
/**
@@ -391,7 +387,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setShort(Object obj, long off, short val) {
- UNSAFE.putShort(obj, off, val);
+ GridUnsafe.putShortField(obj, off, val);
}
/**
@@ -402,7 +398,7 @@ class OptimizedMarshallerUtils {
* @return Integer value.
*/
static int getInt(Object obj, long off) {
- return UNSAFE.getInt(obj, off);
+ return GridUnsafe.getIntField(obj, off);
}
/**
@@ -413,7 +409,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setInt(Object obj, long off, int val) {
- UNSAFE.putInt(obj, off, val);
+ GridUnsafe.putIntField(obj, off, val);
}
/**
@@ -424,7 +420,7 @@ class OptimizedMarshallerUtils {
* @return Long value.
*/
static long getLong(Object obj, long off) {
- return UNSAFE.getLong(obj, off);
+ return GridUnsafe.getLongField(obj, off);
}
/**
@@ -435,7 +431,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setLong(Object obj, long off, long val) {
- UNSAFE.putLong(obj, off, val);
+ GridUnsafe.putLongField(obj, off, val);
}
/**
@@ -446,7 +442,7 @@ class OptimizedMarshallerUtils {
* @return Float value.
*/
static float getFloat(Object obj, long off) {
- return UNSAFE.getFloat(obj, off);
+ return GridUnsafe.getFloatField(obj, off);
}
/**
@@ -457,7 +453,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setFloat(Object obj, long off, float val) {
- UNSAFE.putFloat(obj, off, val);
+ GridUnsafe.putFloatField(obj, off, val);
}
/**
@@ -468,7 +464,7 @@ class OptimizedMarshallerUtils {
* @return Double value.
*/
static double getDouble(Object obj, long off) {
- return UNSAFE.getDouble(obj, off);
+ return GridUnsafe.getDoubleField(obj, off);
}
/**
@@ -479,7 +475,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setDouble(Object obj, long off, double val) {
- UNSAFE.putDouble(obj, off, val);
+ GridUnsafe.putDoubleField(obj, off, val);
}
/**
@@ -490,7 +486,7 @@ class OptimizedMarshallerUtils {
* @return Char value.
*/
static char getChar(Object obj, long off) {
- return UNSAFE.getChar(obj, off);
+ return GridUnsafe.getCharField(obj, off);
}
/**
@@ -501,7 +497,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setChar(Object obj, long off, char val) {
- UNSAFE.putChar(obj, off, val);
+ GridUnsafe.putCharField(obj, off, val);
}
/**
@@ -512,7 +508,7 @@ class OptimizedMarshallerUtils {
* @return Boolean value.
*/
static boolean getBoolean(Object obj, long off) {
- return UNSAFE.getBoolean(obj, off);
+ return GridUnsafe.getBooleanField(obj, off);
}
/**
@@ -523,7 +519,7 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setBoolean(Object obj, long off, boolean val) {
- UNSAFE.putBoolean(obj, off, val);
+ GridUnsafe.putBooleanField(obj, off, val);
}
/**
@@ -534,7 +530,7 @@ class OptimizedMarshallerUtils {
* @return Value.
*/
static Object getObject(Object obj, long off) {
- return UNSAFE.getObject(obj, off);
+ return GridUnsafe.getObjectField(obj, off);
}
/**
@@ -545,6 +541,6 @@ class OptimizedMarshallerUtils {
* @param val Value.
*/
static void setObject(Object obj, long off, Object val) {
- UNSAFE.putObject(obj, off, val);
+ GridUnsafe.putObjectField(obj, off, val);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index ce9ee0b..988a777 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -45,7 +45,6 @@ import org.apache.ignite.internal.util.io.GridDataInput;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerContext;
-import sun.misc.Unsafe;
import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ARRAY_LIST;
import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.BOOLEAN;
@@ -98,9 +97,6 @@ import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.se
* Optimized object input stream.
*/
class OptimizedObjectInputStream extends ObjectInputStream {
- /** Unsafe. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Dummy object for HashSet. */
private static final Object DUMMY = new Object();
@@ -544,7 +540,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
Object obj;
try {
- obj = UNSAFE.allocateInstance(cls);
+ obj = GridUnsafe.allocateInstance(cls);
}
catch (InstantiationException e) {
throw new IOException(e);
@@ -642,7 +638,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
@SuppressWarnings("unchecked")
HashSet<?> readHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
try {
- HashSet<Object> set = (HashSet<Object>)UNSAFE.allocateInstance(HashSet.class);
+ HashSet<Object> set = (HashSet<Object>)GridUnsafe.allocateInstance(HashSet.class);
handles.assign(set);
@@ -714,7 +710,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
@SuppressWarnings("unchecked")
LinkedHashSet<?> readLinkedHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
try {
- LinkedHashSet<Object> set = (LinkedHashSet<Object>)UNSAFE.allocateInstance(LinkedHashSet.class);
+ LinkedHashSet<Object> set = (LinkedHashSet<Object>)GridUnsafe.allocateInstance(LinkedHashSet.class);
handles.assign(set);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
index de09e06..983afde 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
@@ -40,7 +40,6 @@ import static junit.framework.Assert.fail;
* IO test utilities.
*/
public final class GridTestIoUtils {
-
/**
* Serializes a given object into byte array.
*
@@ -187,6 +186,122 @@ public final class GridTestIoUtils {
assertEquals(expSize.longValue(), pos);
}
+ /**
+ * Gets short value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static short getShortByByteLE(byte[] arr) {
+ return getShortByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets short value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static short getShortByByteLE(byte[] arr, int off) {
+ return (short)((arr[off] & 0xff) | arr[off + 1] << 8);
+ }
+
+ /**
+ * Gets char value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static char getCharByByteLE(byte[] arr) {
+ return getCharByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets char value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static char getCharByByteLE(byte[] arr, int off) {
+ return (char)((arr[off] & 0xff) | arr[off + 1] << 8);
+ }
+
+ /**
+ * Gets integer value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static int getIntByByteLE(byte[] arr) {
+ return getIntByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets integer value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static int getIntByByteLE(byte[] arr, int off) {
+ return ((int)arr[off] & 0xff) | ((int)arr[off + 1] & 0xff) << 8 |
+ ((int)arr[off + 2] & 0xff) << 16 | ((int)arr[off + 3] & 0xff) << 24;
+ }
+
+ /**
+ * Gets long value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static long getLongByByteLE(byte[] arr) {
+ return getLongByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets long value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static long getLongByByteLE(byte[] arr, int off) {
+ return ((long)arr[off] & 0xff) | ((long)arr[off + 1] & 0xff) << 8 | ((long)arr[off + 2] & 0xff) << 16 |
+ ((long)arr[off + 3] & 0xff) << 24 | ((long)arr[off + 4] & 0xff) << 32 | ((long)arr[off + 5] & 0xff) << 40 |
+ ((long)arr[off + 6] & 0xff) << 48 | ((long)arr[off + 7] & 0xff) << 56;
+ }
+
+ /**
+ * Gets float value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static float getFloatByByteLE(byte[] arr) {
+ return getFloatByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets float value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static float getFloatByByteLE(byte[] arr, int off) {
+ return Float.intBitsToFloat(getIntByByteLE(arr, off));
+ }
+
+ /**
+ * Gets double value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ */
+ public static double getDoubleByByteLE(byte[] arr) {
+ return getDoubleByByteLE(arr, 0);
+ }
+
+ /**
+ * Gets double value from byte array assuming that value stored in little-endian byte order.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ */
+ public static double getDoubleByByteLE(byte[] arr, int off) {
+ return Double.longBitsToDouble(getLongByByteLE(arr, off));
+ }
/**
* Closes resource.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index 0515685..a75023f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -116,7 +116,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<CacheConfiguration>() {
@Override public boolean apply(CacheConfiguration c) {
return !CU.MARSH_CACHE_NAME.equals(c.getName()) && !CU.UTILITY_CACHE_NAME.equals(c.getName()) &&
- !CU.ATOMICS_CACHE_NAME.equals(c.getName());
+ !CU.ATOMICS_CACHE_NAME.equals(c.getName()) && !CU.SYS_CACHE_HADOOP_MR.equals(c.getName());
}
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
index 87cc527..1546252 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
@@ -19,18 +19,11 @@ package org.apache.ignite.internal.binary;
import org.apache.ignite.internal.util.GridUnsafe;
import org.eclipse.jetty.util.ConcurrentHashSet;
-import sun.misc.Unsafe;
/**
* Field tests for heap-based binaries.
*/
public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
- /** Unsafe instance. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** Byte array offset for unsafe mechanics. */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
/** Allocated unsafe pointer. */
private final ConcurrentHashSet<Long> ptrs = new ConcurrentHashSet<>();
@@ -40,7 +33,7 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
// Cleanup allocated objects.
for (Long ptr : ptrs)
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
ptrs.clear();
}
@@ -49,11 +42,11 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
@Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
- long ptr = UNSAFE.allocateMemory(arr.length);
+ long ptr = GridUnsafe.allocateMemory(arr.length);
ptrs.add(ptr);
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF, null, ptr, arr.length);
return new BinaryObjectOffheapImpl(binaryContext(marsh), ptr, 0, arr.length);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
index fe9ba17..796c027 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
@@ -19,18 +19,11 @@ package org.apache.ignite.internal.binary;
import org.apache.ignite.internal.util.GridUnsafe;
import org.eclipse.jetty.util.ConcurrentHashSet;
-import sun.misc.Unsafe;
/**
* Compact offsets tests for offheap binary objects.
*/
public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
- /** Unsafe instance. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** Byte array offset for unsafe mechanics. */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
/** Allocated unsafe pointer. */
private final ConcurrentHashSet<Long> ptrs = new ConcurrentHashSet<>();
@@ -40,7 +33,7 @@ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstr
// Cleanup allocated objects.
for (Long ptr : ptrs)
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
ptrs.clear();
}
@@ -49,11 +42,11 @@ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstr
@Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
- long ptr = UNSAFE.allocateMemory(arr.length);
+ long ptr = GridUnsafe.allocateMemory(arr.length);
ptrs.add(ptr);
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF, null, ptr, arr.length);
return new BinaryObjectOffheapImpl(ctx, ptr, 0, arr.length);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index fa0f9a7..37b908a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -88,7 +88,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import sun.misc.Unsafe;
import static org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE;
import static org.junit.Assert.assertArrayEquals;
@@ -99,12 +98,6 @@ import static org.junit.Assert.assertNotEquals;
*/
@SuppressWarnings({"OverlyStrongTypeCast", "ArrayHashCode", "ConstantConditions"})
public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
- /** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
/**
* @throws Exception If failed.
*/
@@ -2378,13 +2371,13 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
assertFalse(offheapObj2.equals(offheapObj));
}
finally {
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
if (ptr1 > 0)
- UNSAFE.freeMemory(ptr1);
+ GridUnsafe.freeMemory(ptr1);
if (ptr2 > 0)
- UNSAFE.freeMemory(ptr2);
+ GridUnsafe.freeMemory(ptr2);
}
}
@@ -2975,9 +2968,9 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private long copyOffheap(BinaryObjectImpl obj) {
byte[] arr = obj.array();
- long ptr = UNSAFE.allocateMemory(arr.length);
+ long ptr = GridUnsafe.allocateMemory(arr.length);
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF, null, ptr, arr.length);
return ptr;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
index 059703e..990c928 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
@@ -46,7 +46,8 @@ import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import sun.misc.Unsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
/**
* Binary builder test.
@@ -54,12 +55,6 @@ import sun.misc.Unsafe;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class BinaryObjectBuilderDefaultMappersSelfTest extends GridCommonAbstractTest {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
private static IgniteConfiguration cfg;
/** {@inheritDoc} */
@@ -766,16 +761,21 @@ public class BinaryObjectBuilderDefaultMappersSelfTest extends GridCommonAbstrac
byte[] arr = ((CacheObjectBinaryProcessorImpl)(grid(0)).context().cacheObjects()).marshal(po);
- long ptr = UNSAFE.allocateMemory(arr.length + 5);
+ long ptr = GridUnsafe.allocateMemory(arr.length + 5);
try {
long ptr0 = ptr;
- UNSAFE.putBoolean(null, ptr0++, false);
+ GridUnsafe.putBoolean(null, ptr0++, false);
+
+ int len = arr.length;
- UNSAFE.putInt(ptr0, arr.length);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(ptr0, len);
+ else
+ GridUnsafe.putInt(ptr0, len);
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr0 + 4, arr.length);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF, null, ptr0 + 4, arr.length);
BinaryObject offheapObj = (BinaryObject)
((CacheObjectBinaryProcessorImpl)(grid(0)).context().cacheObjects()).unmarshal(ptr, false);
@@ -801,7 +801,7 @@ public class BinaryObjectBuilderDefaultMappersSelfTest extends GridCommonAbstrac
assertEquals(offheapObj, po);
}
finally {
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
index ae615b1..5ddb87d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
@@ -31,14 +31,13 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
-
import org.apache.ignite.binary.BinaryMapFactory;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryReader;
import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.util.lang.GridMapEntry;
-import org.apache.ignite.binary.BinaryObject;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
new file mode 100644
index 0000000..c68a886
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/AbstractBinaryStreamByteOrderSelfTest.java
@@ -0,0 +1,464 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.binary.streams;
+
+import java.util.Random;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
+
+import static org.apache.ignite.GridTestIoUtils.getCharByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getDoubleByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getFloatByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getIntByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getLongByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getShortByByteLE;
+
+/**
+ * Binary input/output streams byte order sanity tests.
+ */
+public abstract class AbstractBinaryStreamByteOrderSelfTest extends GridCommonAbstractTest {
+ /** Array length. */
+ protected static final int ARR_LEN = 16;
+
+ /** Rnd. */
+ private static final Random RND = new Random();
+
+ /** Out. */
+ protected BinaryAbstractOutputStream out;
+
+ /** In. */
+ protected BinaryAbstractInputStream in;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ init();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ out.close();
+ }
+
+ /**
+ * Initializes streams.
+ */
+ protected abstract void init();
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShort() throws Exception {
+ short val = (short)RND.nextLong();
+
+ reset();
+
+ out.unsafeWriteShort(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readShort());
+
+ reset();
+
+ out.unsafeWriteShort(0, val);
+ out.shift(2);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readShortFast());
+
+ reset();
+
+ out.writeShortFast(val);
+ out.shift(2);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readShortPositioned(0));
+
+ reset();
+
+ out.writeShort(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readShortPositioned(0));
+
+ reset();
+
+ out.writeShort(0, val);
+ out.shift(2);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readShortPositioned(0));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShortArray() throws Exception {
+ short[] arr = new short[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (short)RND.nextLong();
+
+ out.writeShortArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getShortByByteLE(outArr, i * 2));
+
+ Assert.assertArrayEquals(arr, in.readShortArray(ARR_LEN));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testChar() throws Exception {
+ char val = (char)RND.nextLong();
+
+ reset();
+
+ out.unsafeWriteChar(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readChar());
+
+ reset();
+
+ out.writeCharFast(val);
+ out.shift(2);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readCharFast());
+
+ reset();
+
+ out.writeChar(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readChar());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCharArray() throws Exception {
+ char[] arr = new char[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (char)RND.nextLong();
+
+ out.writeCharArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getCharByByteLE(outArr, i * 2));
+
+ Assert.assertArrayEquals(arr, in.readCharArray(ARR_LEN));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testInt() throws Exception {
+ int val = RND.nextInt();
+
+ reset();
+
+ out.unsafeWriteInt(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readInt());
+
+ reset();
+
+ out.unsafeWriteInt(0, val);
+ out.shift(4);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readIntFast());
+
+ reset();
+
+ out.writeIntFast(val);
+ out.shift(4);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readIntPositioned(0));
+
+ reset();
+
+ out.writeInt(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readIntPositioned(0));
+
+ reset();
+
+ out.writeInt(0, val);
+ out.shift(4);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readIntPositioned(0));
+
+ reset();
+
+ out.writeIntArray(new int[] {val});
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readIntArray(1)[0]);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testIntArray() throws Exception {
+ int[] arr = new int[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextInt();
+
+ out.writeIntArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getIntByByteLE(outArr, i * 4));
+
+ Assert.assertArrayEquals(arr, in.readIntArray(ARR_LEN));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLong() throws Exception {
+ long val = RND.nextLong();
+
+ reset();
+
+ out.unsafeWriteLong(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readLong());
+
+ reset();
+
+ out.writeLongFast(val);
+ out.shift(8);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readLongFast());
+
+ reset();
+
+ out.writeLong(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readLong());
+
+ reset();
+
+ out.writeLongArray(new long[] {val});
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readLongArray(1)[0]);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLongArray() throws Exception {
+ long[] arr = new long[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextLong();
+
+ out.writeLongArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getLongByByteLE(outArr, i * 8));
+
+ Assert.assertArrayEquals(arr, in.readLongArray(ARR_LEN));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloat() throws Exception {
+ float val = RND.nextFloat();
+
+ reset();
+
+ out.unsafeWriteFloat(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readFloat(), 0);
+
+ reset();
+
+ out.writeFloat(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readFloat(), 0);
+
+ reset();
+
+ out.writeFloatArray(new float[] {val});
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readFloatArray(1)[0], 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloatArray() throws Exception {
+ float[] arr = new float[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextFloat();
+
+ out.writeFloatArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getFloatByByteLE(outArr, i * 4), 0);
+
+ Assert.assertArrayEquals(arr, in.readFloatArray(ARR_LEN), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDouble() throws Exception {
+ double val = RND.nextDouble();
+
+ reset();
+
+ out.unsafeWriteDouble(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readDouble(), 0);
+
+ reset();
+
+ out.writeDouble(val);
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readDouble(), 0);
+
+ reset();
+
+ out.writeDoubleArray(new double[] {val});
+
+ checkValueLittleEndian(val);
+ assertEquals(val, in.readDoubleArray(1)[0], 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDoubleArray() throws Exception {
+ double[] arr = new double[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextDouble();
+
+ out.writeDoubleArray(arr);
+
+ byte[] outArr = array();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getDoubleByByteLE(outArr, i * 8), 0);
+
+ Assert.assertArrayEquals(arr, in.readDoubleArray(ARR_LEN), 0);
+ }
+
+ /**
+ *
+ */
+ private void reset() {
+ in.position(0);
+ out.position(0);
+ }
+
+ /**
+ *
+ */
+ private byte[] array() {
+ return out.array();
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(short exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getShortByByteLE(arr));
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(char exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getCharByByteLE(arr));
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(int exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getIntByByteLE(arr));
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(long exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getLongByByteLE(arr));
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(float exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getFloatByByteLE(arr), 0);
+ }
+
+ /**
+ * @param exp Expected.
+ */
+ private void checkValueLittleEndian(double exp) {
+ byte[] arr = array();
+
+ assertEquals(exp, getDoubleByByteLE(arr), 0);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryHeapStreamByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryHeapStreamByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryHeapStreamByteOrderSelfTest.java
new file mode 100644
index 0000000..4b86748
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryHeapStreamByteOrderSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.binary.streams;
+
+/**
+ * Binary heap input/output stream byte order sanity tests.
+ */
+public class BinaryHeapStreamByteOrderSelfTest extends AbstractBinaryStreamByteOrderSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void init() {
+ out = new BinaryHeapOutputStream(ARR_LEN * 8);
+ in = new BinaryHeapInputStream(out.array());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryOffheapStreamByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryOffheapStreamByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryOffheapStreamByteOrderSelfTest.java
new file mode 100644
index 0000000..6e9c41a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/streams/BinaryOffheapStreamByteOrderSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.binary.streams;
+
+/**
+ * Binary offheap input/output stream byte order sanity tests.
+ */
+public class BinaryOffheapStreamByteOrderSelfTest extends AbstractBinaryStreamByteOrderSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void init() {
+ int cap = ARR_LEN * 8;
+
+ out = new BinaryOffheapOutputStream(cap);
+ in = new BinaryOffheapInputStream(((BinaryOffheapOutputStream)out).pointer(), cap);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
new file mode 100644
index 0000000..d96f796
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
@@ -0,0 +1,244 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.direct.stream.v2;
+
+import java.nio.ByteBuffer;
+import java.util.Random;
+import junit.framework.TestCase;
+import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.GridTestIoUtils.getCharByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getDoubleByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getFloatByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getIntByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getLongByByteLE;
+import static org.apache.ignite.GridTestIoUtils.getShortByByteLE;
+import static org.junit.Assert.assertArrayEquals;
+
+/**
+ * {@link DirectByteBufferStreamImplV2} byte order sanity tests.
+ */
+public class DirectByteBufferStreamImplV2ByteOrderSelfTest extends TestCase {
+ /** Array length. */
+ private static final int ARR_LEN = 16;
+
+ /** Length bytes. */
+ private static final int LEN_BYTES = 1;
+
+ /** Rnd. */
+ private static final Random RND = new Random();
+
+ /** Stream. */
+ private DirectByteBufferStream stream;
+
+ /** Buff. */
+ private ByteBuffer buff;
+
+ /** Array. */
+ private byte[] outArr;
+
+ /** {@inheritDoc} */
+ @Override public void setUp() throws Exception {
+ super.setUp();
+
+ stream = new DirectByteBufferStreamImplV2(new MessageFactory() {
+ @Nullable @Override public Message create(byte type) {
+ return null;
+ }
+ });
+
+ outArr = new byte[ARR_LEN * 8 + LEN_BYTES];
+
+ buff = ByteBuffer.wrap(outArr);
+
+ stream.setBuffer(buff);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShort() throws Exception {
+ short val = (short)RND.nextLong();
+
+ stream.writeShort(val);
+
+ buff.rewind();
+
+ assertEquals(val, getShortByByteLE(outArr));
+ assertEquals(val, stream.readShort());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShortArray() throws Exception {
+ short[] arr = new short[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (short)RND.nextLong();
+
+ stream.writeShortArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getShortByByteLE(outArr, i * 2 + LEN_BYTES));
+
+ assertArrayEquals(arr, stream.readShortArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testChar() throws Exception {
+ char val = (char)RND.nextLong();
+
+ stream.writeChar(val);
+
+ buff.rewind();
+
+ assertEquals(val, getCharByByteLE(outArr));
+ assertEquals(val, stream.readChar());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCharArray() throws Exception {
+ char[] arr = new char[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = (char)RND.nextLong();
+
+ stream.writeCharArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getCharByByteLE(outArr, i * 2 + LEN_BYTES));
+
+ assertArrayEquals(arr, stream.readCharArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testIntArray() throws Exception {
+ int[] arr = new int[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextInt();
+
+ stream.writeIntArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getIntByByteLE(outArr, i * 4 + LEN_BYTES));
+
+ assertArrayEquals(arr, stream.readIntArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLongArray() throws Exception {
+ long[] arr = new long[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextLong();
+
+ stream.writeLongArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getLongByByteLE(outArr, i * 8 + LEN_BYTES));
+
+ assertArrayEquals(arr, stream.readLongArray());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloat() throws Exception {
+ float val = RND.nextFloat();
+
+ stream.writeFloat(val);
+
+ buff.rewind();
+
+ assertEquals(val, getFloatByByteLE(outArr), 0);
+ assertEquals(val, stream.readFloat(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloatArray() throws Exception {
+ float[] arr = new float[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextFloat();
+
+ stream.writeFloatArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getFloatByByteLE(outArr, i * 4 + LEN_BYTES), 0);
+
+ assertArrayEquals(arr, stream.readFloatArray(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDouble() throws Exception {
+ double val = RND.nextDouble();
+
+ stream.writeDouble(val);
+
+ buff.rewind();
+
+ assertEquals(val, getDoubleByByteLE(outArr), 0);
+ assertEquals(val, stream.readDouble(), 0);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDoubleArray() throws Exception {
+ double[] arr = new double[ARR_LEN];
+
+ for (int i = 0; i < ARR_LEN; i++)
+ arr[i] = RND.nextDouble();
+
+ stream.writeDoubleArray(arr);
+
+ buff.rewind();
+
+ for (int i = 0; i < ARR_LEN; i++)
+ assertEquals(arr[i], getDoubleByByteLE(outArr, i * 8 + LEN_BYTES), 0);
+
+ assertArrayEquals(arr, stream.readDoubleArray(), 0);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 5bb6794..4887b79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -27,7 +27,6 @@ import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -165,17 +164,11 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
Iterator<Cache.Entry<Integer, String>> it = null;
- boolean created = false;
-
for (int i = start; i < start + cnt; i++) {
int key = i % cnt;
- if (!created && i >= start + tid * 100) {
- if (it == null)
- it = c.iterator();
-
- created = true;
- }
+ if (it == null && i >= start + tid * 100)
+ it = c.iterator();
c.put(key, Integer.toString(key));
@@ -342,7 +335,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
return null;
}
- }, Runtime.getRuntime().availableProcessors());
+ }, Math.min(16, Runtime.getRuntime().availableProcessors()));
for (int r = 0; r < 10; r++) {
System.gc();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 5de3d0f..1c65f9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -228,6 +228,12 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
qryClnCache.put(keys.get(0), 100);
}
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return lsnr.evts.size() == 1;
+ }
+ }, 5000);
+
assertEquals(lsnr.evts.size(), 1);
}
[5/8] ignite git commit: ignite-2080 Data alignment issues with Unsafe
Posted by sb...@apache.org.
ignite-2080 Data alignment issues with Unsafe
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a87decdc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a87decdc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a87decdc
Branch: refs/heads/ignite-2407
Commit: a87decdca4009a2af857d8ca6a46e5a719786a6d
Parents: 4035d40
Author: agura <ag...@gridgain.com>
Authored: Mon Jan 11 14:53:02 2016 +0300
Committer: agura <ag...@gridgain.com>
Committed: Tue Feb 2 20:26:24 2016 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryClassDescriptor.java | 6 +-
.../internal/binary/BinaryFieldAccessor.java | 45 +-
.../internal/binary/BinaryMarshaller.java | 5 +-
.../binary/BinaryObjectOffheapImpl.java | 34 +-
.../internal/binary/BinaryPrimitives.java | 117 +-
.../streams/BinaryAbstractInputStream.java | 53 +-
.../streams/BinaryAbstractOutputStream.java | 90 +-
.../binary/streams/BinaryAbstractStream.java | 34 -
.../binary/streams/BinaryHeapInputStream.java | 43 +-
.../binary/streams/BinaryHeapOutputStream.java | 86 +-
.../streams/BinaryMemoryAllocatorChunk.java | 9 +-
.../streams/BinaryOffheapInputStream.java | 42 +-
.../streams/BinaryOffheapOutputStream.java | 94 +-
.../internal/direct/DirectMessageReader.java | 2 +-
.../internal/direct/DirectMessageWriter.java | 2 +-
.../stream/v1/DirectByteBufferStreamImplV1.java | 106 +-
.../stream/v2/DirectByteBufferStreamImplV2.java | 351 ++++-
.../cache/GridCacheEvictionManager.java | 7 +-
.../cache/GridCacheOffheapSwapEntry.java | 24 +-
.../cache/GridCacheSwapEntryImpl.java | 61 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 8 +-
.../dht/atomic/GridDhtAtomicCache.java | 13 +-
.../local/atomic/GridLocalAtomicCache.java | 9 +-
.../IgniteCacheObjectProcessorImpl.java | 7 +-
.../platform/memory/PlatformAbstractMemory.java | 6 +-
.../PlatformBigEndianOutputStreamImpl.java | 14 +-
.../memory/PlatformInputStreamImpl.java | 53 +-
.../platform/memory/PlatformMemoryUtils.java | 108 +-
.../memory/PlatformOutputStreamImpl.java | 58 +-
.../ignite/internal/util/GridHandleTable.java | 17 +-
.../ignite/internal/util/GridJavaProcess.java | 3 -
.../internal/util/GridSpinReadWriteLock.java | 10 +-
.../apache/ignite/internal/util/GridUnsafe.java | 1483 +++++++++++++++++-
.../ignite/internal/util/IgniteUtils.java | 99 +-
.../internal/util/io/GridUnsafeDataInput.java | 145 +-
.../internal/util/io/GridUnsafeDataOutput.java | 165 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 75 +-
.../util/offheap/unsafe/GridUnsafeMemory.java | 106 +-
.../optimized/OptimizedClassDescriptor.java | 22 +-
.../optimized/OptimizedMarshaller.java | 5 +-
.../optimized/OptimizedMarshallerUtils.java | 44 +-
.../optimized/OptimizedObjectInputStream.java | 10 +-
.../java/org/apache/ignite/GridTestIoUtils.java | 117 +-
.../ignite/internal/GridAffinitySelfTest.java | 2 +-
.../binary/BinaryFieldsOffheapSelfTest.java | 13 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 13 +-
.../binary/BinaryMarshallerSelfTest.java | 17 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 24 +-
.../mutabletest/GridBinaryTestClasses.java | 3 +-
.../AbstractBinaryStreamByteOrderSelfTest.java | 464 ++++++
.../BinaryHeapStreamByteOrderSelfTest.java | 29 +
.../BinaryOffheapStreamByteOrderSelfTest.java | 31 +
...ByteBufferStreamImplV2ByteOrderSelfTest.java | 244 +++
.../cache/GridCacheConcurrentMapSelfTest.java | 13 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 6 +
...dUnsafeDataInputOutputByteOrderSelfTest.java | 249 +++
.../ignite/lang/GridBasicPerformanceTest.java | 11 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../IgniteBinaryObjectsTestSuite.java | 6 +
.../IgniteMarshallerSelfTestSuite.java | 4 +
.../hadoop/shuffle/HadoopShuffleJob.java | 5 +-
.../hadoop/shuffle/HadoopShuffleMessage.java | 10 +-
.../shuffle/streams/HadoopDataOutStream.java | 6 +-
.../HadoopConcurrentHashMultimapSelftest.java | 6 +-
.../collections/HadoopSkipListSelfTest.java | 5 +-
66 files changed, 3851 insertions(+), 1104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 233e74b..5cb8a86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -46,16 +46,12 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerExclusions;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.jetbrains.annotations.Nullable;
-import sun.misc.Unsafe;
/**
* Binary class descriptor.
*/
public class BinaryClassDescriptor {
/** */
- public static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
@GridToStringExclude
private final BinaryContext ctx;
@@ -776,7 +772,7 @@ public class BinaryClassDescriptor {
*/
private Object newInstance() throws BinaryObjectException {
try {
- return ctor != null ? ctor.newInstance() : UNSAFE.allocateInstance(cls);
+ return ctor != null ? ctor.newInstance() : GridUnsafe.allocateInstance(cls);
}
catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
throw new BinaryObjectException("Failed to instantiate instance: " + cls, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 2d69cbd..8c8bf27 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -17,11 +17,6 @@
package org.apache.ignite.internal.binary;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.internal.util.GridUnsafe;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
-
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.sql.Timestamp;
@@ -29,6 +24,9 @@ import java.util.Collection;
import java.util.Date;
import java.util.Map;
import java.util.UUID;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
/**
* Field accessor to speedup access.
@@ -157,9 +155,6 @@ public abstract class BinaryFieldAccessor {
* Base primitive field accessor.
*/
private static abstract class AbstractPrimitiveAccessor extends BinaryFieldAccessor {
- /** Unsafe instance. */
- protected static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** Offset. */
protected final long offset;
@@ -175,7 +170,7 @@ public abstract class BinaryFieldAccessor {
assert field != null;
- offset = UNSAFE.objectFieldOffset(field);
+ offset = GridUnsafe.objectFieldOffset(field);
}
}
@@ -196,7 +191,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- byte val = UNSAFE.getByte(obj, offset);
+ byte val = GridUnsafe.getByteField(obj, offset);
writer.writeByteFieldPrimitive(val);
}
@@ -205,7 +200,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
byte val = reader.readByte(id);
- UNSAFE.putByte(obj, offset, val);
+ GridUnsafe.putByteField(obj, offset, val);
}
}
@@ -226,7 +221,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- boolean val = UNSAFE.getBoolean(obj, offset);
+ boolean val = GridUnsafe.getBooleanField(obj, offset);
writer.writeBooleanFieldPrimitive(val);
}
@@ -235,7 +230,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
boolean val = reader.readBoolean(id);
- UNSAFE.putBoolean(obj, offset, val);
+ GridUnsafe.putBooleanField(obj, offset, val);
}
}
@@ -256,7 +251,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- short val = UNSAFE.getShort(obj, offset);
+ short val = GridUnsafe.getShortField(obj, offset);
writer.writeShortFieldPrimitive(val);
}
@@ -265,7 +260,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
short val = reader.readShort(id);
- UNSAFE.putShort(obj, offset, val);
+ GridUnsafe.putShortField(obj, offset, val);
}
}
@@ -286,7 +281,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- char val = UNSAFE.getChar(obj, offset);
+ char val = GridUnsafe.getCharField(obj, offset);
writer.writeCharFieldPrimitive(val);
}
@@ -295,7 +290,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
char val = reader.readChar(id);
- UNSAFE.putChar(obj, offset, val);
+ GridUnsafe.putCharField(obj, offset, val);
}
}
@@ -316,7 +311,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- int val = UNSAFE.getInt(obj, offset);
+ int val = GridUnsafe.getIntField(obj, offset);
writer.writeIntFieldPrimitive(val);
}
@@ -325,7 +320,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
int val = reader.readInt(id);
- UNSAFE.putInt(obj, offset, val);
+ GridUnsafe.putIntField(obj, offset, val);
}
}
@@ -346,7 +341,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- long val = UNSAFE.getLong(obj, offset);
+ long val = GridUnsafe.getLongField(obj, offset);
writer.writeLongFieldPrimitive(val);
}
@@ -355,7 +350,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
long val = reader.readLong(id);
- UNSAFE.putLong(obj, offset, val);
+ GridUnsafe.putLongField(obj, offset, val);
}
}
@@ -376,7 +371,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- float val = UNSAFE.getFloat(obj, offset);
+ float val = GridUnsafe.getFloatField(obj, offset);
writer.writeFloatFieldPrimitive(val);
}
@@ -385,7 +380,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
float val = reader.readFloat(id);
- UNSAFE.putFloat(obj, offset, val);
+ GridUnsafe.putFloatField(obj, offset, val);
}
}
@@ -406,7 +401,7 @@ public abstract class BinaryFieldAccessor {
@Override public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
writer.writeFieldIdNoSchemaUpdate(id);
- double val = UNSAFE.getDouble(obj, offset);
+ double val = GridUnsafe.getDoubleField(obj, offset);
writer.writeDoubleFieldPrimitive(val);
}
@@ -415,7 +410,7 @@ public abstract class BinaryFieldAccessor {
@Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
double val = reader.readDouble(id);
- UNSAFE.putDouble(obj, offset, val);
+ GridUnsafe.putDoubleField(obj, offset, val);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
index 5480967..29a1fca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
@@ -24,7 +24,6 @@ import java.io.OutputStream;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.marshaller.AbstractMarshaller;
import org.apache.ignite.marshaller.MarshallerContext;
import org.jetbrains.annotations.Nullable;
@@ -52,9 +51,7 @@ public class BinaryMarshaller extends AbstractMarshaller {
@SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
public static boolean available() {
try {
- Unsafe unsafe = GridUnsafe.unsafe();
-
- Class<? extends Unsafe> unsafeCls = unsafe.getClass();
+ Class<? extends Unsafe> unsafeCls = Unsafe.class;
unsafeCls.getMethod("allocateInstance", Class.class);
unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index 696a34b..07ab4d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -17,6 +17,16 @@
package org.apache.ignite.internal.binary;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
@@ -26,23 +36,10 @@ import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderImpl;
import org.apache.ignite.internal.binary.streams.BinaryOffheapInputStream;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
-import sun.misc.Unsafe;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.UUID;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -54,9 +51,6 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter
private static final long serialVersionUID = 0L;
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
private final BinaryContext ctx;
/** */
@@ -97,22 +91,22 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter
/** {@inheritDoc} */
@Override public int typeId() {
- return UNSAFE.getInt(ptr + start + GridBinaryMarshaller.TYPE_ID_POS);
+ return BinaryPrimitives.readInt(ptr, start + GridBinaryMarshaller.TYPE_ID_POS);
}
/** {@inheritDoc} */
@Override public int length() {
- return UNSAFE.getInt(ptr + start + GridBinaryMarshaller.TOTAL_LEN_POS);
+ return BinaryPrimitives.readInt(ptr, start + GridBinaryMarshaller.TOTAL_LEN_POS);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return UNSAFE.getInt(ptr + start + GridBinaryMarshaller.HASH_CODE_POS);
+ return BinaryPrimitives.readInt(ptr, start + GridBinaryMarshaller.HASH_CODE_POS);
}
/** {@inheritDoc} */
@Override protected int schemaId() {
- return UNSAFE.getInt(ptr + start + GridBinaryMarshaller.SCHEMA_ID_POS);
+ return BinaryPrimitives.readInt(ptr, start + GridBinaryMarshaller.SCHEMA_ID_POS);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
index a6a867c..8b82fad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryPrimitives.java
@@ -18,33 +18,20 @@
package org.apache.ignite.internal.binary;
import org.apache.ignite.internal.util.GridUnsafe;
-import sun.misc.Unsafe;
-import java.nio.ByteOrder;
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
/**
* Primitives writer.
*/
public abstract class BinaryPrimitives {
- /** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- private static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
- private static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
-
- /** Whether little endian is set. */
- private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
-
/**
* @param arr Array.
* @param off Offset.
* @param val Value.
*/
public static void writeByte(byte[] arr, int off, byte val) {
- UNSAFE.putByte(arr, BYTE_ARR_OFF + off, val);
+ GridUnsafe.putByte(arr, GridUnsafe.BYTE_ARR_OFF + off, val);
}
/**
@@ -53,7 +40,7 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static byte readByte(byte[] arr, int off) {
- return UNSAFE.getByte(arr, BYTE_ARR_OFF + off);
+ return GridUnsafe.getByte(arr, GridUnsafe.BYTE_ARR_OFF + off);
}
/**
@@ -62,7 +49,7 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static byte readByte(long ptr, int off) {
- return UNSAFE.getByte(ptr + off);
+ return GridUnsafe.getByte(ptr + off);
}
/**
@@ -73,7 +60,7 @@ public abstract class BinaryPrimitives {
public static byte[] readByteArray(byte[] arr, int off, int len) {
byte[] arr0 = new byte[len];
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF + off, arr0, BYTE_ARR_OFF, len);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF + off, arr0, GridUnsafe.BYTE_ARR_OFF, len);
return arr0;
}
@@ -86,7 +73,7 @@ public abstract class BinaryPrimitives {
public static byte[] readByteArray(long ptr, int off, int len) {
byte[] arr0 = new byte[len];
- UNSAFE.copyMemory(null, ptr + off, arr0, BYTE_ARR_OFF, len);
+ GridUnsafe.copyMemory(null, ptr + off, arr0, GridUnsafe.BYTE_ARR_OFF, len);
return arr0;
}
@@ -124,10 +111,12 @@ public abstract class BinaryPrimitives {
* @param val Value.
*/
public static void writeShort(byte[] arr, int off, short val) {
- if (BIG_ENDIAN)
- val = Short.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- UNSAFE.putShort(arr, BYTE_ARR_OFF + off, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(arr, pos, val);
+ else
+ GridUnsafe.putShort(arr, pos, val);
}
/**
@@ -136,12 +125,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static short readShort(byte[] arr, int off) {
- short val = UNSAFE.getShort(arr, BYTE_ARR_OFF + off);
-
- if (BIG_ENDIAN)
- val = Short.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(arr, pos) : GridUnsafe.getShort(arr, pos);
}
/**
@@ -150,12 +136,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static short readShort(long ptr, int off) {
- short val = UNSAFE.getShort(ptr + off);
-
- if (BIG_ENDIAN)
- val = Short.reverseBytes(val);
+ long addr = ptr + off;
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(addr) : GridUnsafe.getShort(addr);
}
/**
@@ -164,10 +147,12 @@ public abstract class BinaryPrimitives {
* @param val Value.
*/
public static void writeChar(byte[] arr, int off, char val) {
- if (BIG_ENDIAN)
- val = Character.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- UNSAFE.putChar(arr, BYTE_ARR_OFF + off, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(arr, pos, val);
+ else
+ GridUnsafe.putChar(arr, pos, val);
}
/**
@@ -176,12 +161,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static char readChar(byte[] arr, int off) {
- char val = UNSAFE.getChar(arr, BYTE_ARR_OFF + off);
-
- if (BIG_ENDIAN)
- val = Character.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getCharLE(arr, pos): GridUnsafe.getChar(arr, pos);
}
/**
@@ -190,12 +172,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static char readChar(long ptr, int off) {
- char val = UNSAFE.getChar(ptr + off);
+ long addr = ptr + off;
- if (BIG_ENDIAN)
- val = Character.reverseBytes(val);
-
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getCharLE(addr) : GridUnsafe.getChar(addr);
}
/**
@@ -206,7 +185,7 @@ public abstract class BinaryPrimitives {
public static char[] readCharArray(byte[] arr, int off, int len) {
char[] arr0 = new char[len];
- UNSAFE.copyMemory(arr, BYTE_ARR_OFF + off, arr0, CHAR_ARR_OFF, len << 1);
+ GridUnsafe.copyMemory(arr, GridUnsafe.BYTE_ARR_OFF + off, arr0, GridUnsafe.CHAR_ARR_OFF, len << 1);
if (BIG_ENDIAN) {
for (int i = 0; i < len; i++)
@@ -224,7 +203,7 @@ public abstract class BinaryPrimitives {
public static char[] readCharArray(long ptr, int off, int len) {
char[] arr0 = new char[len];
- UNSAFE.copyMemory(null, ptr + off, arr0, CHAR_ARR_OFF, len << 1);
+ GridUnsafe.copyMemory(null, ptr + off, arr0, GridUnsafe.CHAR_ARR_OFF, len << 1);
if (BIG_ENDIAN) {
for (int i = 0; i < len; i++)
@@ -240,10 +219,12 @@ public abstract class BinaryPrimitives {
* @param val Value.
*/
public static void writeInt(byte[] arr, int off, int val) {
- if (BIG_ENDIAN)
- val = Integer.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- UNSAFE.putInt(arr, BYTE_ARR_OFF + off, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(arr, pos, val);
+ else
+ GridUnsafe.putInt(arr, pos, val);
}
/**
@@ -252,12 +233,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static int readInt(byte[] arr, int off) {
- int val = UNSAFE.getInt(arr, BYTE_ARR_OFF + off);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- if (BIG_ENDIAN)
- val = Integer.reverseBytes(val);
-
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(arr, pos) : GridUnsafe.getInt(arr, pos);
}
/**
@@ -266,12 +244,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static int readInt(long ptr, int off) {
- int val = UNSAFE.getInt(ptr + off);
-
- if (BIG_ENDIAN)
- val = Integer.reverseBytes(val);
+ long addr = ptr + off;
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(addr) : GridUnsafe.getInt(addr);
}
/**
@@ -280,10 +255,12 @@ public abstract class BinaryPrimitives {
* @param val Value.
*/
public static void writeLong(byte[] arr, int off, long val) {
- if (BIG_ENDIAN)
- val = Long.reverseBytes(val);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- UNSAFE.putLong(arr, BYTE_ARR_OFF + off, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(arr, pos, val);
+ else
+ GridUnsafe.putLong(arr, pos, val);
}
/**
@@ -292,12 +269,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static long readLong(byte[] arr, int off) {
- long val = UNSAFE.getLong(arr, BYTE_ARR_OFF + off);
+ long pos = GridUnsafe.BYTE_ARR_OFF + off;
- if (BIG_ENDIAN)
- val = Long.reverseBytes(val);
-
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getLongLE(arr, pos) : GridUnsafe.getLong(arr, pos);
}
/**
@@ -306,12 +280,9 @@ public abstract class BinaryPrimitives {
* @return Value.
*/
public static long readLong(long ptr, int off) {
- long val = UNSAFE.getLong(ptr + off);
-
- if (BIG_ENDIAN)
- val = Long.reverseBytes(val);
+ long addr = ptr + off;
- return val;
+ return BIG_ENDIAN ? GridUnsafe.getLongLE(addr) : GridUnsafe.getLong(addr);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
index 334f455..b6c30bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
@@ -18,6 +18,9 @@
package org.apache.ignite.internal.binary.streams;
import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
/**
* Binary abstract input stream.
@@ -40,7 +43,7 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
byte[] res = new byte[cnt];
- copyAndShift(res, BYTE_ARR_OFF, cnt);
+ copyAndShift(res, GridUnsafe.BYTE_ARR_OFF, cnt);
return res;
}
@@ -56,7 +59,7 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
boolean[] res = new boolean[cnt];
- copyAndShift(res, BOOLEAN_ARR_OFF, cnt);
+ copyAndShift(res, GridUnsafe.BOOLEAN_ARR_OFF, cnt);
return res;
}
@@ -69,9 +72,6 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
shift(2);
- if (!LITTLE_ENDIAN)
- res = Short.reverseBytes(res);
-
return res;
}
@@ -83,9 +83,9 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
short[] res = new short[cnt];
- copyAndShift(res, SHORT_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.SHORT_ARR_OFF, len);
- if (!LITTLE_ENDIAN) {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++)
res[i] = Short.reverseBytes(res[i]);
}
@@ -101,9 +101,6 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
shift(2);
- if (!LITTLE_ENDIAN)
- res = Character.reverseBytes(res);
-
return res;
}
@@ -115,9 +112,9 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
char[] res = new char[cnt];
- copyAndShift(res, CHAR_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.CHAR_ARR_OFF, len);
- if (!LITTLE_ENDIAN) {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++)
res[i] = Character.reverseBytes(res[i]);
}
@@ -133,9 +130,6 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
shift(4);
- if (!LITTLE_ENDIAN)
- res = Integer.reverseBytes(res);
-
return res;
}
@@ -147,9 +141,9 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
int[] res = new int[cnt];
- copyAndShift(res, INT_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.INT_ARR_OFF, len);
- if (!LITTLE_ENDIAN) {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++)
res[i] = Integer.reverseBytes(res[i]);
}
@@ -200,17 +194,17 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
float[] res = new float[cnt];
- if (LITTLE_ENDIAN)
- copyAndShift(res, FLOAT_ARR_OFF, len);
- else {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++) {
int x = readIntFast();
shift(4);
- res[i] = Float.intBitsToFloat(Integer.reverseBytes(x));
+ res[i] = Float.intBitsToFloat(x);
}
}
+ else
+ copyAndShift(res, GridUnsafe.FLOAT_ARR_OFF, len);
return res;
}
@@ -223,9 +217,6 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
shift(8);
- if (!LITTLE_ENDIAN)
- res = Long.reverseBytes(res);
-
return res;
}
@@ -237,9 +228,9 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
long[] res = new long[cnt];
- copyAndShift(res, LONG_ARR_OFF, len);
+ copyAndShift(res, GridUnsafe.LONG_ARR_OFF, len);
- if (!LITTLE_ENDIAN) {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++)
res[i] = Long.reverseBytes(res[i]);
}
@@ -260,17 +251,17 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
double[] res = new double[cnt];
- if (LITTLE_ENDIAN)
- copyAndShift(res, DOUBLE_ARR_OFF, len);
- else {
+ if (BIG_ENDIAN) {
for (int i = 0; i < res.length; i++) {
long x = readLongFast();
shift(8);
- res[i] = Double.longBitsToDouble(Long.reverseBytes(x));
+ res[i] = Double.longBitsToDouble(x);
}
}
+ else
+ copyAndShift(res, GridUnsafe.DOUBLE_ARR_OFF, len);
return res;
}
@@ -280,7 +271,7 @@ public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
if (len > remaining())
len = remaining();
- copyAndShift(arr, BYTE_ARR_OFF + off, len);
+ copyAndShift(arr, GridUnsafe.BYTE_ARR_OFF + off, len);
return len;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
index 4221cbe..b9df68e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
@@ -17,6 +17,10 @@
package org.apache.ignite.internal.binary.streams;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+
/**
* Base binary output stream.
*/
@@ -36,7 +40,7 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
@Override public void writeByteArray(byte[] val) {
ensureCapacity(pos + val.length);
- copyAndShift(val, BYTE_ARR_OFF, val.length);
+ copyAndShift(val, GridUnsafe.BYTE_ARR_OFF, val.length);
}
/** {@inheritDoc} */
@@ -48,16 +52,13 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
@Override public void writeBooleanArray(boolean[] val) {
ensureCapacity(pos + val.length);
- copyAndShift(val, BOOLEAN_ARR_OFF, val.length);
+ copyAndShift(val, GridUnsafe.BOOLEAN_ARR_OFF, val.length);
}
/** {@inheritDoc} */
@Override public void writeShort(short val) {
ensureCapacity(pos + 2);
- if (!LITTLE_ENDIAN)
- val = Short.reverseBytes(val);
-
writeShortFast(val);
shift(2);
@@ -69,23 +70,21 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, SHORT_ARR_OFF, cnt);
- else {
- for (short item : val)
- writeShortFast(Short.reverseBytes(item));
+ if (BIG_ENDIAN) {
+ for (short item : val) {
+ writeShortFast(item);
- shift(cnt);
+ shift(2);
+ }
}
+ else
+ copyAndShift(val, GridUnsafe.SHORT_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@Override public void writeChar(char val) {
ensureCapacity(pos + 2);
- if (!LITTLE_ENDIAN)
- val = Character.reverseBytes(val);
-
writeCharFast(val);
shift(2);
@@ -97,23 +96,21 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, CHAR_ARR_OFF, cnt);
- else {
- for (char item : val)
- writeCharFast(Character.reverseBytes(item));
+ if (BIG_ENDIAN) {
+ for (char item : val) {
+ writeCharFast(item);
- shift(cnt);
+ shift(2);
+ }
}
+ else
+ copyAndShift(val, GridUnsafe.CHAR_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@Override public void writeInt(int val) {
ensureCapacity(pos + 4);
- if (!LITTLE_ENDIAN)
- val = Integer.reverseBytes(val);
-
writeIntFast(val);
shift(4);
@@ -139,14 +136,15 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, INT_ARR_OFF, cnt);
- else {
- for (int item : val)
- writeIntFast(Integer.reverseBytes(item));
+ if (BIG_ENDIAN) {
+ for (int item : val) {
+ writeIntFast(item);
- shift(cnt);
+ shift(4);
+ }
}
+ else
+ copyAndShift(val, GridUnsafe.INT_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@@ -160,24 +158,21 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, FLOAT_ARR_OFF, cnt);
- else {
+ if (BIG_ENDIAN) {
for (float item : val) {
- writeIntFast(Integer.reverseBytes(Float.floatToIntBits(item)));
+ writeIntFast(Float.floatToIntBits(item));
shift(4);
}
}
+ else
+ copyAndShift(val, GridUnsafe.FLOAT_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@Override public void writeLong(long val) {
ensureCapacity(pos + 8);
- if (!LITTLE_ENDIAN)
- val = Long.reverseBytes(val);
-
writeLongFast(val);
shift(8);
@@ -189,14 +184,15 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, LONG_ARR_OFF, cnt);
- else {
- for (long item : val)
- writeLongFast(Long.reverseBytes(item));
+ if (BIG_ENDIAN) {
+ for (long item : val) {
+ writeLongFast(item);
- shift(cnt);
+ shift(8);
+ }
}
+ else
+ copyAndShift(val, GridUnsafe.LONG_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@@ -210,22 +206,22 @@ public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
ensureCapacity(pos + cnt);
- if (LITTLE_ENDIAN)
- copyAndShift(val, DOUBLE_ARR_OFF, cnt);
- else {
+ if (BIG_ENDIAN) {
for (double item : val) {
- writeLongFast(Long.reverseBytes(Double.doubleToLongBits(item)));
+ writeLongFast(Double.doubleToLongBits(item));
shift(8);
}
}
+ else
+ copyAndShift(val, GridUnsafe.DOUBLE_ARR_OFF, cnt);
}
/** {@inheritDoc} */
@Override public void write(byte[] arr, int off, int len) {
ensureCapacity(pos + len);
- copyAndShift(arr, BYTE_ARR_OFF + off, len);
+ copyAndShift(arr, GridUnsafe.BYTE_ARR_OFF + off, len);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
index 1e8ce09..2983cbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
@@ -17,10 +17,6 @@
package org.apache.ignite.internal.binary.streams;
-import java.nio.ByteOrder;
-import org.apache.ignite.internal.util.GridUnsafe;
-import sun.misc.Unsafe;
-
/**
* Binary abstract stream.
*/
@@ -31,36 +27,6 @@ public abstract class BinaryAbstractStream implements BinaryStream {
/** Byte: one. */
protected static final byte BYTE_ONE = 1;
- /** Whether little endian is used on the platform. */
- protected static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
-
- /** Unsafe instance. */
- protected static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** Array offset: boolean. */
- protected static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
-
- /** Array offset: byte. */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** Array offset: short. */
- protected static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
-
- /** Array offset: char. */
- protected static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
-
- /** Array offset: int. */
- protected static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
-
- /** Array offset: float. */
- protected static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
-
- /** Array offset: long. */
- protected static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
-
- /** Array offset: double. */
- protected static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
-
/** Position. */
protected int pos;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
index 732b8c7..b584373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
@@ -18,9 +18,12 @@
package org.apache.ignite.internal.binary.streams;
import java.util.Arrays;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
/**
- * Binary off-heap input stream.
+ * Binary heap input stream.
*/
public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
/**
@@ -75,7 +78,7 @@ public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
if (data.length < len) {
byte[] data0 = new byte[len];
- UNSAFE.copyMemory(data, BYTE_ARR_OFF, data0, BYTE_ARR_OFF, data.length);
+ GridUnsafe.copyMemory(data, GridUnsafe.BYTE_ARR_OFF, data0, GridUnsafe.BYTE_ARR_OFF, data.length);
data = data0;
}
@@ -97,7 +100,7 @@ public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
@Override public byte[] arrayCopy() {
byte[] res = new byte[len];
- UNSAFE.copyMemory(data, BYTE_ARR_OFF, res, BYTE_ARR_OFF, res.length);
+ GridUnsafe.copyMemory(data, GridUnsafe.BYTE_ARR_OFF, res, GridUnsafe.BYTE_ARR_OFF, res.length);
return res;
}
@@ -114,53 +117,57 @@ public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
/** {@inheritDoc} */
@Override protected void copyAndShift(Object target, long off, int len) {
- UNSAFE.copyMemory(data, BYTE_ARR_OFF + pos, target, off, len);
+ GridUnsafe.copyMemory(data, GridUnsafe.BYTE_ARR_OFF + pos, target, off, len);
shift(len);
}
/** {@inheritDoc} */
@Override protected short readShortFast() {
- return UNSAFE.getShort(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(data, off) : GridUnsafe.getShort(data, off);
+
}
/** {@inheritDoc} */
@Override protected char readCharFast() {
- return UNSAFE.getChar(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getCharLE(data, off) : GridUnsafe.getChar(data, off);
}
/** {@inheritDoc} */
@Override protected int readIntFast() {
- return UNSAFE.getInt(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(data, off) : GridUnsafe.getInt(data, off);
}
/** {@inheritDoc} */
@Override protected long readLongFast() {
- return UNSAFE.getLong(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getLongLE(data, off) : GridUnsafe.getLong(data, off);
}
/** {@inheritDoc} */
@Override protected byte readBytePositioned0(int pos) {
- return UNSAFE.getByte(data, BYTE_ARR_OFF + pos);
+ return GridUnsafe.getByte(data, GridUnsafe.BYTE_ARR_OFF + pos);
}
/** {@inheritDoc} */
@Override protected short readShortPositioned0(int pos) {
- short res = UNSAFE.getShort(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- if (!LITTLE_ENDIAN)
- res = Short.reverseBytes(res);
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(data, off) : GridUnsafe.getShort(data, off);
- return res;
}
/** {@inheritDoc} */
@Override protected int readIntPositioned0(int pos) {
- int res = UNSAFE.getInt(data, BYTE_ARR_OFF + pos);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- if (!LITTLE_ENDIAN)
- res = Integer.reverseBytes(res);
-
- return res;
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(data, off) : GridUnsafe.getInt(data, off);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
index 7553f3b..2c31641 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
@@ -17,6 +17,10 @@
package org.apache.ignite.internal.binary.streams;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+
/**
* Binary heap output stream.
*/
@@ -71,7 +75,7 @@ public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
@Override public byte[] arrayCopy() {
byte[] res = new byte[pos];
- UNSAFE.copyMemory(data, BYTE_ARR_OFF, res, BYTE_ARR_OFF, pos);
+ GridUnsafe.copyMemory(data, GridUnsafe.BYTE_ARR_OFF, res, GridUnsafe.BYTE_ARR_OFF, pos);
return res;
}
@@ -88,88 +92,120 @@ public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
/** {@inheritDoc} */
@Override protected void copyAndShift(Object src, long off, int len) {
- UNSAFE.copyMemory(src, off, data, BYTE_ARR_OFF + pos, len);
+ GridUnsafe.copyMemory(src, off, data, GridUnsafe.BYTE_ARR_OFF + pos, len);
shift(len);
}
/** {@inheritDoc} */
@Override protected void writeShortFast(short val) {
- UNSAFE.putShort(data, BYTE_ARR_OFF + pos, val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(data, off, val);
+ else
+ GridUnsafe.putShort(data, off, val);
}
/** {@inheritDoc} */
@Override protected void writeCharFast(char val) {
- UNSAFE.putChar(data, BYTE_ARR_OFF + pos, val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(data, off, val);
+ else
+ GridUnsafe.putChar(data, off, val);
}
/** {@inheritDoc} */
@Override protected void writeIntFast(int val) {
- UNSAFE.putInt(data, BYTE_ARR_OFF + pos, val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(data, off, val);
+ else
+ GridUnsafe.putInt(data, off, val);
}
/** {@inheritDoc} */
@Override protected void writeLongFast(long val) {
- UNSAFE.putLong(data, BYTE_ARR_OFF + pos, val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(data, off, val);
+ else
+ GridUnsafe.putLong(data, off, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteByte(byte val) {
- UNSAFE.putByte(data, BYTE_ARR_OFF + pos++, val);
+ GridUnsafe.putByte(data, GridUnsafe.BYTE_ARR_OFF + pos++, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteShort(short val) {
- if (!LITTLE_ENDIAN)
- val = Short.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putShort(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(data, off, val);
+ else
+ GridUnsafe.putShort(data, off, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteShort(int pos, short val) {
- if (!LITTLE_ENDIAN)
- val = Short.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putShort(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(data, off, val);
+ else
+ GridUnsafe.putShort(data, off, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteChar(char val) {
- if (!LITTLE_ENDIAN)
- val = Character.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putChar(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(data, off, val);
+ else
+ GridUnsafe.putChar(data, off, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int val) {
- if (!LITTLE_ENDIAN)
- val = Integer.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putInt(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(data, off, val);
+ else
+ GridUnsafe.putInt(data, off, val);
shift(4);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int pos, int val) {
- if (!LITTLE_ENDIAN)
- val = Integer.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putInt(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(data, off, val);
+ else
+ GridUnsafe.putInt(data, off, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteLong(long val) {
- if (!LITTLE_ENDIAN)
- val = Long.reverseBytes(val);
+ long off = GridUnsafe.BYTE_ARR_OFF + pos;
- UNSAFE.putLong(data, BYTE_ARR_OFF + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(data, off, val);
+ else
+ GridUnsafe.putLong(data, off, val);
shift(8);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocatorChunk.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocatorChunk.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocatorChunk.java
index 7c73742..f9db7da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocatorChunk.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocatorChunk.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.binary.streams;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
@@ -27,12 +26,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RE
* Memory allocator chunk.
*/
public class BinaryMemoryAllocatorChunk {
- /** Unsafe instance. */
- protected static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** Array offset: byte. */
- protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
/** Buffer size re-check frequency. */
private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000);
@@ -79,7 +72,7 @@ public class BinaryMemoryAllocatorChunk {
if (this.data == data)
this.data = newData;
- UNSAFE.copyMemory(data, BYTE_ARR_OFF, newData, BYTE_ARR_OFF, data.length);
+ GridUnsafe.copyMemory(data, GridUnsafe.BYTE_ARR_OFF, newData, GridUnsafe.BYTE_ARR_OFF, data.length);
return newData;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
index cff002f..9230846 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
@@ -17,6 +17,10 @@
package org.apache.ignite.internal.binary.streams;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+
/**
* Binary off-heap input stream.
*/
@@ -70,7 +74,7 @@ public class BinaryOffheapInputStream extends BinaryAbstractInputStream {
@Override public byte[] arrayCopy() {
byte[] res = new byte[len];
- UNSAFE.copyMemory(null, ptr, res, BYTE_ARR_OFF, res.length);
+ GridUnsafe.copyMemory(null, ptr, res, GridUnsafe.BYTE_ARR_OFF, res.length);
return res;
}
@@ -82,59 +86,61 @@ public class BinaryOffheapInputStream extends BinaryAbstractInputStream {
/** {@inheritDoc} */
@Override protected byte readByteAndShift() {
- return UNSAFE.getByte(ptr + pos++);
+ return GridUnsafe.getByte(ptr + pos++);
}
/** {@inheritDoc} */
@Override protected void copyAndShift(Object target, long off, int len) {
- UNSAFE.copyMemory(null, ptr + pos, target, off, len);
+ GridUnsafe.copyMemory(null, ptr + pos, target, off, len);
shift(len);
}
/** {@inheritDoc} */
@Override protected short readShortFast() {
- return UNSAFE.getShort(ptr + pos);
+ long addr = ptr + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(addr) : GridUnsafe.getShort(addr);
}
/** {@inheritDoc} */
@Override protected char readCharFast() {
- return UNSAFE.getChar(ptr + pos);
+ long addr = ptr + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getCharLE(addr) : GridUnsafe.getChar(addr);
}
/** {@inheritDoc} */
@Override protected int readIntFast() {
- return UNSAFE.getInt(ptr + pos);
+ long addr = ptr + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(addr) : GridUnsafe.getInt(addr);
}
/** {@inheritDoc} */
@Override protected long readLongFast() {
- return UNSAFE.getLong(ptr + pos);
+ long addr = ptr + pos;
+
+ return BIG_ENDIAN ? GridUnsafe.getLongLE(addr) : GridUnsafe.getLong(addr);
}
/** {@inheritDoc} */
@Override protected byte readBytePositioned0(int pos) {
- return UNSAFE.getByte(ptr + pos);
+ return GridUnsafe.getByte(ptr + pos);
}
/** {@inheritDoc} */
@Override protected short readShortPositioned0(int pos) {
- short res = UNSAFE.getShort(ptr + pos);
-
- if (!LITTLE_ENDIAN)
- res = Short.reverseBytes(res);
+ long addr = ptr + pos;
- return res;
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(addr) : GridUnsafe.getShort(addr);
}
/** {@inheritDoc} */
@Override protected int readIntPositioned0(int pos) {
- int res = UNSAFE.getInt(ptr + pos);
+ long addr = ptr + pos;
- if (!LITTLE_ENDIAN)
- res = Integer.reverseBytes(res);
-
- return res;
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(addr) : GridUnsafe.getInt(addr);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
index 080a357..1cb9f4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
@@ -17,6 +17,10 @@
package org.apache.ignite.internal.binary.streams;
+import org.apache.ignite.internal.util.GridUnsafe;
+
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+
/**
* Binary offheap output stream.
*/
@@ -73,7 +77,7 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
@Override public byte[] arrayCopy() {
byte[] res = new byte[pos];
- UNSAFE.copyMemory(null, ptr, res, BYTE_ARR_OFF, pos);
+ GridUnsafe.copyMemory(null, ptr, res, GridUnsafe.BYTE_ARR_OFF, pos);
return res;
}
@@ -94,34 +98,54 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
/** {@inheritDoc} */
@Override protected void writeByteAndShift(byte val) {
- UNSAFE.putByte(ptr + pos++, val);
+ GridUnsafe.putByte(ptr + pos++, val);
}
/** {@inheritDoc} */
@Override protected void copyAndShift(Object src, long offset, int len) {
- UNSAFE.copyMemory(src, offset, null, ptr + pos, len);
+ GridUnsafe.copyMemory(src, offset, null, ptr + pos, len);
shift(len);
}
/** {@inheritDoc} */
@Override protected void writeShortFast(short val) {
- UNSAFE.putShort(ptr + pos, val);
+ long addr = ptr + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(addr, val);
+ else
+ GridUnsafe.putShort(addr, val);
}
/** {@inheritDoc} */
@Override protected void writeCharFast(char val) {
- UNSAFE.putChar(ptr + pos, val);
+ long addr = ptr + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(addr, val);
+ else
+ GridUnsafe.putChar(addr, val);
}
/** {@inheritDoc} */
@Override protected void writeIntFast(int val) {
- UNSAFE.putInt(ptr + pos, val);
+ long addr = ptr + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(addr, val);
+ else
+ GridUnsafe.putInt(addr, val);
}
/** {@inheritDoc} */
@Override protected void writeLongFast(long val) {
- UNSAFE.putLong(ptr + pos, val);
+ long addr = ptr + pos;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(addr, val);
+ else
+ GridUnsafe.putLong(addr, val);
}
/** {@inheritDoc} */
@@ -131,61 +155,73 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
/** {@inheritDoc} */
@Override public void unsafeWriteByte(byte val) {
- UNSAFE.putByte(ptr + pos++, val);
+ GridUnsafe.putByte(ptr + pos++, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteShort(short val) {
- if (!LITTLE_ENDIAN)
- val = Short.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putShort(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(addr, val);
+ else
+ GridUnsafe.putShort(addr, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteShort(int pos, short val) {
- if (!LITTLE_ENDIAN)
- val = Short.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putShort(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(addr, val);
+ else
+ GridUnsafe.putShort(addr, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteChar(char val) {
- if (!LITTLE_ENDIAN)
- val = Character.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putChar(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(addr, val);
+ else
+ GridUnsafe.putChar(addr, val);
shift(2);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int val) {
- if (!LITTLE_ENDIAN)
- val = Integer.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putInt(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(addr, val);
+ else
+ GridUnsafe.putInt(addr, val);
shift(4);
}
/** {@inheritDoc} */
@Override public void unsafeWriteInt(int pos, int val) {
- if (!LITTLE_ENDIAN)
- val = Integer.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putInt(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(addr, val);
+ else
+ GridUnsafe.putInt(addr, val);
}
/** {@inheritDoc} */
@Override public void unsafeWriteLong(long val) {
- if (!LITTLE_ENDIAN)
- val = Long.reverseBytes(val);
+ long addr = ptr + pos;
- UNSAFE.putLong(ptr + pos, val);
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(addr, val);
+ else
+ GridUnsafe.putLong(addr, val);
shift(8);
}
@@ -197,7 +233,7 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
* @return Pointer.
*/
protected long allocate(int cap) {
- return UNSAFE.allocateMemory(cap);
+ return GridUnsafe.allocateMemory(cap);
}
/**
@@ -208,7 +244,7 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
* @return New pointer.
*/
protected long reallocate(long ptr, int cap) {
- return UNSAFE.reallocateMemory(ptr, cap);
+ return GridUnsafe.reallocateMemory(ptr, cap);
}
/**
@@ -217,6 +253,6 @@ public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
* @param ptr Pointer.
*/
protected void release(long ptr) {
- UNSAFE.freeMemory(ptr);
+ GridUnsafe.freeMemory(ptr);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index 10bc7e2..b567a03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -26,8 +26,8 @@ import org.apache.ignite.internal.direct.state.DirectMessageState;
import org.apache.ignite.internal.direct.state.DirectMessageStateItem;
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1;
-import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.Message;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index b265c6c..be17113 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -26,9 +26,9 @@ import org.apache.ignite.internal.direct.state.DirectMessageState;
import org.apache.ignite.internal.direct.state.DirectMessageStateItem;
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1;
-import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.Message;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
index 67fa9e7..2187945 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
@@ -37,7 +37,6 @@ import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemTy
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-import sun.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
/**
@@ -45,33 +44,6 @@ import sun.nio.ch.DirectBuffer;
*/
public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
- /** */
- private static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
- private static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
-
- /** */
- private static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
-
- /** */
- private static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
-
- /** */
- private static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
-
- /** */
- private static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
-
- /** */
- private static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
-
- /** */
- private static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
-
- /** */
private static final byte[] BYTE_ARR_EMPTY = new byte[0];
/** */
@@ -303,7 +275,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
this.buf = buf;
heapArr = buf.isDirect() ? null : buf.array();
- baseOff = buf.isDirect() ? ((DirectBuffer)buf).address() : BYTE_ARR_OFF;
+ baseOff = buf.isDirect() ? ((DirectBuffer)buf).address() : GridUnsafe.BYTE_ARR_OFF;
}
}
@@ -324,7 +296,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putByte(heapArr, baseOff + pos, val);
+ GridUnsafe.putByte(heapArr, baseOff + pos, val);
buf.position(pos + 1);
}
@@ -337,7 +309,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putShort(heapArr, baseOff + pos, val);
+ GridUnsafe.putShort(heapArr, baseOff + pos, val);
buf.position(pos + 2);
}
@@ -350,7 +322,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putInt(heapArr, baseOff + pos, val);
+ GridUnsafe.putInt(heapArr, baseOff + pos, val);
buf.position(pos + 4);
}
@@ -363,7 +335,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putLong(heapArr, baseOff + pos, val);
+ GridUnsafe.putLong(heapArr, baseOff + pos, val);
buf.position(pos + 8);
}
@@ -378,7 +350,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putFloat(heapArr, baseOff + pos, val);
+ GridUnsafe.putFloat(heapArr, baseOff + pos, val);
buf.position(pos + 4);
}
@@ -391,7 +363,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putDouble(heapArr, baseOff + pos, val);
+ GridUnsafe.putDouble(heapArr, baseOff + pos, val);
buf.position(pos + 8);
}
@@ -404,7 +376,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putChar(heapArr, baseOff + pos, val);
+ GridUnsafe.putChar(heapArr, baseOff + pos, val);
buf.position(pos + 2);
}
@@ -417,7 +389,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
if (lastFinished) {
int pos = buf.position();
- UNSAFE.putBoolean(heapArr, baseOff + pos, val);
+ GridUnsafe.putBoolean(heapArr, baseOff + pos, val);
buf.position(pos + 1);
}
@@ -426,7 +398,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeByteArray(byte[] val) {
if (val != null)
- lastFinished = writeArray(val, BYTE_ARR_OFF, val.length, val.length);
+ lastFinished = writeArray(val, GridUnsafe.BYTE_ARR_OFF, val.length, val.length);
else
writeInt(-1);
}
@@ -434,7 +406,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeByteArray(byte[] val, long off, int len) {
if (val != null)
- lastFinished = writeArray(val, BYTE_ARR_OFF + off, len, len);
+ lastFinished = writeArray(val, GridUnsafe.BYTE_ARR_OFF + off, len, len);
else
writeInt(-1);
}
@@ -442,7 +414,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeShortArray(short[] val) {
if (val != null)
- lastFinished = writeArray(val, SHORT_ARR_OFF, val.length, val.length << 1);
+ lastFinished = writeArray(val, GridUnsafe.SHORT_ARR_OFF, val.length, val.length << 1);
else
writeInt(-1);
}
@@ -450,7 +422,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeIntArray(int[] val) {
if (val != null)
- lastFinished = writeArray(val, INT_ARR_OFF, val.length, val.length << 2);
+ lastFinished = writeArray(val, GridUnsafe.INT_ARR_OFF, val.length, val.length << 2);
else
writeInt(-1);
}
@@ -458,7 +430,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeLongArray(long[] val) {
if (val != null)
- lastFinished = writeArray(val, LONG_ARR_OFF, val.length, val.length << 3);
+ lastFinished = writeArray(val, GridUnsafe.LONG_ARR_OFF, val.length, val.length << 3);
else
writeInt(-1);
}
@@ -466,7 +438,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeFloatArray(float[] val) {
if (val != null)
- lastFinished = writeArray(val, FLOAT_ARR_OFF, val.length, val.length << 2);
+ lastFinished = writeArray(val, GridUnsafe.FLOAT_ARR_OFF, val.length, val.length << 2);
else
writeInt(-1);
}
@@ -474,7 +446,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeDoubleArray(double[] val) {
if (val != null)
- lastFinished = writeArray(val, DOUBLE_ARR_OFF, val.length, val.length << 3);
+ lastFinished = writeArray(val, GridUnsafe.DOUBLE_ARR_OFF, val.length, val.length << 3);
else
writeInt(-1);
}
@@ -482,7 +454,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeCharArray(char[] val) {
if (val != null)
- lastFinished = writeArray(val, CHAR_ARR_OFF, val.length, val.length << 1);
+ lastFinished = writeArray(val, GridUnsafe.CHAR_ARR_OFF, val.length, val.length << 1);
else
writeInt(-1);
}
@@ -490,7 +462,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public void writeBooleanArray(boolean[] val) {
if (val != null)
- lastFinished = writeArray(val, BOOLEAN_ARR_OFF, val.length, val.length);
+ lastFinished = writeArray(val, GridUnsafe.BOOLEAN_ARR_OFF, val.length, val.length);
else
writeInt(-1);
}
@@ -653,7 +625,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 1);
- return UNSAFE.getByte(heapArr, baseOff + pos);
+ return GridUnsafe.getByte(heapArr, baseOff + pos);
}
else
return 0;
@@ -668,7 +640,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 2);
- return UNSAFE.getShort(heapArr, baseOff + pos);
+ return GridUnsafe.getShort(heapArr, baseOff + pos);
}
else
return 0;
@@ -683,7 +655,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 4);
- return UNSAFE.getInt(heapArr, baseOff + pos);
+ return GridUnsafe.getInt(heapArr, baseOff + pos);
}
else
return 0;
@@ -698,7 +670,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 8);
- return UNSAFE.getLong(heapArr, baseOff + pos);
+ return GridUnsafe.getLong(heapArr, baseOff + pos);
}
else
return 0;
@@ -713,7 +685,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 4);
- return UNSAFE.getFloat(heapArr, baseOff + pos);
+ return GridUnsafe.getFloat(heapArr, baseOff + pos);
}
else
return 0;
@@ -728,7 +700,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 8);
- return UNSAFE.getDouble(heapArr, baseOff + pos);
+ return GridUnsafe.getDouble(heapArr, baseOff + pos);
}
else
return 0;
@@ -743,7 +715,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 2);
- return UNSAFE.getChar(heapArr, baseOff + pos);
+ return GridUnsafe.getChar(heapArr, baseOff + pos);
}
else
return 0;
@@ -758,7 +730,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
buf.position(pos + 1);
- return UNSAFE.getBoolean(heapArr, baseOff + pos);
+ return GridUnsafe.getBoolean(heapArr, baseOff + pos);
}
else
return false;
@@ -766,42 +738,42 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/** {@inheritDoc} */
@Override public byte[] readByteArray() {
- return readArray(BYTE_ARR_CREATOR, 0, BYTE_ARR_OFF);
+ return readArray(BYTE_ARR_CREATOR, 0, GridUnsafe.BYTE_ARR_OFF);
}
/** {@inheritDoc} */
@Override public short[] readShortArray() {
- return readArray(SHORT_ARR_CREATOR, 1, SHORT_ARR_OFF);
+ return readArray(SHORT_ARR_CREATOR, 1, GridUnsafe.SHORT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public int[] readIntArray() {
- return readArray(INT_ARR_CREATOR, 2, INT_ARR_OFF);
+ return readArray(INT_ARR_CREATOR, 2, GridUnsafe.INT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public long[] readLongArray() {
- return readArray(LONG_ARR_CREATOR, 3, LONG_ARR_OFF);
+ return readArray(LONG_ARR_CREATOR, 3, GridUnsafe.LONG_ARR_OFF);
}
/** {@inheritDoc} */
@Override public float[] readFloatArray() {
- return readArray(FLOAT_ARR_CREATOR, 2, FLOAT_ARR_OFF);
+ return readArray(FLOAT_ARR_CREATOR, 2, GridUnsafe.FLOAT_ARR_OFF);
}
/** {@inheritDoc} */
@Override public double[] readDoubleArray() {
- return readArray(DOUBLE_ARR_CREATOR, 3, DOUBLE_ARR_OFF);
+ return readArray(DOUBLE_ARR_CREATOR, 3, GridUnsafe.DOUBLE_ARR_OFF);
}
/** {@inheritDoc} */
@Override public char[] readCharArray() {
- return readArray(CHAR_ARR_CREATOR, 1, CHAR_ARR_OFF);
+ return readArray(CHAR_ARR_CREATOR, 1, GridUnsafe.CHAR_ARR_OFF);
}
/** {@inheritDoc} */
@Override public boolean[] readBooleanArray() {
- return readArray(BOOLEAN_ARR_CREATOR, 0, BOOLEAN_ARR_OFF);
+ return readArray(BOOLEAN_ARR_CREATOR, 0, GridUnsafe.BOOLEAN_ARR_OFF);
}
/** {@inheritDoc} */
@@ -1037,7 +1009,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
int remaining = buf.remaining();
if (toWrite <= remaining) {
- UNSAFE.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, toWrite);
+ GridUnsafe.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, toWrite);
pos += toWrite;
@@ -1048,7 +1020,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
return true;
}
else {
- UNSAFE.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, remaining);
+ GridUnsafe.copyMemory(arr, off + arrOff, heapArr, baseOff + pos, remaining);
pos += remaining;
@@ -1103,7 +1075,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
lastFinished = toRead <= remaining;
if (lastFinished) {
- UNSAFE.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, toRead);
+ GridUnsafe.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, toRead);
buf.position(pos + toRead);
@@ -1116,7 +1088,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
return arr;
}
else {
- UNSAFE.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, remaining);
+ GridUnsafe.copyMemory(heapArr, baseOff + pos, tmpArr, off + tmpArrOff, remaining);
buf.position(pos + remaining);
@@ -1360,7 +1332,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
/**
* Array creator.
*/
- private static interface ArrayCreator<T> {
+ private interface ArrayCreator<T> {
/**
* @param len Array length or {@code -1} if array was not fully read.
* @return New array.
[3/8] ignite git commit: ignite-2080 Data alignment issues with Unsafe
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
index 2867b0a..1f7a53c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
@@ -18,15 +18,67 @@
package org.apache.ignite.internal.util;
import java.lang.reflect.Field;
+import java.nio.ByteOrder;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import sun.misc.Unsafe;
/**
- * Provides handle on Unsafe class from SUN which cannot be instantiated directly.
+ * <p>Wrapper for {@link sun.misc.Unsafe} class.</p>
+ *
+ * <p>
+ * The following statements for memory access operations are true:
+ * <ul>
+ * <li>All {@code putXxx(long addr, xxx val)}, {@code getXxx(long addr)}, {@code putXxx(byte[] arr, long off, xxx val)},
+ * {@code getXxx(byte[] arr, long off)} and corresponding methods with {@code LE} suffix are alignment aware
+ * and can be safely used with unaligned pointers.</li>
+ * <li>All {@code putXxxField(Object obj, long fieldOff, xxx val)} and {@code getXxxField(Object obj, long fieldOff)}
+ * methods are not alignment aware and can't be safely used with unaligned pointers. This methods can be safely used
+ * for object field values access because all object fields addresses are aligned.</li>
+ * <li>All {@code putXxxLE(...)} and {@code getXxxLE(...)} methods assumes that byte order is fixed as little-endian
+ * while native byte order is big-endian. So it is client code responsibility to check native byte order before
+ * invoking of this methods.</li>
+ * </ul>
+ * </p>
*/
-public class GridUnsafe {
+public abstract class GridUnsafe {
+ /** Unsafe. */
+ private static final Unsafe UNSAFE = unsafe();
+
+ /** Unaligned flag. */
+ private static final boolean UNALIGNED = unaligned();
+
+ /** Big endian. */
+ public static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+
+ /** Address size. */
+ public static final int ADDR_SIZE = UNSAFE.addressSize();
+
+ /** */
+ public static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
+
+ /** */
+ public static final long SHORT_ARR_OFF = UNSAFE.arrayBaseOffset(short[].class);
+
+ /** */
+ public static final long INT_ARR_OFF = UNSAFE.arrayBaseOffset(int[].class);
+
+ /** */
+ public static final long LONG_ARR_OFF = UNSAFE.arrayBaseOffset(long[].class);
+
+ /** */
+ public static final long FLOAT_ARR_OFF = UNSAFE.arrayBaseOffset(float[].class);
+
+ /** */
+ public static final long DOUBLE_ARR_OFF = UNSAFE.arrayBaseOffset(double[].class);
+
+ /** */
+ public static final long CHAR_ARR_OFF = UNSAFE.arrayBaseOffset(char[].class);
+
+ /** */
+ public static final long BOOLEAN_ARR_OFF = UNSAFE.arrayBaseOffset(boolean[].class);
+
/**
* Ensure singleton.
*/
@@ -35,9 +87,1130 @@ public class GridUnsafe {
}
/**
+ * Gets boolean value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Boolean value from object field.
+ */
+ public static boolean getBooleanField(Object obj, long fieldOff) {
+ return UNSAFE.getBoolean(obj, fieldOff);
+ }
+
+ /**
+ * Stores boolean value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putBooleanField(Object obj, long fieldOff, boolean val) {
+ UNSAFE.putBoolean(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets byte value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Byte value from object field.
+ */
+ public static byte getByteField(Object obj, long fieldOff) {
+ return UNSAFE.getByte(obj, fieldOff);
+ }
+
+ /**
+ * Stores byte value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putByteField(Object obj, long fieldOff, byte val) {
+ UNSAFE.putByte(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets short value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Short value from object field.
+ */
+ public static short getShortField(Object obj, long fieldOff) {
+ return UNSAFE.getShort(obj, fieldOff);
+ }
+
+ /**
+ * Stores short value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putShortField(Object obj, long fieldOff, short val) {
+ UNSAFE.putShort(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets char value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Char value from object field.
+ */
+ public static char getCharField(Object obj, long fieldOff) {
+ return UNSAFE.getChar(obj, fieldOff);
+ }
+
+ /**
+ * Stores char value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putCharField(Object obj, long fieldOff, char val) {
+ UNSAFE.putChar(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets integer value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Integer value from object field.
+ */
+ public static int getIntField(Object obj, long fieldOff) {
+ return UNSAFE.getInt(obj, fieldOff);
+ }
+
+ /**
+ * Stores integer value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putIntField(Object obj, long fieldOff, int val) {
+ UNSAFE.putInt(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets long value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Long value from object field.
+ */
+ public static long getLongField(Object obj, long fieldOff) {
+ return UNSAFE.getLong(obj, fieldOff);
+ }
+
+ /**
+ * Stores long value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putLongField(Object obj, long fieldOff, long val) {
+ UNSAFE.putLong(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets float value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Float value from object field.
+ */
+ public static float getFloatField(Object obj, long fieldOff) {
+ return UNSAFE.getFloat(obj, fieldOff);
+ }
+
+ /**
+ * Stores float value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putFloatField(Object obj, long fieldOff, float val) {
+ UNSAFE.putFloat(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets double value from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Double value from object field.
+ */
+ public static double getDoubleField(Object obj, long fieldOff) {
+ return UNSAFE.getDouble(obj, fieldOff);
+ }
+
+ /**
+ * Stores double value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putDoubleField(Object obj, long fieldOff, double val) {
+ UNSAFE.putDouble(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets reference from object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @return Reference from object field.
+ */
+ public static Object getObjectField(Object obj, long fieldOff) {
+ return UNSAFE.getObject(obj, fieldOff);
+ }
+
+ /**
+ * Stores reference value into object field.
+ *
+ * @param obj Object.
+ * @param fieldOff Field offset.
+ * @param val Value.
+ */
+ public static void putObjectField(Object obj, long fieldOff, Object val) {
+ UNSAFE.putObject(obj, fieldOff, val);
+ }
+
+ /**
+ * Gets boolean value from byte array.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Boolean value from byte array.
+ */
+ public static boolean getBoolean(byte[] arr, long off) {
+ return UNSAFE.getBoolean(arr, off);
+ }
+
+ /**
+ * Stores boolean value into byte array.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putBoolean(byte[] arr, long off, boolean val) {
+ UNSAFE.putBoolean(arr, off, val);
+ }
+
+ /**
+ * Gets byte value from byte array.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Byte value from byte array.
+ */
+ public static byte getByte(byte[] arr, long off) {
+ return UNSAFE.getByte(arr, off);
+ }
+
+ /**
+ * Stores byte value into byte array.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putByte(byte[] arr, long off, byte val) {
+ UNSAFE.putByte(arr, off, val);
+ }
+
+ /**
+ * Gets short value from byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Short value from byte array.
+ */
+ public static short getShort(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getShort(arr, off) : getShortByByte(arr, off, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores short value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putShort(byte[] arr, long off, short val) {
+ if (UNALIGNED)
+ UNSAFE.putShort(arr, off, val);
+ else
+ putShortByByte(arr, off, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets char value from byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Char value from byte array.
+ */
+ public static char getChar(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getChar(arr, off) : getCharByByte(arr, off, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores char value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putChar(byte[] arr, long off, char val) {
+ if (UNALIGNED)
+ UNSAFE.putChar(arr, off, val);
+ else
+ putCharByByte(arr, off, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets integer value from byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Integer value from byte array.
+ */
+ public static int getInt(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getInt(arr, off) : getIntByByte(arr, off, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores integer value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putInt(byte[] arr, long off, int val) {
+ if (UNALIGNED)
+ UNSAFE.putInt(arr, off, val);
+ else
+ putIntByByte(arr, off, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets long value from byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Long value from byte array.
+ */
+ public static long getLong(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getLong(arr, off) : getLongByByte(arr, off, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores long value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putLong(byte[] arr, long off, long val) {
+ if (UNALIGNED)
+ UNSAFE.putLong(arr, off, val);
+ else
+ putLongByByte(arr, off, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets float value from byte array. Alignment aware.
+ *
+ * @param arr Object.
+ * @param off Offset.
+ * @return Float value from byte array.
+ */
+ public static float getFloat(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getFloat(arr, off) : Float.intBitsToFloat(getIntByByte(arr, off, BIG_ENDIAN));
+ }
+
+ /**
+ * Stores float value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putFloat(byte[] arr, long off, float val) {
+ if (UNALIGNED)
+ UNSAFE.putFloat(arr, off, val);
+ else
+ putIntByByte(arr, off, Float.floatToIntBits(val), BIG_ENDIAN);
+ }
+
+ /**
+ * Gets double value from byte array. Alignment aware.
+ *
+ * @param arr byte array.
+ * @param off Offset.
+ * @return Double value from byte array. Alignment aware.
+ */
+ public static double getDouble(byte[] arr, long off) {
+ return UNALIGNED ? UNSAFE.getDouble(arr, off) : Double.longBitsToDouble(getLongByByte(arr, off, BIG_ENDIAN));
+ }
+
+ /**
+ * Stores double value into byte array. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putDouble(byte[] arr, long off, double val) {
+ if (UNALIGNED)
+ UNSAFE.putDouble(arr, off, val);
+ else
+ putLongByByte(arr, off, Double.doubleToLongBits(val), BIG_ENDIAN);
+ }
+
+ /**
+ * Gets short value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Short value from byte array.
+ */
+ public static short getShortLE(byte[] arr, long off) {
+ return UNALIGNED ? Short.reverseBytes(UNSAFE.getShort(arr, off)) : getShortByByte(arr, off, false);
+ }
+
+ /**
+ * Stores short value into byte array assuming that value should be stored in little-endian byte order and native
+ * byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putShortLE(byte[] arr, long off, short val) {
+ if (UNALIGNED)
+ UNSAFE.putShort(arr, off, Short.reverseBytes(val));
+ else
+ putShortByByte(arr, off, val, false);
+ }
+
+ /**
+ * Gets char value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Char value from byte array.
+ */
+ public static char getCharLE(byte[] arr, long off) {
+ return UNALIGNED ? Character.reverseBytes(UNSAFE.getChar(arr, off)) : getCharByByte(arr, off, false);
+ }
+
+ /**
+ * Stores char value into byte array assuming that value should be stored in little-endian byte order and native
+ * byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putCharLE(byte[] arr, long off, char val) {
+ if (UNALIGNED)
+ UNSAFE.putChar(arr, off, Character.reverseBytes(val));
+ else
+ putCharByByte(arr, off, val, false);
+ }
+
+ /**
+ * Gets integer value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Integer value from byte array.
+ */
+ public static int getIntLE(byte[] arr, long off) {
+ return UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(arr, off)) : getIntByByte(arr, off, false);
+ }
+
+ /**
+ * Stores integer value into byte array assuming that value should be stored in little-endian byte order and
+ * native byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putIntLE(byte[] arr, long off, int val) {
+ if (UNALIGNED)
+ UNSAFE.putInt(arr, off, Integer.reverseBytes(val));
+ else
+ putIntByByte(arr, off, val, false);
+ }
+
+ /**
+ * Gets long value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Long value from byte array.
+ */
+ public static long getLongLE(byte[] arr, long off) {
+ return UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(arr, off)) : getLongByByte(arr, off, false);
+ }
+
+ /**
+ * Stores long value into byte array assuming that value should be stored in little-endian byte order and native
+ * byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putLongLE(byte[] arr, long off, long val) {
+ if (UNALIGNED)
+ UNSAFE.putLong(arr, off, Long.reverseBytes(val));
+ else
+ putLongByByte(arr, off, val, false);
+ }
+
+ /**
+ * Gets float value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Float value from byte array.
+ */
+ public static float getFloatLE(byte[] arr, long off) {
+ return Float.intBitsToFloat(
+ UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(arr, off)) : getIntByByte(arr, off, false)
+ );
+ }
+
+ /**
+ * Stores float value into byte array assuming that value should be stored in little-endian byte order and native
+ * byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putFloatLE(byte[] arr, long off, float val) {
+ int intVal = Float.floatToIntBits(val);
+
+ if (UNALIGNED)
+ UNSAFE.putInt(arr, off, Integer.reverseBytes(intVal));
+ else
+ putIntByByte(arr, off, intVal, false);
+ }
+
+ /**
+ * Gets double value from byte array assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @return Double value from byte array.
+ */
+ public static double getDoubleLE(byte[] arr, long off) {
+ return Double.longBitsToDouble(
+ UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(arr, off)) : getLongByByte(arr, off, false)
+ );
+ }
+
+ /**
+ * Stores double value into byte array assuming that value should be stored in little-endian byte order and
+ * native byte order is big-endian. Alignment aware.
+ *
+ * @param arr Byte array.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putDoubleLE(byte[] arr, long off, double val) {
+ long longVal = Double.doubleToLongBits(val);
+
+ if (UNALIGNED)
+ UNSAFE.putLong(arr, off, Long.reverseBytes(longVal));
+ else
+ putLongByByte(arr, off, longVal, false);
+ }
+
+ /**
+ * Gets byte value from given address.
+ *
+ * @param addr Address.
+ * @return Byte value from given address.
+ */
+ public static byte getByte(long addr) {
+ return UNSAFE.getByte(addr);
+ }
+
+ /**
+ * Stores given byte value.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putByte(long addr, byte val) {
+ UNSAFE.putByte(addr, val);
+ }
+
+ /**
+ * Gets short value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Short value from given address.
+ */
+ public static short getShort(long addr) {
+ return UNALIGNED ? UNSAFE.getShort(addr) : getShortByByte(addr, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores given short value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putShort(long addr, short val) {
+ if (UNALIGNED)
+ UNSAFE.putShort(addr, val);
+ else
+ putShortByByte(addr, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets char value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Char value from given address.
+ */
+ public static char getChar(long addr) {
+ return UNALIGNED ? UNSAFE.getChar(addr) : getCharByByte(addr, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores given char value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putChar(long addr, char val) {
+ if (UNALIGNED)
+ UNSAFE.putChar(addr, val);
+ else
+ putCharByByte(addr, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets integer value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Integer value from given address.
+ */
+ public static int getInt(long addr) {
+ return UNALIGNED ? UNSAFE.getInt(addr) : getIntByByte(addr, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores given integer value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putInt(long addr, int val) {
+ if (UNALIGNED)
+ UNSAFE.putInt(addr, val);
+ else
+ putIntByByte(addr, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets long value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Long value from given address.
+ */
+ public static long getLong(long addr) {
+ return UNALIGNED ? UNSAFE.getLong(addr) : getLongByByte(addr, BIG_ENDIAN);
+ }
+
+ /**
+ * Stores given integer value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putLong(long addr, long val) {
+ if (UNALIGNED)
+ UNSAFE.putLong(addr, val);
+ else
+ putLongByByte(addr, val, BIG_ENDIAN);
+ }
+
+ /**
+ * Gets float value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Float value from given address.
+ */
+ public static float getFloat(long addr) {
+ return UNALIGNED ? UNSAFE.getFloat(addr) : Float.intBitsToFloat(getIntByByte(addr, BIG_ENDIAN));
+ }
+
+ /**
+ * Stores given float value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putFloat(long addr, float val) {
+ if (UNALIGNED)
+ UNSAFE.putFloat(addr, val);
+ else
+ putIntByByte(addr, Float.floatToIntBits(val), BIG_ENDIAN);
+ }
+
+ /**
+ * Gets double value from given address. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Double value from given address.
+ */
+ public static double getDouble(long addr) {
+ return UNALIGNED ? UNSAFE.getDouble(addr) : Double.longBitsToDouble(getLongByByte(addr, BIG_ENDIAN));
+ }
+
+ /**
+ * Stores given double value. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putDouble(long addr, double val) {
+ if (UNALIGNED)
+ UNSAFE.putDouble(addr, val);
+ else
+ putLongByByte(addr, Double.doubleToLongBits(val), BIG_ENDIAN);
+ }
+
+ /**
+ * Gets short value from given address assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Short value from given address.
+ */
+ public static short getShortLE(long addr) {
+ return UNALIGNED ? Short.reverseBytes(UNSAFE.getShort(addr)) : getShortByByte(addr, false);
+ }
+
+ /**
+ * Stores given short value assuming that value should be stored in little-endian byte order and native byte
+ * order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putShortLE(long addr, short val) {
+ if (UNALIGNED)
+ UNSAFE.putShort(addr, Short.reverseBytes(val));
+ else
+ putShortByByte(addr, val, false);
+ }
+
+ /**
+ * Gets char value from given address assuming that value stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Char value from given address.
+ */
+ public static char getCharLE(long addr) {
+ return UNALIGNED ? Character.reverseBytes(UNSAFE.getChar(addr)) : getCharByByte(addr, false);
+ }
+
+ /**
+ * Stores given char value assuming that value should be stored in little-endian byte order and native byte order
+ * is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putCharLE(long addr, char val) {
+ if (UNALIGNED)
+ UNSAFE.putChar(addr, Character.reverseBytes(val));
+ else
+ putCharByByte(addr, val, false);
+ }
+
+ /**
+ * Gets integer value from given address assuming that value stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Integer value from given address.
+ */
+ public static int getIntLE(long addr) {
+ return UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(addr)) : getIntByByte(addr, false);
+ }
+
+ /**
+ * Stores given integer value assuming that value should be stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putIntLE(long addr, int val) {
+ if (UNALIGNED)
+ UNSAFE.putInt(addr, Integer.reverseBytes(val));
+ else
+ putIntByByte(addr, val, false);
+ }
+
+ /**
+ * Gets long value from given address assuming that value stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Long value from given address.
+ */
+ public static long getLongLE(long addr) {
+ return UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(addr)) : getLongByByte(addr, false);
+ }
+
+ /**
+ * Stores given integer value assuming that value should be stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putLongLE(long addr, long val) {
+ if (UNALIGNED)
+ UNSAFE.putLong(addr, Long.reverseBytes(val));
+ else
+ putLongByByte(addr, val, false);
+ }
+
+ /**
+ * Gets float value from given address assuming that value stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Float value from given address.
+ */
+ public static float getFloatLE(long addr) {
+ return Float.intBitsToFloat(UNALIGNED ? Integer.reverseBytes(UNSAFE.getInt(addr)) : getIntByByte(addr, false));
+ }
+
+ /**
+ * Stores given float value assuming that value should be stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putFloatLE(long addr, float val) {
+ int intVal = Float.floatToIntBits(val);
+
+ if (UNALIGNED)
+ UNSAFE.putInt(addr, Integer.reverseBytes(intVal));
+ else
+ putIntByByte(addr, intVal, false);
+ }
+
+ /**
+ * Gets double value from given address assuming that value stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @return Double value from given address.
+ */
+ public static double getDoubleLE(long addr) {
+ return Double.longBitsToDouble(
+ UNALIGNED ? Long.reverseBytes(UNSAFE.getLong(addr)) : getLongByByte(addr, false)
+ );
+ }
+
+ /**
+ * Stores given double value assuming that value should be stored in little-endian byte order
+ * and native byte order is big-endian. Alignment aware.
+ *
+ * @param addr Address.
+ * @param val Value.
+ */
+ public static void putDoubleLE(long addr, double val) {
+ long longVal = Double.doubleToLongBits(val);
+
+ if (UNALIGNED)
+ UNSAFE.putLong(addr, Long.reverseBytes(longVal));
+ else
+ putLongByByte(addr, longVal, false);
+ }
+
+ /**
+ * Returns static field offset.
+ *
+ * @param field Field.
+ * @return Static field offset.
+ */
+ public static long staticFieldOffset(Field field) {
+ return UNSAFE.staticFieldOffset(field);
+ }
+
+ /**
+ * Returns object field offset.
+ *
+ * @param field Field.
+ * @return Object field offset.
+ */
+ public static long objectFieldOffset(Field field) {
+ return UNSAFE.objectFieldOffset(field);
+ }
+
+ /**
+ * Returns static field base.
+ *
+ * @param field Field.
+ * @return Static field base.
+ */
+ public static Object staticFieldBase(Field field) {
+ return UNSAFE.staticFieldBase(field);
+ }
+
+ /**
+ * Allocates memory.
+ *
+ * @param size Size.
+ * @return address.
+ */
+ public static long allocateMemory(long size) {
+ return UNSAFE.allocateMemory(size);
+ }
+
+ /**
+ * Reallocates memory.
+ *
+ * @param addr Address.
+ * @param len Length.
+ * @return address.
+ */
+ public static long reallocateMemory(long addr, long len) {
+ return UNSAFE.reallocateMemory(addr, len);
+ }
+
+ /**
+ * Fills memory with given value.
+ *
+ * @param addr Address.
+ * @param len Length.
+ * @param val Value.
+ */
+ public static void setMemory(long addr, long len, byte val) {
+ UNSAFE.setMemory(addr, len, val);
+ }
+
+ /**
+ * Copies memory.
+ *
+ * @param src Source.
+ * @param dst Dst.
+ * @param len Length.
+ */
+ public static void copyMemory(long src, long dst, long len) {
+ UNSAFE.copyMemory(src, dst, len);
+ }
+
+ /**
+ * Sets all bytes in a given block of memory to a copy of another block.
+ *
+ * @param srcBase Source base.
+ * @param srcOff Source offset.
+ * @param dstBase Dst base.
+ * @param dstOff Dst offset.
+ * @param len Length.
+ */
+ public static void copyMemory(Object srcBase, long srcOff, Object dstBase, long dstOff, long len) {
+ UNSAFE.copyMemory(srcBase, srcOff, dstBase, dstOff, len);
+ }
+
+ /**
+ * Frees memory.
+ *
+ * @param addr Address.
+ */
+ public static void freeMemory(long addr) {
+ UNSAFE.freeMemory(addr);
+ }
+
+ /**
+ * Returns the offset of the first element in the storage allocation of a given array class.
+ *
+ * @param cls Class.
+ * @return the offset of the first element in the storage allocation of a given array class.
+ */
+ public static int arrayBaseOffset(Class cls) {
+ return UNSAFE.arrayBaseOffset(cls);
+ }
+
+ /**
+ * Allocates instance of given class.
+ *
+ * @param cls Class.
+ * @return Allocated instance.
+ */
+ public static Object allocateInstance(Class cls) throws InstantiationException {
+ return UNSAFE.allocateInstance(cls);
+ }
+
+ /**
+ * Acquires monitor lock.
+ *
+ * @param obj Object.
+ */
+ public static void monitorEnter(Object obj) {
+ UNSAFE.monitorEnter(obj);
+ }
+
+ /**
+ * Releases monitor lock.
+ *
+ * @param obj Object.
+ */
+ public static void monitorExit(Object obj) {
+ UNSAFE.monitorExit(obj);
+ }
+
+ /**
+ * Integer CAS.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param exp Expected.
+ * @param upd Upd.
+ * @return {@code True} if operation completed successfully, {@code false} - otherwise.
+ */
+ public static boolean compareAndSwapInt(Object obj, long off, int exp, int upd) {
+ return UNSAFE.compareAndSwapInt(obj, off, exp, upd);
+ }
+
+ /**
+ * Long CAS.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param exp Expected.
+ * @param upd Upd.
+ * @return {@code True} if operation completed successfully, {@code false} - otherwise.
+ */
+ public static boolean compareAndSwapLong(Object obj, long off, long exp, long upd) {
+ return UNSAFE.compareAndSwapLong(obj, off, exp, upd);
+ }
+
+ /**
+ * Gets byte value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @return Byte value.
+ */
+ public static byte getByteVolatile(Object obj, long off) {
+ return UNSAFE.getByteVolatile(obj, off);
+ }
+
+ /**
+ * Stores byte value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putByteVolatile(Object obj, long off, byte val) {
+ UNSAFE.putByteVolatile(obj, off, val);
+ }
+
+ /**
+ * Gets integer value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @return Integer value.
+ */
+ public static int getIntVolatile(Object obj, long off) {
+ return UNSAFE.getIntVolatile(obj, off);
+ }
+
+ /**
+ * Stores integer value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putIntVolatile(Object obj, long off, int val) {
+ UNSAFE.putIntVolatile(obj, off, val);
+ }
+
+ /**
+ * Gets long value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @return Long value.
+ */
+ public static long getLongVolatile(Object obj, long off) {
+ return UNSAFE.getLongVolatile(obj, off);
+ }
+
+ /**
+ * Stores long value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putLongVolatile(Object obj, long off, long val) {
+ UNSAFE.putLongVolatile(obj, off, val);
+ }
+
+ /**
+ * Stores reference value with volatile semantic.
+ *
+ * @param obj Object.
+ * @param off Offset.
+ * @param val Value.
+ */
+ public static void putObjectVolatile(Object obj, long off, Object val) {
+ UNSAFE.putObjectVolatile(obj, off, val);
+ }
+
+ /**
+ * Returns unaligned flag.
+ */
+ private static boolean unaligned() {
+ String arch = System.getProperty("os.arch");
+
+ return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") || arch.equals("x86_64");
+ }
+
+ /**
* @return Instance of Unsafe class.
*/
- public static Unsafe unsafe() {
+ private static Unsafe unsafe() {
try {
return Unsafe.getUnsafe();
}
@@ -59,4 +1232,308 @@ public class GridUnsafe {
}
}
}
+
+ /**
+ * @param obj Object.
+ * @param off Offset.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static short getShortByByte(Object obj, long off, boolean bigEndian) {
+ if (bigEndian)
+ return (short)(UNSAFE.getByte(obj, off) << 8 | (UNSAFE.getByte(obj, off + 1) & 0xff));
+ else
+ return (short)(UNSAFE.getByte(obj, off + 1) << 8 | (UNSAFE.getByte(obj, off) & 0xff));
+ }
+
+ /**
+ * @param obj Object.
+ * @param off Offset.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putShortByByte(Object obj, long off, short val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(obj, off, (byte)(val >> 8));
+ UNSAFE.putByte(obj, off + 1, (byte)val);
+ }
+ else {
+ UNSAFE.putByte(obj, off + 1, (byte)(val >> 8));
+ UNSAFE.putByte(obj, off, (byte)val);
+ }
+ }
+
+ /**
+ * @param obj Object.
+ * @param off Offset.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static char getCharByByte(Object obj, long off, boolean bigEndian) {
+ if (bigEndian)
+ return (char)(UNSAFE.getByte(obj, off) << 8 | (UNSAFE.getByte(obj, off + 1) & 0xff));
+ else
+ return (char)(UNSAFE.getByte(obj, off + 1) << 8 | (UNSAFE.getByte(obj, off) & 0xff));
+ }
+
+ /**
+ * @param obj Object.
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putCharByByte(Object obj, long addr, char val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(obj, addr, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr + 1, (byte)val);
+ }
+ else {
+ UNSAFE.putByte(obj, addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr, (byte)val);
+ }
+ }
+
+ /**
+ * @param obj Object.
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static int getIntByByte(Object obj, long addr, boolean bigEndian) {
+ if (bigEndian) {
+ return (((int)UNSAFE.getByte(obj, addr)) << 24) |
+ (((int)UNSAFE.getByte(obj, addr + 1) & 0xff) << 16) |
+ (((int)UNSAFE.getByte(obj, addr + 2) & 0xff) << 8) |
+ (((int)UNSAFE.getByte(obj, addr + 3) & 0xff));
+ }
+ else {
+ return (((int)UNSAFE.getByte(obj, addr + 3)) << 24) |
+ (((int)UNSAFE.getByte(obj, addr + 2) & 0xff) << 16) |
+ (((int)UNSAFE.getByte(obj, addr + 1) & 0xff) << 8) |
+ (((int)UNSAFE.getByte(obj, addr) & 0xff));
+ }
+ }
+
+ /**
+ * @param obj Object.
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putIntByByte(Object obj, long addr, int val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(obj, addr, (byte)(val >> 24));
+ UNSAFE.putByte(obj, addr + 1, (byte)(val >> 16));
+ UNSAFE.putByte(obj, addr + 2, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr + 3, (byte)(val));
+ }
+ else {
+ UNSAFE.putByte(obj, addr + 3, (byte)(val >> 24));
+ UNSAFE.putByte(obj, addr + 2, (byte)(val >> 16));
+ UNSAFE.putByte(obj, addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr, (byte)(val));
+ }
+ }
+
+ /**
+ * @param obj Object.
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static long getLongByByte(Object obj, long addr, boolean bigEndian) {
+ if (bigEndian) {
+ return (((long)UNSAFE.getByte(obj, addr)) << 56) |
+ (((long)UNSAFE.getByte(obj, addr + 1) & 0xff) << 48) |
+ (((long)UNSAFE.getByte(obj, addr + 2) & 0xff) << 40) |
+ (((long)UNSAFE.getByte(obj, addr + 3) & 0xff) << 32) |
+ (((long)UNSAFE.getByte(obj, addr + 4) & 0xff) << 24) |
+ (((long)UNSAFE.getByte(obj, addr + 5) & 0xff) << 16) |
+ (((long)UNSAFE.getByte(obj, addr + 6) & 0xff) << 8) |
+ (((long)UNSAFE.getByte(obj, addr + 7) & 0xff));
+ }
+ else {
+ return (((long)UNSAFE.getByte(obj, addr + 7)) << 56) |
+ (((long)UNSAFE.getByte(obj, addr + 6) & 0xff) << 48) |
+ (((long)UNSAFE.getByte(obj, addr + 5) & 0xff) << 40) |
+ (((long)UNSAFE.getByte(obj, addr + 4) & 0xff) << 32) |
+ (((long)UNSAFE.getByte(obj, addr + 3) & 0xff) << 24) |
+ (((long)UNSAFE.getByte(obj, addr + 2) & 0xff) << 16) |
+ (((long)UNSAFE.getByte(obj, addr + 1) & 0xff) << 8) |
+ (((long)UNSAFE.getByte(obj, addr) & 0xff));
+ }
+ }
+
+ /**
+ * @param obj Object.
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putLongByByte(Object obj, long addr, long val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(obj, addr, (byte)(val >> 56));
+ UNSAFE.putByte(obj, addr + 1, (byte)(val >> 48));
+ UNSAFE.putByte(obj, addr + 2, (byte)(val >> 40));
+ UNSAFE.putByte(obj, addr + 3, (byte)(val >> 32));
+ UNSAFE.putByte(obj, addr + 4, (byte)(val >> 24));
+ UNSAFE.putByte(obj, addr + 5, (byte)(val >> 16));
+ UNSAFE.putByte(obj, addr + 6, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr + 7, (byte)(val));
+ }
+ else {
+ UNSAFE.putByte(obj, addr + 7, (byte)(val >> 56));
+ UNSAFE.putByte(obj, addr + 6, (byte)(val >> 48));
+ UNSAFE.putByte(obj, addr + 5, (byte)(val >> 40));
+ UNSAFE.putByte(obj, addr + 4, (byte)(val >> 32));
+ UNSAFE.putByte(obj, addr + 3, (byte)(val >> 24));
+ UNSAFE.putByte(obj, addr + 2, (byte)(val >> 16));
+ UNSAFE.putByte(obj, addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(obj, addr, (byte)(val));
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static short getShortByByte(long addr, boolean bigEndian) {
+ if (bigEndian)
+ return (short)(UNSAFE.getByte(addr) << 8 | (UNSAFE.getByte(addr + 1) & 0xff));
+ else
+ return (short)(UNSAFE.getByte(addr + 1) << 8 | (UNSAFE.getByte(addr) & 0xff));
+ }
+
+ /**
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putShortByByte(long addr, short val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(addr, (byte)(val >> 8));
+ UNSAFE.putByte(addr + 1, (byte)val);
+ }
+ else {
+ UNSAFE.putByte(addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(addr, (byte)val);
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static char getCharByByte(long addr, boolean bigEndian) {
+ if (bigEndian)
+ return (char)(UNSAFE.getByte(addr) << 8 | (UNSAFE.getByte(addr + 1) & 0xff));
+ else
+ return (char)(UNSAFE.getByte(addr + 1) << 8 | (UNSAFE.getByte(addr) & 0xff));
+ }
+
+ /**
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putCharByByte(long addr, char val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(addr, (byte)(val >> 8));
+ UNSAFE.putByte(addr + 1, (byte)val);
+ }
+ else {
+ UNSAFE.putByte(addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(addr, (byte)val);
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static int getIntByByte(long addr, boolean bigEndian) {
+ if (bigEndian) {
+ return (((int)UNSAFE.getByte(addr)) << 24) |
+ (((int)UNSAFE.getByte(addr + 1) & 0xff) << 16) |
+ (((int)UNSAFE.getByte(addr + 2) & 0xff) << 8) |
+ (((int)UNSAFE.getByte(addr + 3) & 0xff));
+ }
+ else {
+ return (((int)UNSAFE.getByte(addr + 3)) << 24) |
+ (((int)UNSAFE.getByte(addr + 2) & 0xff) << 16) |
+ (((int)UNSAFE.getByte(addr + 1) & 0xff) << 8) |
+ (((int)UNSAFE.getByte(addr) & 0xff));
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putIntByByte(long addr, int val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(addr, (byte)(val >> 24));
+ UNSAFE.putByte(addr + 1, (byte)(val >> 16));
+ UNSAFE.putByte(addr + 2, (byte)(val >> 8));
+ UNSAFE.putByte(addr + 3, (byte)(val));
+ }
+ else {
+ UNSAFE.putByte(addr + 3, (byte)(val >> 24));
+ UNSAFE.putByte(addr + 2, (byte)(val >> 16));
+ UNSAFE.putByte(addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(addr, (byte)(val));
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static long getLongByByte(long addr, boolean bigEndian) {
+ if (bigEndian) {
+ return (((long)UNSAFE.getByte(addr)) << 56) |
+ (((long)UNSAFE.getByte(addr + 1) & 0xff) << 48) |
+ (((long)UNSAFE.getByte(addr + 2) & 0xff) << 40) |
+ (((long)UNSAFE.getByte(addr + 3) & 0xff) << 32) |
+ (((long)UNSAFE.getByte(addr + 4) & 0xff) << 24) |
+ (((long)UNSAFE.getByte(addr + 5) & 0xff) << 16) |
+ (((long)UNSAFE.getByte(addr + 6) & 0xff) << 8) |
+ (((long)UNSAFE.getByte(addr + 7) & 0xff));
+ }
+ else {
+ return (((long)UNSAFE.getByte(addr + 7)) << 56) |
+ (((long)UNSAFE.getByte(addr + 6) & 0xff) << 48) |
+ (((long)UNSAFE.getByte(addr + 5) & 0xff) << 40) |
+ (((long)UNSAFE.getByte(addr + 4) & 0xff) << 32) |
+ (((long)UNSAFE.getByte(addr + 3) & 0xff) << 24) |
+ (((long)UNSAFE.getByte(addr + 2) & 0xff) << 16) |
+ (((long)UNSAFE.getByte(addr + 1) & 0xff) << 8) |
+ (((long)UNSAFE.getByte(addr) & 0xff));
+ }
+ }
+
+ /**
+ * @param addr Address.
+ * @param val Value.
+ * @param bigEndian Order of value bytes in memory. If {@code true} - big-endian, otherwise little-endian.
+ */
+ private static void putLongByByte(long addr, long val, boolean bigEndian) {
+ if (bigEndian) {
+ UNSAFE.putByte(addr, (byte)(val >> 56));
+ UNSAFE.putByte(addr + 1, (byte)(val >> 48));
+ UNSAFE.putByte(addr + 2, (byte)(val >> 40));
+ UNSAFE.putByte(addr + 3, (byte)(val >> 32));
+ UNSAFE.putByte(addr + 4, (byte)(val >> 24));
+ UNSAFE.putByte(addr + 5, (byte)(val >> 16));
+ UNSAFE.putByte(addr + 6, (byte)(val >> 8));
+ UNSAFE.putByte(addr + 7, (byte)(val));
+ }
+ else {
+ UNSAFE.putByte(addr + 7, (byte)(val >> 56));
+ UNSAFE.putByte(addr + 6, (byte)(val >> 48));
+ UNSAFE.putByte(addr + 5, (byte)(val >> 40));
+ UNSAFE.putByte(addr + 4, (byte)(val >> 32));
+ UNSAFE.putByte(addr + 3, (byte)(val >> 24));
+ UNSAFE.putByte(addr + 2, (byte)(val >> 16));
+ UNSAFE.putByte(addr + 1, (byte)(val >> 8));
+ UNSAFE.putByte(addr, (byte)(val));
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 6c0b8e6..a6b28fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -243,21 +243,19 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CACHE;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
+import static org.apache.ignite.internal.util.GridUnsafe.objectFieldOffset;
+import static org.apache.ignite.internal.util.GridUnsafe.putObjectVolatile;
+import static org.apache.ignite.internal.util.GridUnsafe.staticFieldBase;
+import static org.apache.ignite.internal.util.GridUnsafe.staticFieldOffset;
/**
* Collection of utility methods used throughout the system.
*/
@SuppressWarnings({"UnusedReturnValue", "UnnecessaryFullyQualifiedName"})
public abstract class IgniteUtils {
- /** Unsafe. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** {@code True} if {@code unsafe} should be used for array copy. */
private static final boolean UNSAFE_BYTE_ARR_CP = unsafeByteArrayCopyAvailable();
- /** Offset. */
- private static final int BYTE_ARRAY_DATA_OFFSET = UNSAFE.arrayBaseOffset(byte[].class);
-
/** Sun-specific JDK constructor factory for objects that don't have empty constructor. */
private static final Method CTOR_FACTORY;
@@ -526,7 +524,7 @@ public abstract class IgniteUtils {
}
// UNIX name detection.
- if (osLow.contains("olaris"))
+ if (osLow.contains("olaris") || osLow.contains("sunos"))
solaris = true;
else if (osLow.contains("inux"))
linux = true;
@@ -669,9 +667,8 @@ public abstract class IgniteUtils {
// We use unsafe operations to update static fields on interface because
// they are treated as static final and cannot be updated via standard reflection.
- UNSAFE.putObjectVolatile(UNSAFE.staticFieldBase(f1), UNSAFE.staticFieldOffset(f1), gridEvents());
- UNSAFE.putObjectVolatile(UNSAFE.staticFieldBase(f2), UNSAFE.staticFieldOffset(f2),
- gridEvents(EVT_NODE_METRICS_UPDATED));
+ putObjectVolatile(staticFieldBase(f1), staticFieldOffset(f1), gridEvents());
+ putObjectVolatile(staticFieldBase(f2), staticFieldOffset(f2), gridEvents(EVT_NODE_METRICS_UPDATED));
assert EVTS_ALL != null;
assert EVTS_ALL.length == GRID_EVTS.length;
@@ -7692,7 +7689,7 @@ public abstract class IgniteUtils {
*/
public static long fieldOffset(Class<?> cls, String fieldName) {
try {
- return UNSAFE.objectFieldOffset(cls.getDeclaredField(fieldName));
+ return objectFieldOffset(cls.getDeclaredField(fieldName));
}
catch (NoSuchFieldException e) {
throw new IllegalStateException(e);
@@ -8304,7 +8301,7 @@ public abstract class IgniteUtils {
@SuppressWarnings("TypeParameterExtendsFinalClass")
private static boolean unsafeByteArrayCopyAvailable() {
try {
- Class<? extends Unsafe> unsafeCls = UNSAFE.getClass();
+ Class<? extends Unsafe> unsafeCls = Unsafe.class;
unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
@@ -8327,7 +8324,7 @@ public abstract class IgniteUtils {
assert resBuf.length >= resOff + len;
if (UNSAFE_BYTE_ARR_CP)
- UNSAFE.copyMemory(src, BYTE_ARRAY_DATA_OFFSET + off, resBuf, BYTE_ARRAY_DATA_OFFSET + resOff, len);
+ GridUnsafe.copyMemory(src, GridUnsafe.BYTE_ARR_OFF + off, resBuf, GridUnsafe.BYTE_ARR_OFF + resOff, len);
else
System.arraycopy(src, off, resBuf, resOff, len);
@@ -8860,18 +8857,18 @@ public abstract class IgniteUtils {
* @return Offset.
*/
public static long writeGridUuid(byte[] arr, long off, @Nullable IgniteUuid uid) {
- UNSAFE.putBoolean(arr, off++, uid != null);
+ GridUnsafe.putBoolean(arr, off++, uid != null);
if (uid != null) {
- UNSAFE.putLong(arr, off, uid.globalId().getMostSignificantBits());
+ GridUnsafe.putLong(arr, off, uid.globalId().getMostSignificantBits());
off += 8;
- UNSAFE.putLong(arr, off, uid.globalId().getLeastSignificantBits());
+ GridUnsafe.putLong(arr, off, uid.globalId().getLeastSignificantBits());
off += 8;
- UNSAFE.putLong(arr, off, uid.localId());
+ GridUnsafe.putLong(arr, off, uid.localId());
off += 8;
}
@@ -8885,18 +8882,18 @@ public abstract class IgniteUtils {
* @return UUID.
*/
@Nullable public static IgniteUuid readGridUuid(byte[] arr, long off) {
- if (UNSAFE.getBoolean(arr, off++)) {
- long most = UNSAFE.getLong(arr, off);
+ if (GridUnsafe.getBoolean(arr, off++)) {
+ long most = GridUnsafe.getLong(arr, off);
off += 8;
- long least = UNSAFE.getLong(arr, off);
+ long least = GridUnsafe.getLong(arr, off);
off += 8;
UUID globalId = new UUID(most, least);
- long locId = UNSAFE.getLong(arr, off);
+ long locId = GridUnsafe.getLong(arr, off);
return new IgniteUuid(globalId, locId);
}
@@ -8909,18 +8906,18 @@ public abstract class IgniteUtils {
* @return UUID.
*/
@Nullable public static IgniteUuid readGridUuid(long ptr) {
- if (UNSAFE.getBoolean(null, ptr++)) {
- long most = UNSAFE.getLong(ptr);
+ if (GridUnsafe.getBoolean(null, ptr++)) {
+ long most = GridUnsafe.getLong(ptr);
ptr += 8;
- long least = UNSAFE.getLong(ptr);
+ long least = GridUnsafe.getLong(ptr);
ptr += 8;
UUID globalId = new UUID(most, least);
- long locId = UNSAFE.getLong(ptr);
+ long locId = GridUnsafe.getLong(ptr);
return new IgniteUuid(globalId, locId);
}
@@ -8937,43 +8934,43 @@ public abstract class IgniteUtils {
public static long writeVersion(byte[] arr, long off, GridCacheVersion ver) {
boolean verEx = ver instanceof GridCacheVersionEx;
- UNSAFE.putBoolean(arr, off++, verEx);
+ GridUnsafe.putBoolean(arr, off++, verEx);
if (verEx) {
GridCacheVersion drVer = ver.conflictVersion();
assert drVer != null;
- UNSAFE.putInt(arr, off, drVer.topologyVersion());
+ GridUnsafe.putInt(arr, off, drVer.topologyVersion());
off += 4;
- UNSAFE.putInt(arr, off, drVer.nodeOrderAndDrIdRaw());
+ GridUnsafe.putInt(arr, off, drVer.nodeOrderAndDrIdRaw());
off += 4;
- UNSAFE.putLong(arr, off, drVer.globalTime());
+ GridUnsafe.putLong(arr, off, drVer.globalTime());
off += 8;
- UNSAFE.putLong(arr, off, drVer.order());
+ GridUnsafe.putLong(arr, off, drVer.order());
off += 8;
}
- UNSAFE.putInt(arr, off, ver.topologyVersion());
+ GridUnsafe.putInt(arr, off, ver.topologyVersion());
off += 4;
- UNSAFE.putInt(arr, off, ver.nodeOrderAndDrIdRaw());
+ GridUnsafe.putInt(arr, off, ver.nodeOrderAndDrIdRaw());
off += 4;
- UNSAFE.putLong(arr, off, ver.globalTime());
+ GridUnsafe.putLong(arr, off, ver.globalTime());
off += 8;
- UNSAFE.putLong(arr, off, ver.order());
+ GridUnsafe.putLong(arr, off, ver.order());
off += 8;
@@ -8986,18 +8983,18 @@ public abstract class IgniteUtils {
* @return Version.
*/
public static GridCacheVersion readVersion(long ptr, boolean verEx) {
- GridCacheVersion ver = new GridCacheVersion(UNSAFE.getInt(ptr),
- UNSAFE.getInt(ptr + 4),
- UNSAFE.getLong(ptr + 8),
- UNSAFE.getLong(ptr + 16));
+ GridCacheVersion ver = new GridCacheVersion(GridUnsafe.getInt(ptr),
+ GridUnsafe.getInt(ptr + 4),
+ GridUnsafe.getLong(ptr + 8),
+ GridUnsafe.getLong(ptr + 16));
if (verEx) {
ptr += 24;
- ver = new GridCacheVersionEx(UNSAFE.getInt(ptr),
- UNSAFE.getInt(ptr + 4),
- UNSAFE.getLong(ptr + 8),
- UNSAFE.getLong(ptr + 16),
+ ver = new GridCacheVersionEx(GridUnsafe.getInt(ptr),
+ GridUnsafe.getInt(ptr + 4),
+ GridUnsafe.getLong(ptr + 8),
+ GridUnsafe.getLong(ptr + 16),
ver);
}
@@ -9011,38 +9008,38 @@ public abstract class IgniteUtils {
* @return Version.
*/
public static GridCacheVersion readVersion(byte[] arr, long off, boolean verEx) {
- int topVer = UNSAFE.getInt(arr, off);
+ int topVer = GridUnsafe.getInt(arr, off);
off += 4;
- int nodeOrderDrId = UNSAFE.getInt(arr, off);
+ int nodeOrderDrId = GridUnsafe.getInt(arr, off);
off += 4;
- long globalTime = UNSAFE.getLong(arr, off);
+ long globalTime = GridUnsafe.getLong(arr, off);
off += 8;
- long order = UNSAFE.getLong(arr, off);
+ long order = GridUnsafe.getLong(arr, off);
off += 8;
GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, globalTime, order);
if (verEx) {
- topVer = UNSAFE.getInt(arr, off);
+ topVer = GridUnsafe.getInt(arr, off);
off += 4;
- nodeOrderDrId = UNSAFE.getInt(arr, off);
+ nodeOrderDrId = GridUnsafe.getInt(arr, off);
off += 4;
- globalTime = UNSAFE.getLong(arr, off);
+ globalTime = GridUnsafe.getLong(arr, off);
off += 8;
- order = UNSAFE.getLong(arr, off);
+ order = GridUnsafe.getLong(arr, off);
ver = new GridCacheVersionEx(topVer, nodeOrderDrId, globalTime, order, ver);
}
@@ -9058,7 +9055,7 @@ public abstract class IgniteUtils {
public static byte[] copyMemory(long ptr, int size) {
byte[] res = new byte[size];
- UNSAFE.copyMemory(null, ptr, res, BYTE_ARRAY_DATA_OFFSET, size);
+ GridUnsafe.copyMemory(null, ptr, res, GridUnsafe.BYTE_ARR_OFF, size);
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
index 00fa2c3..2f57e59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataInput.java
@@ -26,41 +26,24 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+import static org.apache.ignite.internal.util.GridUnsafe.BYTE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.CHAR_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.DOUBLE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.FLOAT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.INT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.LONG_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.SHORT_ARR_OFF;
/**
* Data input based on {@code Unsafe} operations.
*/
public class GridUnsafeDataInput extends InputStream implements GridDataInput {
- /** Unsafe. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** */
private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000);
- /** */
- private static final long byteArrOff = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
- private static final long shortArrOff = UNSAFE.arrayBaseOffset(short[].class);
-
- /** */
- private static final long intArrOff = UNSAFE.arrayBaseOffset(int[].class);
-
- /** */
- private static final long longArrOff = UNSAFE.arrayBaseOffset(long[].class);
-
- /** */
- private static final long floatArrOff = UNSAFE.arrayBaseOffset(float[].class);
-
- /** */
- private static final long doubleArrOff = UNSAFE.arrayBaseOffset(double[].class);
-
- /** */
- private static final long charArrOff = UNSAFE.arrayBaseOffset(char[].class);
-
/** Maximum data block length. */
private static final int MAX_BLOCK_SIZE = 1024;
@@ -152,7 +135,7 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
if (maxOff < halfSize) {
byte[] newInBuf = new byte[halfSize]; // Shrink.
- UNSAFE.copyMemory(inBuf, byteArrOff, newInBuf, byteArrOff, off);
+ GridUnsafe.copyMemory(inBuf, BYTE_ARR_OFF, newInBuf, BYTE_ARR_OFF, off);
buf = inBuf = newInBuf;
}
@@ -208,7 +191,7 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
byte[] arr = new byte[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(arrSize), arr, byteArrOff, arrSize);
+ GridUnsafe.copyMemory(buf, BYTE_ARR_OFF + offset(arrSize), arr, BYTE_ARR_OFF, arrSize);
return arr;
}
@@ -223,7 +206,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
short[] arr = new short[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, shortArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getShortLE(buf, off);
+
+ off += 2;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, SHORT_ARR_OFF, bytesToCp);
return arr;
}
@@ -238,7 +231,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
int[] arr = new int[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, intArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getIntLE(buf, off);
+
+ off += 4;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, INT_ARR_OFF, bytesToCp);
return arr;
}
@@ -253,7 +256,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
double[] arr = new double[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, doubleArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getDoubleLE(buf, off);
+
+ off += 8;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, DOUBLE_ARR_OFF, bytesToCp);
return arr;
}
@@ -280,7 +293,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
char[] arr = new char[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, charArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getCharLE(buf, off);
+
+ off += 2;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, CHAR_ARR_OFF, bytesToCp);
return arr;
}
@@ -295,7 +318,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
long[] arr = new long[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, longArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getLongLE(buf, off);
+
+ off += 8;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, LONG_ARR_OFF, bytesToCp);
return arr;
}
@@ -310,7 +343,17 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
float[] arr = new float[arrSize];
- UNSAFE.copyMemory(buf, byteArrOff + offset(bytesToCp), arr, floatArrOff, bytesToCp);
+ long off = BYTE_ARR_OFF + offset(bytesToCp);
+
+ if (BIG_ENDIAN) {
+ for (int i = 0; i < arr.length; i++) {
+ arr[i] = GridUnsafe.getFloatLE(buf, off);
+
+ off += 4;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(buf, off, arr, FLOAT_ARR_OFF, bytesToCp);
return arr;
}
@@ -321,14 +364,14 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
fromStream(len);
- UNSAFE.copyMemory(buf, byteArrOff + offset(len), b, byteArrOff, len);
+ GridUnsafe.copyMemory(buf, BYTE_ARR_OFF + offset(len), b, BYTE_ARR_OFF, len);
}
/** {@inheritDoc} */
@Override public void readFully(byte[] b, int off, int len) throws IOException {
fromStream(len);
- UNSAFE.copyMemory(buf, byteArrOff + offset(len), b, byteArrOff + off, len);
+ GridUnsafe.copyMemory(buf, BYTE_ARR_OFF + offset(len), b, BYTE_ARR_OFF + off, len);
}
/** {@inheritDoc} */
@@ -345,14 +388,14 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
@Override public boolean readBoolean() throws IOException {
fromStream(1);
- return UNSAFE.getBoolean(buf, byteArrOff + offset(1));
+ return GridUnsafe.getBoolean(buf, BYTE_ARR_OFF + offset(1));
}
/** {@inheritDoc} */
@Override public byte readByte() throws IOException {
fromStream(1);
- return UNSAFE.getByte(buf, byteArrOff + offset(1));
+ return GridUnsafe.getByte(buf, BYTE_ARR_OFF + offset(1));
}
/** {@inheritDoc} */
@@ -364,7 +407,9 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
@Override public short readShort() throws IOException {
fromStream(2);
- return UNSAFE.getShort(buf, byteArrOff + offset(2));
+ long off = BYTE_ARR_OFF + offset(2);
+
+ return BIG_ENDIAN ? GridUnsafe.getShortLE(buf, off) : GridUnsafe.getShort(buf, off);
}
/** {@inheritDoc} */
@@ -376,7 +421,9 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
@Override public char readChar() throws IOException {
fromStream(2);
- char v = UNSAFE.getChar(buf, byteArrOff + off);
+ long off = BYTE_ARR_OFF + this.off;
+
+ char v = BIG_ENDIAN ? GridUnsafe.getCharLE(buf, off) : GridUnsafe.getChar(buf, off);
offset(2);
@@ -387,28 +434,32 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
@Override public int readInt() throws IOException {
fromStream(4);
- return UNSAFE.getInt(buf, byteArrOff + offset(4));
+ long off = BYTE_ARR_OFF + offset(4);
+
+ return BIG_ENDIAN ? GridUnsafe.getIntLE(buf, off) : GridUnsafe.getInt(buf, off);
}
/** {@inheritDoc} */
@Override public long readLong() throws IOException {
fromStream(8);
- return UNSAFE.getLong(buf, byteArrOff + offset(8));
+ long off = BYTE_ARR_OFF + offset(8);
+
+ return BIG_ENDIAN ? GridUnsafe.getLongLE(buf, off) : GridUnsafe.getLong(buf, off);
}
/** {@inheritDoc} */
@Override public float readFloat() throws IOException {
- fromStream(4);
+ int v = readInt();
- return UNSAFE.getFloat(buf, byteArrOff + offset(4));
+ return Float.intBitsToFloat(v);
}
/** {@inheritDoc} */
@Override public double readDouble() throws IOException {
- fromStream(8);
+ long v = readLong();
- return UNSAFE.getDouble(buf, byteArrOff + offset(8));
+ return Double.longBitsToDouble(v);
}
/** {@inheritDoc} */
@@ -437,7 +488,7 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
else {
int toRead = Math.min(len, max - this.off);
- UNSAFE.copyMemory(buf, byteArrOff + offset(toRead), b, byteArrOff + off, toRead);
+ GridUnsafe.copyMemory(buf, BYTE_ARR_OFF + offset(toRead), b, BYTE_ARR_OFF + off, toRead);
return toRead;
}
@@ -501,7 +552,7 @@ public class GridUnsafeDataInput extends InputStream implements GridDataInput {
else {
// shift and refill buffer manually
if (avail > 0)
- UNSAFE.copyMemory(utfBuf, byteArrOff + pos, utfBuf, byteArrOff, avail);
+ GridUnsafe.copyMemory(utfBuf, BYTE_ARR_OFF + pos, utfBuf, BYTE_ARR_OFF, avail);
pos = 0;
end = (int)Math.min(MAX_BLOCK_SIZE, utfLen);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a87decdc/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
index b7c82a6..c0fe0d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java
@@ -22,41 +22,24 @@ import java.io.OutputStream;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHAL_BUFFERS_RECHECK;
+import static org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
+import static org.apache.ignite.internal.util.GridUnsafe.BYTE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.CHAR_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.DOUBLE_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.FLOAT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.INT_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.LONG_ARR_OFF;
+import static org.apache.ignite.internal.util.GridUnsafe.SHORT_ARR_OFF;
/**
* Data output based on {@code Unsafe} operations.
*/
public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput {
- /** Unsafe. */
- private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
/** */
private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000);
- /** */
- private static final long byteArrOff = UNSAFE.arrayBaseOffset(byte[].class);
-
- /** */
- private static final long shortArrOff = UNSAFE.arrayBaseOffset(short[].class);
-
- /** */
- private static final long intArrOff = UNSAFE.arrayBaseOffset(int[].class);
-
- /** */
- private static final long longArrOff = UNSAFE.arrayBaseOffset(long[].class);
-
- /** */
- private static final long floatArrOff = UNSAFE.arrayBaseOffset(float[].class);
-
- /** */
- private static final long doubleArrOff = UNSAFE.arrayBaseOffset(double[].class);
-
- /** */
- private static final long charArrOff = UNSAFE.arrayBaseOffset(char[].class);
-
/** Length of char buffer (for writing strings). */
private static final int CHAR_BUF_SIZE = 256;
@@ -114,7 +97,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public byte[] array() {
byte[] bytes0 = new byte[off];
- UNSAFE.copyMemory(bytes, byteArrOff, bytes0, byteArrOff, off);
+ GridUnsafe.copyMemory(bytes, BYTE_ARR_OFF, bytes0, BYTE_ARR_OFF, off);
return bytes0;
}
@@ -147,7 +130,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
if (size > bytes.length) {
byte[] newBytes = new byte[size << 1]; // Grow.
- UNSAFE.copyMemory(bytes, byteArrOff, newBytes, byteArrOff, off);
+ GridUnsafe.copyMemory(bytes, BYTE_ARR_OFF, newBytes, BYTE_ARR_OFF, off);
bytes = newBytes;
}
@@ -157,7 +140,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
if (maxOff < halfSize) {
byte[] newBytes = new byte[halfSize]; // Shrink.
- UNSAFE.copyMemory(bytes, byteArrOff, newBytes, byteArrOff, off);
+ GridUnsafe.copyMemory(bytes, BYTE_ARR_OFF, newBytes, BYTE_ARR_OFF, off);
bytes = newBytes;
}
@@ -182,7 +165,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void write(byte[] b) throws IOException {
requestFreeSize(b.length);
- UNSAFE.copyMemory(b, byteArrOff, bytes, byteArrOff + off, b.length);
+ GridUnsafe.copyMemory(b, BYTE_ARR_OFF, bytes, BYTE_ARR_OFF + off, b.length);
onWrite(b.length);
}
@@ -191,7 +174,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void write(byte[] b, int off, int len) throws IOException {
requestFreeSize(len);
- UNSAFE.copyMemory(b, byteArrOff + off, bytes, byteArrOff + this.off, len);
+ GridUnsafe.copyMemory(b, BYTE_ARR_OFF + off, bytes, BYTE_ARR_OFF + this.off, len);
onWrite(len);
}
@@ -204,7 +187,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, doubleArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (double val : arr) {
+ GridUnsafe.putDoubleLE(bytes, off, val);
+
+ off += 8;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, DOUBLE_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -226,7 +219,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, charArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (char val : arr) {
+ GridUnsafe.putCharLE(bytes, off, val);
+
+ off += 2;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, CHAR_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -239,7 +242,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, longArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (long val : arr) {
+ GridUnsafe.putLongLE(bytes, off, val);
+
+ off += 8;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, LONG_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -252,7 +265,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, floatArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (float val : arr) {
+ GridUnsafe.putFloatLE(bytes, off, val);
+
+ off += 4;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, FLOAT_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -270,7 +293,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(arr.length);
- UNSAFE.copyMemory(arr, byteArrOff, bytes, byteArrOff + off, arr.length);
+ GridUnsafe.copyMemory(arr, BYTE_ARR_OFF, bytes, BYTE_ARR_OFF + off, arr.length);
onWrite(arr.length);
}
@@ -283,7 +306,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, shortArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (short val : arr) {
+ GridUnsafe.putShortLE(bytes, off, val);
+
+ off += 2;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, SHORT_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -296,7 +329,17 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
requestFreeSize(bytesToCp);
- UNSAFE.copyMemory(arr, intArrOff, bytes, byteArrOff + off, bytesToCp);
+ if (BIG_ENDIAN) {
+ long off = BYTE_ARR_OFF + this.off;
+
+ for (int val : arr) {
+ GridUnsafe.putIntLE(bytes, off, val);
+
+ off += 4;
+ }
+ }
+ else
+ GridUnsafe.copyMemory(arr, INT_ARR_OFF, bytes, BYTE_ARR_OFF + off, bytesToCp);
onWrite(bytesToCp);
}
@@ -310,7 +353,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeBoolean(boolean v) throws IOException {
requestFreeSize(1);
- UNSAFE.putBoolean(bytes, byteArrOff + off, v);
+ GridUnsafe.putBoolean(bytes, BYTE_ARR_OFF + off, v);
onWrite(1);
}
@@ -319,7 +362,7 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeByte(int v) throws IOException {
requestFreeSize(1);
- UNSAFE.putByte(bytes, byteArrOff + off, (byte)v);
+ GridUnsafe.putByte(bytes, BYTE_ARR_OFF + off, (byte)v);
onWrite(1);
}
@@ -328,7 +371,14 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeShort(int v) throws IOException {
requestFreeSize(2);
- UNSAFE.putShort(bytes, byteArrOff + off, (short)v);
+ short val = (short)v;
+
+ long off = BYTE_ARR_OFF + this.off;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putShortLE(bytes, off, val);
+ else
+ GridUnsafe.putShort(bytes, off, val);
onWrite(2);
}
@@ -337,7 +387,14 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeChar(int v) throws IOException {
requestFreeSize(2);
- UNSAFE.putChar(bytes, byteArrOff + off, (char)v);
+ char val = (char)v;
+
+ long off = BYTE_ARR_OFF + this.off;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putCharLE(bytes, off, val);
+ else
+ GridUnsafe.putChar(bytes, off, val);
onWrite(2);
}
@@ -346,7 +403,12 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeInt(int v) throws IOException {
requestFreeSize(4);
- UNSAFE.putInt(bytes, byteArrOff + off, v);
+ long off = BYTE_ARR_OFF + this.off;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putIntLE(bytes, off, v);
+ else
+ GridUnsafe.putInt(bytes, off, v);
onWrite(4);
}
@@ -355,27 +417,28 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput
@Override public void writeLong(long v) throws IOException {
requestFreeSize(8);
- UNSAFE.putLong(bytes, byteArrOff + off, v);
+ long off = BYTE_ARR_OFF + this.off;
+
+ if (BIG_ENDIAN)
+ GridUnsafe.putLongLE(bytes, off, v);
+ else
+ GridUnsafe.putLong(bytes, off, v);
onWrite(8);
}
/** {@inheritDoc} */
@Override public void writeFloat(float v) throws IOException {
- requestFreeSize(4);
+ int val = Float.floatToIntBits(v);
- UNSAFE.putFloat(bytes, byteArrOff + off, v);
-
- onWrite(4);
+ writeInt(val);
}
/** {@inheritDoc} */
@Override public void writeDouble(double v) throws IOException {
- requestFreeSize(8);
-
- UNSAFE.putDouble(bytes, byteArrOff + off, v);
+ long val = Double.doubleToLongBits(v);
- onWrite(8);
+ writeLong(val);
}
/** {@inheritDoc} */
[8/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2407
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2407
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3194821
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3194821
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3194821
Branch: refs/heads/ignite-2407
Commit: b3194821c1c4b69c61f5e775c9adc24e5d3f5c4e
Parents: bc388fd e6acce6
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 3 09:09:33 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 3 09:09:33 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheInterceptor.java | 5 +
.../org/apache/ignite/internal/IgnitionEx.java | 3 +-
.../internal/binary/BinaryClassDescriptor.java | 6 +-
.../internal/binary/BinaryFieldAccessor.java | 45 +-
.../internal/binary/BinaryMarshaller.java | 5 +-
.../binary/BinaryObjectOffheapImpl.java | 34 +-
.../internal/binary/BinaryPrimitives.java | 117 +-
.../streams/BinaryAbstractInputStream.java | 53 +-
.../streams/BinaryAbstractOutputStream.java | 90 +-
.../binary/streams/BinaryAbstractStream.java | 34 -
.../binary/streams/BinaryHeapInputStream.java | 43 +-
.../binary/streams/BinaryHeapOutputStream.java | 86 +-
.../streams/BinaryMemoryAllocatorChunk.java | 9 +-
.../streams/BinaryOffheapInputStream.java | 42 +-
.../streams/BinaryOffheapOutputStream.java | 94 +-
.../internal/direct/DirectMessageReader.java | 2 +-
.../internal/direct/DirectMessageWriter.java | 2 +-
.../stream/v1/DirectByteBufferStreamImplV1.java | 106 +-
.../stream/v2/DirectByteBufferStreamImplV2.java | 351 ++++-
.../cache/GridCacheEvictionManager.java | 7 +-
.../cache/GridCacheOffheapSwapEntry.java | 24 +-
.../cache/GridCacheSwapEntryImpl.java | 61 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 8 +-
.../dht/atomic/GridDhtAtomicCache.java | 13 +-
.../local/atomic/GridLocalAtomicCache.java | 9 +-
.../IgniteCacheObjectProcessorImpl.java | 7 +-
.../platform/memory/PlatformAbstractMemory.java | 6 +-
.../PlatformBigEndianOutputStreamImpl.java | 14 +-
.../memory/PlatformInputStreamImpl.java | 53 +-
.../platform/memory/PlatformMemoryUtils.java | 108 +-
.../memory/PlatformOutputStreamImpl.java | 58 +-
.../ignite/internal/util/GridHandleTable.java | 17 +-
.../ignite/internal/util/GridJavaProcess.java | 3 -
.../internal/util/GridSpinReadWriteLock.java | 10 +-
.../apache/ignite/internal/util/GridUnsafe.java | 1483 +++++++++++++++++-
.../ignite/internal/util/IgniteUtils.java | 99 +-
.../internal/util/io/GridUnsafeDataInput.java | 145 +-
.../internal/util/io/GridUnsafeDataOutput.java | 165 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 75 +-
.../util/offheap/unsafe/GridUnsafeMemory.java | 106 +-
.../optimized/OptimizedClassDescriptor.java | 22 +-
.../optimized/OptimizedMarshaller.java | 5 +-
.../optimized/OptimizedMarshallerUtils.java | 44 +-
.../optimized/OptimizedObjectInputStream.java | 10 +-
.../java/org/apache/ignite/GridTestIoUtils.java | 117 +-
.../ignite/internal/GridAffinitySelfTest.java | 2 +-
.../binary/BinaryFieldsOffheapSelfTest.java | 13 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 13 +-
.../binary/BinaryMarshallerSelfTest.java | 17 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 24 +-
.../mutabletest/GridBinaryTestClasses.java | 3 +-
.../AbstractBinaryStreamByteOrderSelfTest.java | 464 ++++++
.../BinaryHeapStreamByteOrderSelfTest.java | 29 +
.../BinaryOffheapStreamByteOrderSelfTest.java | 31 +
...ByteBufferStreamImplV2ByteOrderSelfTest.java | 244 +++
.../cache/GridCacheConcurrentMapSelfTest.java | 13 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 6 +
...dUnsafeDataInputOutputByteOrderSelfTest.java | 249 +++
.../ignite/lang/GridBasicPerformanceTest.java | 11 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../IgniteBinaryObjectsTestSuite.java | 6 +
.../IgniteMarshallerSelfTestSuite.java | 4 +
.../hadoop/shuffle/HadoopShuffleJob.java | 5 +-
.../hadoop/shuffle/HadoopShuffleMessage.java | 10 +-
.../shuffle/streams/HadoopDataOutStream.java | 6 +-
.../HadoopConcurrentHashMultimapSelftest.java | 6 +-
.../collections/HadoopSkipListSelfTest.java | 5 +-
68 files changed, 3857 insertions(+), 1106 deletions(-)
----------------------------------------------------------------------
[7/8] ignite git commit: Updated CacheInterceptor JavaDoc
Posted by sb...@apache.org.
Updated CacheInterceptor JavaDoc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6acce66
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6acce66
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6acce66
Branch: refs/heads/ignite-2407
Commit: e6acce66d84b0148aa6c4a49541ce9907d064d47
Parents: 57194e2
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Tue Feb 2 16:40:44 2016 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Tue Feb 2 16:40:44 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/cache/CacheInterceptor.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e6acce66/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
index 103fe57..ffb3c2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
@@ -63,6 +63,11 @@ public interface CacheInterceptor<K, V> extends Serializable {
* from sensitive synchronization blocks.
* <p>
* This method should not throw any exception.
+ * <p>
+ * <b>IMPORTANT:</b> for this method to take affect, {@code newVal} and
+ * the returned value have to be different instances. I.e., you should
+ * not mutate {@code newVal} directly, but instead create a copy, update
+ * it and then return from the interceptor.
*
* @param entry Old entry. If {@link CacheConfiguration#isCopyOnRead()} is {@code true}, then is copy.
* @param newVal New value.