Lets not forget synchronisation

This commit is contained in:
Chicken-Bones committed 2015-05-08 03:54:10 +10:00
1 parent 00e6a9bb82
commit 409b89b6a3
4 files changed
+41 -23

No files matched your search

@@ -1,20 +1,17 @@
package codechicken.microblock
import codechicken.multipart.asm.ASMMixinFactory
import codechicken.multipart.asm.{ScratchBitSet, ASMMixinFactory}
import java.util.BitSet
object MicroblockGenerator extends ASMMixinFactory(classOf[Microblock], classOf[Int])
object MicroblockGenerator extends ASMMixinFactory(classOf[Microblock], classOf[Int]) with ScratchBitSet
{
trait IGeneratedMaterial
{
def addTraits(traits:BitSet, mcrClass:MicroblockClass, client:Boolean)
}
//scratch bitset
private val bitset = new BitSet
def create(mcrClass: MicroblockClass, material: Int, client: Boolean) = {
bitset.clear()
val bitset = freshBitSet
bitset.set(mcrClass.baseTraitId)
if(client) bitset.set(mcrClass.clientTraitId)
@@ -8,7 +8,7 @@ import codechicken.lib.packet.PacketCustom
import net.minecraft.network.play.server.S23PacketBlockChange
import java.util.BitSet
import scala.collection.mutable.Map
import codechicken.multipart.asm.MultipartMixinFactory
import codechicken.multipart.asm.{ScratchBitSet, MultipartMixinFactory}
import codechicken.multipart.asm.ASMImplicits._
/**
@@ -21,7 +21,7 @@ import codechicken.multipart.asm.ASMImplicits._
*
* There are several mixin traits that come with the API included in the scalatraits package. TPartialOcclusionTile is defined as class instead of trait to give an example for Java programmers.
*/
object MultipartGenerator
object MultipartGenerator extends ScratchBitSet
{
private val tileTraitMap = Map[Class[_], BitSet]()
private val interfaceTraitMap_c = Map[String, String]()
@@ -30,9 +30,6 @@ object MultipartGenerator
private val partTraitMap_s = Map[Class[_], BitSet]()
private val clientTraitId = MultipartMixinFactory.registerTrait(classOf[TileMultipartClient])
//scratch bitset
private val bitset = new BitSet
private def partTraitMap(client:Boolean) = if(client) partTraitMap_c else partTraitMap_s
private def interfaceTraitMap(client:Boolean) = if(client) interfaceTraitMap_c else interfaceTraitMap_s
@@ -54,12 +51,13 @@ object MultipartGenerator
bitset
})
private def setTraits(part:TMultiPart, client:Boolean):Unit = setTraits(Seq(part), client)
private def setTraits(part:TMultiPart, client:Boolean):BitSet = setTraits(Seq(part), client)
private def setTraits(parts:Iterable[TMultiPart], client:Boolean) {
bitset.clear()
private def setTraits(parts:Iterable[TMultiPart], client:Boolean) = {
val bitset = freshBitSet
parts.foreach(p => bitset.or(traitsForPart(p, client)))
if(client) bitset.set(clientTraitId)
bitset
}
/**
@@ -69,7 +67,7 @@ object MultipartGenerator
private[multipart] def addPart(world:World, pos:BlockCoord, part:TMultiPart):TileMultipart =
{
val (tile, converted) = TileMultipart.getOrConvertTile2(world, pos)
setTraits(part, world.isRemote)
val bitset = setTraits(part, world.isRemote)
var ntile = tile
if(ntile != null) {
@@ -114,7 +112,7 @@ object MultipartGenerator
* Check if tile satisfies all the interfaces required by parts. If not, return a new generated copy of tile
*/
private[multipart] def generateCompositeTile(tile:TileEntity, parts:Iterable[TMultiPart], client:Boolean) = {
setTraits(parts, client)
val bitset = setTraits(parts, client)
if(tile != null && tile.isInstanceOf[TileMultipart] && bitset == tileTraitMap(tile.getClass))
tile.asInstanceOf[TileMultipart]
else
@@ -37,13 +37,15 @@ class ASMMixinFactory[T](val baseType:Class[T], private val paramTypes:Class[_]*
protected def onCompiled(clazz:Class[_ <: T], traitSet:BitSet){}
protected def autoCompleteJavaTrait(cnode:ClassNode){}
def construct(traitSet:BitSet, args:Object*) = (classMap.get(traitSet) match {
case Some(c) => c
case None =>
val c = compile(traitSet)
classMap.put(traitSet.copy, c)
c
}).newInstance(args:_*)
def construct(traitSet:BitSet, args:Object*) = synchronized {
(classMap.get(traitSet) match {
case Some(c) => c
case None =>
val c = compile(traitSet)
classMap.put(traitSet.copy, c)
c
}).newInstance(args: _*)
}
def getId(s_trait:String) = traitMap(s_trait)
@@ -0,0 +1,21 @@
package codechicken.multipart.asm
import java.util.BitSet
trait ScratchBitSet
{
private val bitSets = new ThreadLocal[BitSet]
def getBitSet = bitSets.get match {
case null =>
val bitset = new BitSet
bitSets.set(bitset)
bitset
case bitset => bitset
}
def freshBitSet = {
val bitset = getBitSet
bitset.clear()
bitset
}
}