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

Fixed Dead Lock + Refractor of Compass Service.

Browse source
This commit is contained in:
AlgorithmX2 2014-03-10 23:33:55 -05:00
parent d5748eb804
commit a61b1525f0
3 changed files with 155 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/WorldSettings.java
View file

@ -37,7 +37,6 @@ public class WorldSettings extends Configuration
AEFolder = aeFolder;
compass = new CompassService( AEFolder );
(new Thread( compass, "AE Compass Service" )).start();
for (int dimID : get( "DimensionManager", "StorageCells", new int[0] ).getIntList())
{

31
hooks/MeteoriteWorldGen.java
View file

@ -1,10 +1,13 @@
package appeng.hooks;
import java.util.Random;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import appeng.api.util.DimensionalCoord;
import appeng.core.AELog;
import appeng.core.WorldSettings;
import appeng.helpers.MeteoritePlacer;
import appeng.services.helpers.ICompassCallback;
@ -25,11 +28,6 @@ final public class MeteoriteWorldGen implements IWorldGenerator
distance = dist;
else
distance = Double.MAX_VALUE;
synchronized (this)
{
notify();
}
}
};
@ -43,21 +41,12 @@ final public class MeteoriteWorldGen implements IWorldGenerator
int z = r.nextInt( 16 ) + (chunkZ << 4);
myGen obj = new myGen();
WorldSettings.getInstance().getCompass().getCompassDirection( new DimensionalCoord( w, x, 128, z ), 70, obj );
Future<?> future = WorldSettings.getInstance().getCompass().getCompassDirection( new DimensionalCoord( w, x, 128, z ), 70, obj );
synchronized (obj)
{
try
{
obj.wait();
}
catch (InterruptedException e)
{
// meh
return;
}
}
future.get();
if ( obj.distance > 1000 * 500 )
{
@ -77,5 +66,15 @@ final public class MeteoriteWorldGen implements IWorldGenerator
}
}
catch (InterruptedException e)
{
AELog.error( e );
}
catch (ExecutionException e)
{
AELog.error( e );
}
}
}
}

286
services/CompassService.java
View file

@ -2,35 +2,23 @@ package appeng.services;
import java.io.File;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.util.DimensionalCoord;
import appeng.services.helpers.CompassException;
import appeng.services.helpers.CompassReader;
import appeng.services.helpers.ICompassCallback;
public class CompassService implements Runnable
public class CompassService implements ThreadFactory
{
private class CompassMessage
{
public boolean isUpdate()
{
return false;
}
public boolean isRequest()
{
return false;
}
};
private class CMUpdatePost extends CompassMessage
private class CMUpdatePost implements Runnable
{
public final World world;
@ -39,12 +27,6 @@ public class CompassService implements Runnable
public final int doubleChunkY; // 32 blocks instead of 16.
public final boolean value;
@Override
public boolean isUpdate()
{
return true;
}
public CMUpdatePost(World w, int cx, int cz, int dcy, boolean val) {
world = w;
chunkX = cx;
@ -52,145 +34,47 @@ public class CompassService implements Runnable
chunkZ = cz;
value = val;
}
@Override
public void run()
{
CompassReader cr = getReader( world );
cr.setHasBeacon( chunkX, chunkZ, doubleChunkY, value );
cr.close();
}
};
private class CMDirectionRequest extends CompassMessage
private class CMDirectionRequest implements Runnable
{
public final int maxRange;
public final DimensionalCoord coord;
public final ICompassCallback callback;
@Override
public boolean isRequest()
{
return true;
}
public CMDirectionRequest(DimensionalCoord coord, int getMaxRange, ICompassCallback cc) {
this.coord = coord;
this.maxRange = getMaxRange;
callback = cc;
}
};
private LinkedList<CompassMessage> jobList = new LinkedList();
public void updateArea(World w, int x, int y, int z)
@Override
public void run()
{
int cx = x >> 4;
int cdy = y >> 5;
int cz = z >> 4;
int cx = coord.x >> 4;
int cz = coord.z >> 4;
int low_x = cx << 4;
int low_z = cz << 4;
int low_y = cdy << 5;
int hi_x = low_x + 16;
int hi_z = low_z + 16;
int hi_y = low_y + 32;
Block skystone = AEApi.instance().blocks().blockSkyStone.block();
for (int i = low_x; i < hi_x; i++)
{
for (int j = low_z; j < hi_z; j++)
{
for (int k = low_y; k < hi_y; k++)
{
Block blk = w.getBlock( i, k, j );
if ( blk == skystone && w.getBlockMetadata( i, k, j ) == 0 )
{
postJob( new CMUpdatePost( w, cx, cz, cdy, true ) );
return;
}
}
}
}
postJob( new CMUpdatePost( w, cx, cz, cdy, false ) );
}
public void getCompassDirection(DimensionalCoord coord, int maxRange, ICompassCallback cc)
{
postJob( new CMDirectionRequest( coord, maxRange, cc ) );
}
private void postJob(CompassMessage msg)
{
synchronized (jobList)
{
if ( msg != null )
jobList.offer( msg );
jobList.notify();
}
}
private CompassMessage getNextMessage()
{
CompassMessage myMsg = null;
while (myMsg == null && run)
{
synchronized (jobList)
{
try
{
myMsg = jobList.poll();
overOberdened = jobList.isEmpty();
if ( myMsg == null )
jobList.wait();
}
catch (InterruptedException e)
{
// :P
}
}
}
return myMsg;
}
boolean overOberdened = false;
HashMap<World, CompassReader> worldSet = new HashMap();
final File rootFolder;
public CompassService(File aEFolder) {
rootFolder = aEFolder;
}
public CompassReader getReader(World w)
{
CompassReader cr = worldSet.get( w );
if ( cr == null )
{
cr = new CompassReader( w, rootFolder );
worldSet.put( w, cr );
}
return cr;
}
private void processRequest(CMDirectionRequest req)
{
int cx = req.coord.x >> 4;
int cz = req.coord.z >> 4;
CompassReader cr = getReader( req.coord.getWorld() );
CompassReader cr = getReader( coord.getWorld() );
// Am I standing on it?
if ( cr.hasBeacon( cx, cz ) )
{
req.callback.calculatedDirection( true, true, -999, 0 );
callback.calculatedDirection( true, true, -999, 0 );
return;
}
// spiral outward...
for (int offset = 1; offset < req.maxRange; offset++)
for (int offset = 1; offset < maxRange; offset++)
{
int minx = cx - offset;
int minz = cz - offset;
@ -253,17 +137,76 @@ public class CompassService implements Runnable
if ( closest < Integer.MAX_VALUE )
{
req.callback.calculatedDirection( true, false, rad( cx, cz, chosen_x, chosen_z ), dist( cx, cz, chosen_x, chosen_z ) );
if ( !overOberdened )
cr.close();
callback.calculatedDirection( true, false, rad( cx, cz, chosen_x, chosen_z ), dist( cx, cz, chosen_x, chosen_z ) );
return;
}
}
// didn't find shit...
req.callback.calculatedDirection( false, true, -999, 999 );
if ( !overOberdened )
cr.close();
callback.calculatedDirection( false, true, -999, 999 );
}
};
public Future<?> getCompassDirection(DimensionalCoord coord, int maxRange, ICompassCallback cc)
{
return executor.submit( new CMDirectionRequest( coord, maxRange, cc ) );
}
public Future<?> updateArea(World w, int x, int y, int z)
{
int cx = x >> 4;
int cdy = y >> 5;
int cz = z >> 4;
int low_x = cx << 4;
int low_z = cz << 4;
int low_y = cdy << 5;
int hi_x = low_x + 16;
int hi_z = low_z + 16;
int hi_y = low_y + 32;
Block skystone = AEApi.instance().blocks().blockSkyStone.block();
for (int i = low_x; i < hi_x; i++)
{
for (int j = low_z; j < hi_z; j++)
{
for (int k = low_y; k < hi_y; k++)
{
Block blk = w.getBlock( i, k, j );
if ( blk == skystone && w.getBlockMetadata( i, k, j ) == 0 )
{
return executor.submit( new CMUpdatePost( w, cx, cz, cdy, true ) );
}
}
}
}
return executor.submit( new CMUpdatePost( w, cx, cz, cdy, false ) );
}
HashMap<World, CompassReader> worldSet = new HashMap();
ExecutorService executor;
final File rootFolder;
public CompassService(File aEFolder) {
rootFolder = aEFolder;
executor = Executors.newSingleThreadExecutor( this );
}
private CompassReader getReader(World w)
{
CompassReader cr = worldSet.get( w );
if ( cr == null )
{
cr = new CompassReader( w, rootFolder );
worldSet.put( w, cr );
}
return cr;
}
private int dist(int ax, int az, int bx, int bz)
@ -282,58 +225,23 @@ public class CompassService implements Runnable
return Math.atan2( -up, side ) - Math.PI / 2.0;
}
private void processUpdate(CMUpdatePost req)
{
CompassReader cr = getReader( req.world );
cr.setHasBeacon( req.chunkX, req.chunkZ, req.doubleChunkY, req.value );
cr.close();
}
boolean run = true;
boolean stopped = false;
@Override
public void run()
{
while (run)
{
CompassMessage myMsg = getNextMessage();
try
{
if ( myMsg != null )
{
if ( myMsg.isRequest() )
processRequest( (CMDirectionRequest) myMsg );
else if ( myMsg.isUpdate() )
processUpdate( (CMUpdatePost) myMsg );
}
}
catch (CompassException ce)
{
ce.inner.printStackTrace();
}
}
stopped = true;
}
public void kill()
{
run = false;
postJob( null );
executor.shutdown();
while (!stopped)
{
try
{
Thread.sleep( 100 );
executor.awaitTermination( 6, TimeUnit.MINUTES );
}
catch (InterruptedException e)
{
// :P
// wrap this up..
}
}
@Override
public Thread newThread(Runnable job)
{
return new Thread( job, "AE Compass Service" );
}
}