Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Greg Wilkins 2017-03-17 14:52:49 +11:00
parent c1d92ebde6
commit 0b2b9ea187
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java
View File

@ -170,8 +170,8 @@ public class EatWhatYouKill extends AbstractLifeCycle implements ExecutionStrate
if (_pendingProducersSignalled==0) if (_pendingProducersSignalled==0)
{ {
// spurious wakeup! // spurious wakeup!
if (isRunning()) if (LOG.isDebugEnabled() && isRunning())
System.err.println("SPURIOUS!!!!!!!!!!!!!!!!!"); LOG.debug("{} SPURIOUS WAKEUP",this);
_pendingProducers--; _pendingProducers--;
} }
else else
@ -210,7 +210,7 @@ public class EatWhatYouKill extends AbstractLifeCycle implements ExecutionStrate
LOG.debug("{} produced {}", this, task); LOG.debug("{} produced {}", this, task);
boolean may_block_caller = !Invocable.isNonBlockingInvocation(); boolean may_block_caller = !Invocable.isNonBlockingInvocation();
boolean dispatch_new_producer; boolean new_pending_producer;
boolean run_task_ourselves; boolean run_task_ourselves;
boolean keep_producing; boolean keep_producing;
@ -232,20 +232,20 @@ public class EatWhatYouKill extends AbstractLifeCycle implements ExecutionStrate
break producing; break producing;
} }
// Will we eat our own kill? // Will we eat our own kill - ie consume the task we just produced?
if (Invocable.getInvocationType(task)==InvocationType.NON_BLOCKING) if (Invocable.getInvocationType(task)==InvocationType.NON_BLOCKING)
{ {
// ProduceConsume // ProduceConsume
run_task_ourselves = true; run_task_ourselves = true;
keep_producing = true; keep_producing = true;
dispatch_new_producer = false; new_pending_producer = false;
} }
else if (may_block_caller && (_pendingProducers>0 || _pendingProducersMax==0)) else if (may_block_caller && (_pendingProducers>0 || _pendingProducersMax==0))
{ {
// ExecuteProduceConsume (eat what we kill!) // ExecuteProduceConsume (eat what we kill!)
run_task_ourselves = true; run_task_ourselves = true;
keep_producing = false; keep_producing = false;
dispatch_new_producer = true; new_pending_producer = true;
_pendingProducersDispatched++; _pendingProducersDispatched++;
_state = State.IDLE; _state = State.IDLE;
_pendingProducers--; _pendingProducers--;
@ -257,15 +257,15 @@ public class EatWhatYouKill extends AbstractLifeCycle implements ExecutionStrate
// ProduceExecuteConsume // ProduceExecuteConsume
keep_producing = true; keep_producing = true;
run_task_ourselves = false; run_task_ourselves = false;
dispatch_new_producer = (_pendingProducersDispatched + _pendingProducers)<_pendingProducersMax; new_pending_producer = (_pendingProducersDispatched + _pendingProducers)<_pendingProducersMax;
if (dispatch_new_producer) if (new_pending_producer)
_pendingProducersDispatched++; _pendingProducersDispatched++;
} }
} }
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} mbc={} dnp={} run={} kp={}", this,may_block_caller,dispatch_new_producer,run_task_ourselves,keep_producing); LOG.debug("{} mbc={} dnp={} run={} kp={}", this,may_block_caller,new_pending_producer,run_task_ourselves,keep_producing);
if (dispatch_new_producer) if (new_pending_producer)
// Spawn a new thread to continue production by running the produce loop. // Spawn a new thread to continue production by running the produce loop.
_executor.execute(this); _executor.execute(this);