From 890d5a87f7eac408565b73bd7d340bd34d4dadf8 Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Mon, 22 Dec 2014 22:35:50 +0700
Subject: [PATCH] HCOLL-203 Fixed testAcquireLockedLLPerf -- use all available
 processors

---
 .../chronicle/map/VanillaChronicleMap.java       |  2 +-
 .../openhft/chronicle/map/ChronicleMapTest.java  | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index ea34acb70..1d18793e7 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -1642,7 +1642,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
         long pos;
         long valueSizePos;
 
-        SearchState searchState = new SearchState();
+        final SearchState searchState = new SearchState();
 
         private SegmentState(int depth) {
             if (depth > (1 << 16))
diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
index c5758b996..b00df52b5 100755
--- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
@@ -803,7 +803,7 @@ public class ChronicleMapTest {
 //        int runs = Integer.getInteger("runs", 10);
         int procs = Runtime.getRuntime().availableProcessors();
         int threads = procs * 3; // runs > 100 ? procs / 2 : procs;
-        ExecutorService es = Executors.newFixedThreadPool(1);
+        ExecutorService es = Executors.newFixedThreadPool(procs);
         for (int runs : new int[]{10, 50, 100, 250, 500, 1000, 2500}) {
             // JAVA 8 produces more garbage than previous versions for internal work.
 //            System.gc();
@@ -811,7 +811,6 @@ public class ChronicleMapTest {
             ChronicleMapBuilder<LongValue, LongValue> builder = ChronicleMapBuilder
                     .of(LongValue.class, LongValue.class)
                     .entries(entries)
-                    .entryAndValueAlignment(OF_8_BYTES)
                     .actualSegments(8 * 1024);
 
             File tmpFile = File.createTempFile("testAcquirePerf", ".deleteme");
@@ -833,14 +832,12 @@ public class ChronicleMapTest {
                             LongValue value = nativeLongValue();
                             long next = 50 * 1000 * 1000;
                             // use a factor to give up to 10 digit numbers.
-                            int factor = Math.max(1, (int) ((10 * 1000 * 1000 * 1000L - 1) / entries));
-                            for (long j = t % independence; j < entries + independence - 1; j += independence) {
+                            int factor = Math.max(1,
+                                    (int) ((10 * 1000 * 1000 * 1000L - 1) / entries));
+                            for (long j = t % independence; j < entries + independence - 1;
+                                 j += independence) {
                                 key.setValue(j * factor);
                                 long n;
-/*
-                                map.acquireUsing(key, value);
-                                n = value.addAtomicValue(1);
-*/
                                 try (WriteContext wc = map.acquireUsingLocked(key, value)) {
                                     n = value.addValue(1);
                                 }
@@ -859,7 +856,8 @@ public class ChronicleMapTest {
                     future.get();
                 }
                 long time = System.currentTimeMillis() - start;
-                System.out.printf("Throughput %.1f M ops/sec%n", threads * entries / independence / 1000.0 / time);
+                System.out.printf("Throughput %.1f M ops/sec%n",
+                        threads * entries / independence / 1000.0 / time);
             }
             printStatus();
             File file = map.file();