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

n-to-n p2p

Browse Source 
network monitor checks nesting by action source
This commit is contained in:
PrototypeTrousers
2021-10-28 23:49:16 -03:00
parent 3db8d0185f
commit 5e21101619
12 changed files with 268 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/NetworkMonitor.java
Vendored
+19 -20
View File
@@ -47,8 +47,8 @@ import java.util.Map.Entry;
public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
{
@Nonnull
private static final Deque<NetworkMonitor<?>> GLOBAL_DEPTH = Queues.newArrayDeque();
private static final Set<NetworkMonitor<?>> MONITORS = new HashSet<>();
private static final Set<NetworkMonitor<?>> NESTED_MONITORS = new HashSet<>();
private static final HashMap<IActionSource, Set<NetworkMonitor<?>>> sourceSetHashMap = new HashMap<>();
protected static boolean nested = false;
protected boolean isNested = false;
@@ -137,17 +137,16 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
return 0;
}
public long incGridCurrentCount(long count)
public void incGridCurrentCount( long count )
{
if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
{
return gridItemCount += count;
gridItemCount += count;
}
else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
{
return gridFluidCount += count;
gridFluidCount += count;
}
return 0;
}
@Nonnull
@@ -230,15 +229,16 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
{
if( MONITORS.contains( this ) )
if( sourceSetHashMap.get( src ) != null && sourceSetHashMap.get( src ).contains( this ) )
{
NESTED_MONITORS.add( this );
nested = true;
return;
}
MONITORS.add( this );
GLOBAL_DEPTH.push( this );
sourceSetHashMap.putIfAbsent( src, new HashSet<>() );
sourceSetHashMap.get( src ).add( this );
this.sendEvent = true;
@@ -282,21 +282,20 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
this.notifyListenersOfChange( changes, src );
final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
if( GLOBAL_DEPTH.isEmpty() )
sourceSetHashMap.get( src ).remove( this );
if( sourceSetHashMap.get( src ).isEmpty() )
{
for( NetworkMonitor<?> nm : MONITORS )
sourceSetHashMap.remove( src );
}
if( sourceSetHashMap.isEmpty() )
{
for( NetworkMonitor<?> nm : NESTED_MONITORS )
{
nm.setupForceUpdate();
}
nested = false;
MONITORS.clear();
}
if( last != this )
{
throw new IllegalStateException( "Invalid Access to Networked Storage API detected." );
NESTED_MONITORS.clear();
}
}
src/main/java/appeng/me/cache/P2PCache.java
Vendored
+56 -17
View File
@@ -19,7 +19,7 @@
package appeng.me.cache;
import java.util.HashMap;
import java.util.Collection;
import java.util.Random;
import com.google.common.collect.LinkedHashMultimap;
@@ -46,7 +46,7 @@ public class P2PCache implements IGridCache
private static final TunnelCollection<PartP2PTunnel> NULL_COLLECTION = new TunnelCollection<PartP2PTunnel>( null, null );
private final IGrid myGrid;
private final HashMap<Short, PartP2PTunnel> inputs = new HashMap<>();
private final Multimap<Short, PartP2PTunnel> inputs = LinkedHashMultimap.create();
private final Multimap<Short, PartP2PTunnel> outputs = LinkedHashMultimap.create();
private final Random frequencyGenerator;
@@ -110,10 +110,19 @@ public class P2PCache implements IGridCache
}
else
{
this.inputs.remove( t.getFrequency() );
this.inputs.remove( t.getFrequency(), t );
}
this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
if( this.inputs.get( t.getFrequency() ).isEmpty() )
{
this.inputs.removeAll( t.getFrequency() );
}
if( this.outputs.get( t.getFrequency() ).isEmpty() )
{
this.outputs.removeAll( t.getFrequency() );
}
this.updateTunnel( t.getFrequency(), t.isOutput(), false );
}
}
@@ -142,7 +151,7 @@ public class P2PCache implements IGridCache
this.inputs.put( t.getFrequency(), t );
}
this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
this.updateTunnel( t.getFrequency(), t.isOutput(), false );
}
}
@@ -164,6 +173,20 @@ public class P2PCache implements IGridCache
}
public void removeTunnel( final PartP2PTunnel t, short freq )
{
this.outputs.remove( freq, t );
this.inputs.remove( freq, t );
if( this.inputs.get( t.getFrequency() ).isEmpty() )
{
this.inputs.removeAll( t.getFrequency() );
}
if( this.outputs.get( t.getFrequency() ).isEmpty() )
{
this.outputs.removeAll( t.getFrequency() );
}
}
private void updateTunnel( final short freq, final boolean updateOutputs, final boolean configChange )
{
for( final PartP2PTunnel p : this.outputs.get( freq ) )
@@ -175,8 +198,7 @@ public class P2PCache implements IGridCache
p.onTunnelNetworkChange();
}
final PartP2PTunnel in = this.inputs.get( freq );
if( in != null )
for( final PartP2PTunnel in : this.inputs.get( freq ) )
{
if( configChange )
{
@@ -195,7 +217,7 @@ public class P2PCache implements IGridCache
if( this.inputs.containsValue( t ) )
{
this.inputs.remove( t.getFrequency() );
this.inputs.remove( t.getFrequency(), t );
}
t.setFrequency( newFrequency );
@@ -211,7 +233,6 @@ public class P2PCache implements IGridCache
// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq );
this.updateTunnel( t.getFrequency(), t.isOutput(), true );
this.updateTunnel( t.getFrequency(), !t.isOutput(), true );
}
public short newFrequency()
@@ -236,25 +257,43 @@ public class P2PCache implements IGridCache
public TunnelCollection<PartP2PTunnel> getOutputs( final short freq, final Class<? extends PartP2PTunnel> c )
{
final PartP2PTunnel in = this.inputs.get( freq );
Collection<PartP2PTunnel> in = this.inputs.get( freq );
if( in == null )
{
return NULL_COLLECTION;
}
final TunnelCollection<PartP2PTunnel> out = this.inputs.get( freq ).getCollection( this.outputs.get( freq ), c );
TunnelCollection<PartP2PTunnel> out;
for( PartP2PTunnel part : this.inputs.get( freq ) )
{
out = part.getCollection( this.outputs.get( freq ), c );
if( out != null )
{
return out;
}
}
return NULL_COLLECTION;
}
public TunnelCollection<PartP2PTunnel> getInputs( final short freq, final Class<? extends PartP2PTunnel> c )
{
Collection<PartP2PTunnel> out = this.outputs.get( freq );
if( out == null )
{
return NULL_COLLECTION;
}
return out;
}
public PartP2PTunnel getInput( final short freq )
{
return this.inputs.get( freq );
TunnelCollection<PartP2PTunnel> in;
for( PartP2PTunnel part : this.outputs.get( freq ) )
{
in = part.getCollection( this.inputs.get( freq ), c );
if( in != null )
{
return in;
}
}
return NULL_COLLECTION;
}
}