tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Rolled back "Replaced Network Change Event Pipeline, should be more effective." it broke things.

Browse source
This commit is contained in:
AlgorithmX2 2014-09-10 17:51:56 -05:00
parent 7b28f58aca
commit 8363aa4310
1 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
me/cache/NetworkMonitor.java vendored
View file

@ -1,11 +1,14 @@
package appeng.me.cache; package appeng.me.cache;
import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import appeng.api.networking.events.MENetworkStorageEvent; import appeng.api.networking.events.MENetworkStorageEvent;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.MEMonitorHandler; import appeng.api.storage.MEMonitorHandler;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
@ -23,7 +26,18 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
public void forceUpdate() public void forceUpdate()
{ {
hasChanged = true; hasChanged = true;
sendEvent = true;
Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = getListeners();
while (i.hasNext())
{
Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
IMEMonitorHandlerReceiver<T> recv = o.getKey();
if ( recv.isValid( o.getValue() ) )
recv.onListUpdate();
else
i.remove();
}
} }
public NetworkMonitor(GridStorageCache cache, StorageChannel chan) { public NetworkMonitor(GridStorageCache cache, StorageChannel chan) {
@ -32,27 +46,45 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
myChannel = chan; myChannel = chan;
} }
final private LinkedList<ChangeRecord<T>> changes = new LinkedList(); final static public LinkedList depth = new LinkedList();
class ChangeRecord<G extends IAEStack<T>>
{
public ChangeRecord(G diff2, BaseActionSource src2) {
diff = diff2;
src = src2;
}
G diff;
BaseActionSource src;
};
@Override @Override
protected void postChange(T diff, BaseActionSource src) protected void postChange(T diff, BaseActionSource src)
{ {
if ( depth.contains( this ) )
return;
depth.push( this );
sendEvent = true; sendEvent = true;
hasChanged = true; super.postChange( diff, src );
changes.add( new ChangeRecord( diff, src ) );
if ( myGridCache.interestManager.containsKey( diff ) )
{
Set<ItemWatcher> list = myGridCache.interestManager.get( diff );
if ( !list.isEmpty() )
{
IItemList<T> myStorageList = getStorageList();
IAEStack fullStack = myStorageList.findPrecise( diff );
if ( fullStack == null )
{
fullStack = diff.copy();
fullStack.setStackSize( 0 );
}
myGridCache.interestManager.enableTransactions();
for (ItemWatcher iw : list)
iw.getHost().onStackChange( myStorageList, fullStack, diff, src, getChannel() );
myGridCache.interestManager.disableTransactions();
}
}
Object last = depth.pop();
if ( last != this )
throw new RuntimeException( "Invalid Access to Networked Storage API detected." );
} }
public void onTick() public void onTick()
@ -60,39 +92,6 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
if ( sendEvent ) if ( sendEvent )
{ {
sendEvent = false; sendEvent = false;
ChangeRecord<T> cr;
while ( (cr=changes.poll()) != null )
{
T diff = cr.diff;
BaseActionSource src = cr.src;
IItemList<T> myStorageList = getStorageList();
postChangeToListeners( diff, src );
if ( myGridCache.interestManager.containsKey( diff ) )
{
Set<ItemWatcher> list = myGridCache.interestManager.get( diff );
if ( !list.isEmpty() )
{
IAEStack fullStack = myStorageList.findPrecise( diff );
if ( fullStack == null )
{
fullStack = diff.copy();
fullStack.setStackSize( 0 );
}
myGridCache.interestManager.enableTransactions();
for (ItemWatcher iw : list)
iw.getHost().onStackChange( myStorageList, fullStack, diff, src, getChannel() );
myGridCache.interestManager.disableTransactions();
}
}
}
myGridCache.myGrid.postEvent( new MENetworkStorageEvent( this, myChannel ) ); myGridCache.myGrid.postEvent( new MENetworkStorageEvent( this, myChannel ) );
} }
} }