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

JETTY-1184 shrink thread pool even with frequent small jobs 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1277 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-02-19 00:05:46 +00:00
parent 92c61e18c7
commit daca96cb67
3 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -29,6 +29,7 @@ jetty-7.0.2-SNAPSHOT
+ JETTY-1157 Don't hold array passed in write(byte[])
+ JETTY-1177 Allow error handler to set cacheControl
+ JETTY-1179 Persistant session tables created on MySQL use wrong datatype
+ JETTY-1184 shrink thread pool even with frequent small jobs
+ COMETD-46 reset ContentExchange response content on resend
jetty-7.0.1.v20091125 25 November 2009

26
jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
View File

@ -449,25 +449,21 @@ public class QueuedThreadPool extends AbstractLifeCycle implements ThreadPool, E
job=_jobs.take();
else
{
job=_jobs.poll(_maxIdleTimeMs,TimeUnit.MILLISECONDS);
if (job==null)
// maybe we should shrink?
final int size=_threadsStarted.get();
if (size>_minThreads)
{
// maybe we should shrink?
final int size=_threadsStarted.get();
if (size>_minThreads)
long last=_lastShrink.get();
long now=System.currentTimeMillis();
if (last==0 || (now-last)>_maxIdleTimeMs)
{
long last=_lastShrink.get();
long now=System.currentTimeMillis();
if (last==0 || (now-last)>_maxIdleTimeMs)
{
shrink=_lastShrink.compareAndSet(last,now) &&
_threadsStarted.compareAndSet(size,size-1);
if (shrink)
return;
}
shrink=_lastShrink.compareAndSet(last,now) &&
_threadsStarted.compareAndSet(size,size-1);
if (shrink)
return;
}
}
job=_jobs.poll(_maxIdleTimeMs,TimeUnit.MILLISECONDS);
}
}
}

77
jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java
View File

@ -21,8 +21,9 @@ import junit.framework.TestCase;
public class QueuedThreadPoolTest extends TestCase
{
final AtomicInteger _jobs=new AtomicInteger();
volatile long _sleep=100;
class Job implements Runnable
class RunningJob implements Runnable
{
public volatile boolean _running=true;
public void run()
@ -30,7 +31,7 @@ public class QueuedThreadPoolTest extends TestCase
try
{
while(_running)
Thread.sleep(100);
Thread.sleep(_sleep);
}
catch(Exception e)
{
@ -39,10 +40,13 @@ public class QueuedThreadPoolTest extends TestCase
_jobs.incrementAndGet();
}
};
};
public void testThreadPool() throws Exception
{
_sleep=100;
QueuedThreadPool tp= new QueuedThreadPool();
tp.setMinThreads(5);
tp.setMaxThreads(10);
@ -57,7 +61,7 @@ public class QueuedThreadPoolTest extends TestCase
assertEquals(5,tp.getThreads());
assertEquals(5,tp.getIdleThreads());
Job job=new Job();
RunningJob job=new RunningJob();
tp.dispatch(job);
Thread.sleep(200);
assertEquals(5,tp.getThreads());
@ -67,10 +71,10 @@ public class QueuedThreadPoolTest extends TestCase
assertEquals(5,tp.getThreads());
assertEquals(5,tp.getIdleThreads());
Job[] jobs = new Job[5];
RunningJob[] jobs = new RunningJob[5];
for (int i=0;i<jobs.length;i++)
{
jobs[i]=new Job();
jobs[i]=new RunningJob();
tp.dispatch(jobs[i]);
}
Thread.sleep(200);
@ -78,7 +82,7 @@ public class QueuedThreadPoolTest extends TestCase
Thread.sleep(1000);
assertEquals(5,tp.getThreads());
job=new Job();
job=new RunningJob();
tp.dispatch(job);
assertEquals(6,tp.getThreads());
@ -100,10 +104,10 @@ public class QueuedThreadPoolTest extends TestCase
assertEquals(5,tp.getThreads());
jobs = new Job[15];
jobs = new RunningJob[15];
for (int i=0;i<jobs.length;i++)
{
jobs[i]=new Job();
jobs[i]=new RunningJob();
tp.dispatch(jobs[i]);
}
assertEquals(10,tp.getThreads());
@ -128,10 +132,63 @@ public class QueuedThreadPoolTest extends TestCase
tp.stop();
}
public void testShrink() throws Exception
{
Runnable job = new Runnable()
{
public void run()
{
try
{
Thread.sleep(_sleep);
}
catch(Exception e)
{
e.printStackTrace();
}
}
};
QueuedThreadPool tp= new QueuedThreadPool();
tp.setMinThreads(2);
tp.setMaxThreads(10);
tp.setMaxIdleTimeMs(400);
tp.setThreadsPriority(Thread.NORM_PRIORITY-1);
tp.start();
Thread.sleep(100);
assertEquals(2,tp.getThreads());
assertEquals(2,tp.getIdleThreads());
_sleep=200;
tp.dispatch(job);
tp.dispatch(job);
for (int i=0;i<20;i++)
tp.dispatch(job);
Thread.sleep(100);
assertEquals(10,tp.getThreads());
assertEquals(0,tp.getIdleThreads());
_sleep=1;
for (int i=0;i<500;i++)
{
tp.dispatch(job);
Thread.sleep(10);
if (i%100==0)
{
System.err.println(i+" threads="+tp.getThreads()+" idle="+tp.getIdleThreads());
}
}
System.err.println("500 threads="+tp.getThreads()+" idle="+tp.getIdleThreads());
assertEquals(2,tp.getThreads());
assertEquals(2,tp.getIdleThreads());
}
public void testMaxStopTime() throws Exception
{
_sleep=100;
QueuedThreadPool tp= new QueuedThreadPool();
tp.setMaxStopTimeMs(500);
tp.start();