mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Compute ASMDataTable submaps parallel, speeds up contructing mods (#5246)
* Compute submaps parallel, speeds up contructing mods by a lot * Use stream API better
This commit is contained in:
1 parent
7731e1cd75
commit
7f337cf230
1 file changed
+6
-8
@@ -35,6 +35,7 @@ import com.google.common.collect.Multimaps;
|
||||
import com.google.common.collect.SetMultimap;
|
||||
|
||||
import net.minecraftforge.fml.common.ModContainer;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
public class ASMDataTable
|
||||
{
|
||||
@@ -103,7 +104,7 @@ public class ASMDataTable
|
||||
return container.getSource().equals(data.candidate.getModContainer());
|
||||
}
|
||||
}
|
||||
private SetMultimap<String, ASMData> globalAnnotationData = HashMultimap.create();
|
||||
private final SetMultimap<String, ASMData> globalAnnotationData = HashMultimap.create();
|
||||
private Map<ModContainer, SetMultimap<String,ASMData>> containerAnnotationData;
|
||||
|
||||
private List<ModContainer> containers = Lists.newArrayList();
|
||||
@@ -113,13 +114,10 @@ public class ASMDataTable
|
||||
{
|
||||
if (containerAnnotationData == null)
|
||||
{
|
||||
ImmutableMap.Builder<ModContainer, SetMultimap<String, ASMData>> mapBuilder = ImmutableMap.builder();
|
||||
for (ModContainer cont : containers)
|
||||
{
|
||||
Multimap<String, ASMData> values = Multimaps.filterValues(globalAnnotationData, new ModContainerPredicate(cont));
|
||||
mapBuilder.put(cont, ImmutableSetMultimap.copyOf(values));
|
||||
}
|
||||
containerAnnotationData = mapBuilder.build();
|
||||
//concurrently filter the values to speed this up
|
||||
containerAnnotationData = containers.parallelStream()
|
||||
.map(cont -> Pair.of(cont, ImmutableSetMultimap.copyOf(Multimaps.filterValues(globalAnnotationData, new ModContainerPredicate(cont)))))
|
||||
.collect(ImmutableMap.toImmutableMap(Pair::getKey, Pair::getValue));
|
||||
}
|
||||
return containerAnnotationData.get(container);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user