mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-05-08 10:24:12 +00:00
Code Issues Releases Wiki Activity

Rethrow/retrigger interrupted status where appropriate

Browse Source
This commit is contained in:
SquidDev 2017-05-10 11:17:44 +01:00
parent 85c556d324
commit 5f323a85a7
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/dan200/computercraft/core/computer/ComputerThread.java
View File

@ -93,6 +93,13 @@ public class ComputerThread
} }
} }
} }
synchronized( s_taskLock )
{
s_computerTaskQueues.clear();
s_computerTasksActive.clear();
s_computerTasksActiveSet.clear();
}
} }
/** /**
@ -157,10 +164,11 @@ public class ComputerThread
} }
catch( InterruptedException ignored ) catch( InterruptedException ignored )
{ {
Thread.currentThread().interrupt();
} }
} }
private void execute( BlockingQueue<ITask> queue ) private void execute( BlockingQueue<ITask> queue ) throws InterruptedException
{ {
ITask task = queue.remove(); ITask task = queue.remove();
@ -207,20 +215,19 @@ public class ComputerThread
} }
} }
} }
catch( InterruptedException ignored ) finally
{ {
} // Re-add it back onto the queue or remove it
synchronized( s_taskLock )
// Re-add it back onto the queue or remove it
synchronized( s_taskLock )
{
if( queue.isEmpty() )
{ {
s_computerTasksActiveSet.remove( queue ); if( queue.isEmpty() )
} {
else s_computerTasksActiveSet.remove( queue );
{ }
s_computerTasksActive.add( queue ); else
{
s_computerTasksActive.add( queue );
}
} }
} }
} }
@ -248,7 +255,7 @@ public class ComputerThread
{ {
task.execute(); task.execute();
} }
catch( Throwable e ) catch( RuntimeException e )
{ {
ComputerCraft.log.error( "Error running task.", e ); ComputerCraft.log.error( "Error running task.", e );
} }
@ -259,6 +266,7 @@ public class ComputerThread
catch( InterruptedException e ) catch( InterruptedException e )
{ {
ComputerCraft.log.error( "Error running task.", e ); ComputerCraft.log.error( "Error running task.", e );
Thread.currentThread().interrupt();
} }
} }