Pre allocate threadpool, with size of 2/3rds numProcessors

GTNewHorizons · Jan 1, 2020 · 4b56f78 · 4b56f78
1 parent dad378e
commit 4b56f78
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/build/build.properties b/build/build.properties
@@ -2,4 +2,4 @@ mc_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 ccl_version=1.1.3.138
 ccc_version=1.0.7.+
-mod_version=2.0.0-pre-5-GTNH
+mod_version=2.0.0-pre-7-GTNH
diff --git a/resources/assets/nei/lang/en_US.lang b/resources/assets/nei/lang/en_US.lang
@@ -60,6 +60,7 @@ nei.options.wbutton.tip.0=Using global settings
 nei.options.wbutton.tip.1=Overriding global setting
 
 nei.options.keys=KeyBindings
+nei.options.keys.showenchant=Show Enchant
 nei.options.keys.gui=Inventory
 nei.options.keys.gui.recipe=Recipe
 nei.options.keys.gui.usage=Usage

diff --git a/src/codechicken/nei/ItemList.java b/src/codechicken/nei/ItemList.java
@@ -15,6 +15,8 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
 import java.util.regex.Pattern;
 
 public class ItemList
@@ -227,22 +229,37 @@ public void execute() {
         }
     };
 
+    public static ForkJoinPool getPool(int poolSize) {
+        if(poolSize < 1)
+            poolSize = 1;
+
+        return new ForkJoinPool(poolSize);
+    }
+
+    public static final int numProcessors = Runtime.getRuntime().availableProcessors();
+    public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
+
     public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering")
     {
         @Override
         public void execute() {
             ArrayList<ItemStack> filtered = new ArrayList<>();
             ItemFilter filter = getItemListFilter();
 
-            items.parallelStream().forEach(item -> {
-                if (interrupted()) return;
+            try {
+                ItemList.forkJoinPool.submit(() -> items.parallelStream().forEach(item -> {
+                    if (interrupted()) return;
 
-                if(filter.matches(item)) {
-                    synchronized (filtered){
-                        filtered.add(item);
+                    if(filter.matches(item)) {
+                        synchronized (filtered){
+                            filtered.add(item);
+                        }
                     }
-                }
-            });
+                })).get();
+            } catch (InterruptedException | ExecutionException e) {
+                e.printStackTrace();
+                stop();
+            }
 
             if(interrupted()) return;
             ItemSorter.sort(filtered);