fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buffer changes from Interest List.

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-10 12:16:14 -05:00
parent a73109b62e
commit d807812bc8
5 changed files with 334 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/Grid.java
+236 -238
View File
@@ -1,238 +1,236 @@
package appeng.me; package appeng.me;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.networking.IGrid; import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache; import appeng.api.networking.IGridCache;
import appeng.api.networking.IGridHost; import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.networking.IMachineSet; import appeng.api.networking.IMachineSet;
import appeng.api.networking.events.MENetworkEvent; import appeng.api.networking.events.MENetworkEvent;
import appeng.api.networking.events.MENetworkPostCacheConstruction; import appeng.api.networking.events.MENetworkPostCacheConstruction;
import appeng.api.util.IReadOnlyCollection; import appeng.api.util.IReadOnlyCollection;
import appeng.core.WorldSettings; import appeng.core.WorldSettings;
import appeng.hooks.TickHandler; import appeng.hooks.TickHandler;
import appeng.util.ReadOnlyCollection; import appeng.util.ReadOnlyCollection;
public class Grid implements IGrid public class Grid implements IGrid
{ {
GridStorage myStorage; GridStorage myStorage;
NetworkEventBus bus = new NetworkEventBus(); NetworkEventBus bus = new NetworkEventBus();
HashMap<Class<? extends IGridHost>, Set> Machines = new HashMap<Class<? extends IGridHost>, Set>(); HashMap<Class<? extends IGridHost>, Set> Machines = new HashMap<Class<? extends IGridHost>, Set>();
HashMap<Class<? extends IGridCache>, GridCacheWrapper> caches = new HashMap<Class<? extends IGridCache>, GridCacheWrapper>(); HashMap<Class<? extends IGridCache>, GridCacheWrapper> caches = new HashMap<Class<? extends IGridCache>, GridCacheWrapper>();
GridNode pivot; GridNode pivot;
int isImportant; // how import is this network? int isImportant; // how import is this network?
public Grid(GridNode center) { public Grid(GridNode center) {
this.pivot = center; this.pivot = center;
HashMap<Class<? extends IGridCache>, IGridCache> myCaches = AEApi.instance().registries().gridCache().createCacheInstance( this ); HashMap<Class<? extends IGridCache>, IGridCache> myCaches = AEApi.instance().registries().gridCache().createCacheInstance( this );
for (Class<? extends IGridCache> c : myCaches.keySet()) for (Class<? extends IGridCache> c : myCaches.keySet())
{ {
bus.readClass( c, myCaches.get( c ).getClass() ); bus.readClass( c, myCaches.get( c ).getClass() );
caches.put( c, new GridCacheWrapper( myCaches.get( c ) ) ); caches.put( c, new GridCacheWrapper( myCaches.get( c ) ) );
} }
TickHandler.instance.addNetwork( this ); TickHandler.instance.addNetwork( this );
center.setGrid( this ); center.setGrid( this );
postEvent( new MENetworkPostCacheConstruction() ); postEvent( new MENetworkPostCacheConstruction() );
} }
public Set<Class<? extends IGridHost>> getMachineClasses() public Set<Class<? extends IGridHost>> getMachineClasses()
{ {
return Machines.keySet(); return Machines.keySet();
} }
@Override @Override
public IGridNode getPivot() public IGridNode getPivot()
{ {
return pivot; return pivot;
} }
public int size() public int size()
{ {
int out = 0; int out = 0;
for (Collection<?> x : Machines.values()) for (Collection<?> x : Machines.values())
out += x.size(); out += x.size();
return out; return out;
} }
public void remove(GridNode gridNode) public void remove(GridNode gridNode)
{ {
for (IGridCache c : caches.values()) for (IGridCache c : caches.values())
c.removeNode( gridNode, gridNode.getMachine() ); c.removeNode( gridNode, gridNode.getMachine() );
Collection<IGridNode> nodes = Machines.get( gridNode.getMachineClass() ); Collection<IGridNode> nodes = Machines.get( gridNode.getMachineClass() );
if ( nodes != null ) if ( nodes != null )
nodes.remove( gridNode ); nodes.remove( gridNode );
gridNode.setGridStorage( null ); gridNode.setGridStorage( null );
if ( pivot == gridNode ) if ( pivot == gridNode )
{ {
Iterator<IGridNode> n = getNodes().iterator(); Iterator<IGridNode> n = getNodes().iterator();
if ( n.hasNext() ) if ( n.hasNext() )
pivot = (GridNode) n.next(); pivot = (GridNode) n.next();
else else
{ {
pivot = null; pivot = null;
TickHandler.instance.removeNetwork( this ); TickHandler.instance.removeNetwork( this );
myStorage.remove(); myStorage.remove();
} }
} }
} }
public void add(GridNode gridNode) public void add(GridNode gridNode)
{ {
Class<? extends IGridHost> mClass = gridNode.getMachineClass(); Class<? extends IGridHost> mClass = gridNode.getMachineClass();
Set<IGridNode> nodes = Machines.get( mClass ); Set<IGridNode> nodes = Machines.get( mClass );
if ( nodes == null ) if ( nodes == null )
{ {
Machines.put( mClass, nodes = new MachineSet( mClass ) ); Machines.put( mClass, nodes = new MachineSet( mClass ) );
bus.readClass( mClass, mClass ); bus.readClass( mClass, mClass );
} }
// handle loading grid storages. // handle loading grid storages.
if ( gridNode.getGridStorage() != null ) if ( gridNode.getGridStorage() != null )
{ {
GridStorage gs = gridNode.getGridStorage(); GridStorage gs = gridNode.getGridStorage();
if ( gs.getGrid() == null ) if ( gs.getGrid() == null )
{ {
myStorage = gs; myStorage = gs;
myStorage.setGrid( this ); myStorage.setGrid( this );
for (IGridCache gc : caches.values()) for (IGridCache gc : caches.values())
gc.onJoin( myStorage ); gc.onJoin( myStorage );
} }
else if ( gs.getGrid() != this ) else if ( gs.getGrid() != this )
{ {
if ( myStorage == null ) if ( myStorage == null )
{ {
myStorage = WorldSettings.getInstance().getNewGridStorage(); myStorage = WorldSettings.getInstance().getNewGridStorage();
myStorage.setGrid( this ); myStorage.setGrid( this );
} }
GridStorage tmp = new GridStorage(); GridStorage tmp = new GridStorage();
if ( !gs.hasDivided( myStorage ) ) if ( !gs.hasDivided( myStorage ) )
{ {
gs.addDivided( myStorage ); gs.addDivided( myStorage );
for (IGridCache gc : ((Grid) gs.getGrid()).caches.values()) for (IGridCache gc : ((Grid) gs.getGrid()).caches.values())
gc.onSplit( tmp ); gc.onSplit( tmp );
for (IGridCache gc : caches.values()) for (IGridCache gc : caches.values())
gc.onJoin( tmp ); gc.onJoin( tmp );
} }
} }
} }
else if ( myStorage == null ) else if ( myStorage == null )
{ {
myStorage = WorldSettings.getInstance().getNewGridStorage(); myStorage = WorldSettings.getInstance().getNewGridStorage();
myStorage.setGrid( this ); myStorage.setGrid( this );
} }
// update grid node... // update grid node...
gridNode.setGridStorage( myStorage ); gridNode.setGridStorage( myStorage );
// track node. // track node.
nodes.add( gridNode ); nodes.add( gridNode );
for (IGridCache c : caches.values()) for (IGridCache c : caches.values())
c.addNode( gridNode, gridNode.getMachine() ); c.addNode( gridNode, gridNode.getMachine() );
gridNode.gridProxy.gridChanged(); gridNode.gridProxy.gridChanged();
// postEventTo( gridNode, networkChanged ); // postEventTo( gridNode, networkChanged );
} }
@Override @Override
public IReadOnlyCollection<IGridNode> getNodes() public IReadOnlyCollection<IGridNode> getNodes()
{ {
return new NodeIteratable( Machines ); return new NodeIteratable( Machines );
} }
@Override @Override
public IReadOnlyCollection<Class<? extends IGridHost>> getMachinesClasses() public IReadOnlyCollection<Class<? extends IGridHost>> getMachinesClasses()
{ {
return new ReadOnlyCollection<Class<? extends IGridHost>>( Machines.keySet() ); return new ReadOnlyCollection<Class<? extends IGridHost>>( Machines.keySet() );
} }
@Override @Override
public IMachineSet getMachines(Class<? extends IGridHost> c) public IMachineSet getMachines(Class<? extends IGridHost> c)
{ {
MachineSet s = (MachineSet) Machines.get( c ); MachineSet s = (MachineSet) Machines.get( c );
if ( s == null ) if ( s == null )
return new MachineSet( c ); return new MachineSet( c );
return s; return s;
} }
@Override @Override
public <C extends IGridCache> C getCache(Class<? extends IGridCache> iface) public <C extends IGridCache> C getCache(Class<? extends IGridCache> iface)
{ {
return (C) caches.get( iface ).myCache; return (C) caches.get( iface ).myCache;
} }
@Override @Override
public MENetworkEvent postEventTo(IGridNode node, MENetworkEvent ev) public MENetworkEvent postEventTo(IGridNode node, MENetworkEvent ev)
{ {
return bus.postEventTo( this, (GridNode) node, ev ); return bus.postEventTo( this, (GridNode) node, ev );
} }
@Override @Override
public MENetworkEvent postEvent(MENetworkEvent ev) public MENetworkEvent postEvent(MENetworkEvent ev)
{ {
return bus.postEvent( this, ev ); return bus.postEvent( this, ev );
} }
public void requestSave() public void requestSave()
{ {
myStorage.markDirty(); myStorage.markDirty();
WorldSettings.getInstance().save(); WorldSettings.getInstance().save();
} }
public void update() public void update()
{ {
// are ther any nodes left? for (IGridCache gc : caches.values())
if ( pivot != null ) {
{ // are there any nodes left?
for (IGridCache gc : caches.values()) if ( pivot != null )
{ gc.onUpdateTick();
gc.onUpdateTick(); }
} }
}
} public Iterable<GridCacheWrapper> getCacheWrappers()
{
public Iterable<GridCacheWrapper> getCacheWrappers() return caches.values();
{ }
return caches.values();
} @Override
public boolean isEmpty()
@Override {
public boolean isEmpty() return pivot == null;
{ }
return pivot == null;
} public void saveState()
{
public void saveState() for (IGridCache c : caches.values())
{ {
for (IGridCache c : caches.values()) c.populateGridStorage( myStorage );
{ }
c.populateGridStorage( myStorage ); }
}
} public void setImportantFlag(int i, boolean publicHasPower)
{
public void setImportantFlag(int i, boolean publicHasPower) int flag = 1 << i;
{ isImportant = (isImportant & ~flag) | (publicHasPower ? flag : 0);
int flag = 1 << i; }
isImportant = (isImportant & ~flag) | (publicHasPower ? flag : 0);
} }
}
me/cache/GridStorageCache.java
Vendored
+3 -1
View File
@@ -25,6 +25,7 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.me.helpers.StorageInterestManager;
import appeng.me.storage.ItemWatcher; import appeng.me.storage.ItemWatcher;
import appeng.me.storage.NetworkInventoryHandler; import appeng.me.storage.NetworkInventoryHandler;
@@ -34,7 +35,8 @@ import com.google.common.collect.SetMultimap;
public class GridStorageCache implements IStorageGrid public class GridStorageCache implements IStorageGrid
{ {
public SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create(); final private SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
final public StorageInterestManager interestManager = new StorageInterestManager( interests );
final HashSet<ICellContainer> activeCellContainers = new HashSet(); final HashSet<ICellContainer> activeCellContainers = new HashSet();
final HashSet<ICellContainer> inactiveCellContainers = new HashSet(); final HashSet<ICellContainer> inactiveCellContainers = new HashSet();
me/cache/NetworkMonitor.java
Vendored
+7 -3
View File
@@ -59,9 +59,9 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
sendEvent = true; sendEvent = true;
super.postChange( diff, src ); super.postChange( diff, src );
if ( myGridCache.interests.containsKey( diff ) ) if ( myGridCache.interestManager.containsKey( diff ) )
{ {
Set<ItemWatcher> list = myGridCache.interests.get( diff ); Set<ItemWatcher> list = myGridCache.interestManager.get( diff );
if ( !list.isEmpty() ) if ( !list.isEmpty() )
{ {
IItemList<T> myStorageList = getStorageList(); IItemList<T> myStorageList = getStorageList();
@@ -72,9 +72,13 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
fullStack = diff.copy(); fullStack = diff.copy();
fullStack.setStackSize( 0 ); fullStack.setStackSize( 0 );
} }
myGridCache.interestManager.enableTransactions();
for (ItemWatcher iw : list) for (ItemWatcher iw : list)
iw.getHost().onStackChange( myStorageList, fullStack, diff, src, getChannel() ); iw.getHost().onStackChange( myStorageList, fullStack, diff, src, getChannel() );
myGridCache.interestManager.disableTransactions();
} }
} }
me/helpers/StorageInterestManager.java
+84
View File
@@ -0,0 +1,84 @@
package appeng.me.helpers;
import java.util.LinkedList;
import java.util.Set;
import appeng.api.storage.data.IAEStack;
import appeng.me.storage.ItemWatcher;
import com.google.common.collect.SetMultimap;
public class StorageInterestManager {
class SavedTransactions {
public final boolean put;
public final IAEStack stack;
public final ItemWatcher iw;
public SavedTransactions( boolean putOperation, IAEStack myStack, ItemWatcher watcher )
{
put = putOperation;
stack = myStack;
iw = watcher;
}
};
private final SetMultimap<IAEStack, ItemWatcher> container;
private LinkedList<SavedTransactions> transactions = null;
public StorageInterestManager(SetMultimap<IAEStack, ItemWatcher> interests) {
container = interests;
}
public void enableTransactions()
{
transactions = new LinkedList();
}
public void disableTransactions()
{
LinkedList<SavedTransactions> myActions = transactions;
transactions = null;
for ( SavedTransactions t : myActions )
{
if ( t.put )
put( t.stack, t.iw );
else
remove( t.stack, t.iw );
}
}
public boolean containsKey( IAEStack stack )
{
return container.containsKey( stack );
}
public Set<ItemWatcher> get( IAEStack stack )
{
return container.get( stack );
}
public boolean put( IAEStack stack, ItemWatcher iw )
{
if ( transactions != null )
{
transactions.add( new SavedTransactions( true, stack, iw ) );
return true;
}
else
return container.put( stack, iw );
}
public boolean remove( IAEStack stack, ItemWatcher iw )
{
if ( transactions != null )
{
transactions.add( new SavedTransactions( true, stack, iw ) );
return true;
}
else
return container.remove( stack, iw );
}
}
me/storage/ItemWatcher.java
+4 -4
View File
@@ -42,7 +42,7 @@ public class ItemWatcher implements IStackWatcher
@Override @Override
public void remove() public void remove()
{ {
gsc.interests.remove( myLast, watcher ); gsc.interestManager.remove( myLast, watcher );
interestIterator.remove(); interestIterator.remove();
} }
@@ -68,7 +68,7 @@ public class ItemWatcher implements IStackWatcher
if ( myInterests.contains( e ) ) if ( myInterests.contains( e ) )
return false; return false;
return myInterests.add( e.copy() ) && gsc.interests.put( e, this ); return myInterests.add( e.copy() ) && gsc.interestManager.put( e, this );
} }
@Override @Override
@@ -88,7 +88,7 @@ public class ItemWatcher implements IStackWatcher
Iterator<IAEStack> i = myInterests.iterator(); Iterator<IAEStack> i = myInterests.iterator();
while (i.hasNext()) while (i.hasNext())
{ {
gsc.interests.remove( i.next(), this ); gsc.interestManager.remove( i.next(), this );
i.remove(); i.remove();
} }
} }
@@ -120,7 +120,7 @@ public class ItemWatcher implements IStackWatcher
@Override @Override
public boolean remove(Object o) public boolean remove(Object o)
{ {
return myInterests.remove( o ) && gsc.interests.remove( o, this ); return myInterests.remove( o ) && gsc.interestManager.remove( (IAEStack)o, this );
} }
@Override @Override