Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Executor service instead of thread #162

Merged
merged 9 commits into from
Mar 10, 2017
Merged

Executor service instead of thread #162

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5f10d5
replace Thread with ExecutorService
xiangyushawn Feb 27, 2017
72d596b
if ExecutorService is shutdown already, reset it
xiangyushawn Feb 27, 2017
2979464
use futures and set threads as Daemon
xiangyushawn Feb 28, 2017
585c0b5
thread can be interrupted
xiangyushawn Mar 1, 2017
4e46838
group TimeoutTimer threads
xiangyushawn Mar 1, 2017
ff2d811
added Connection Pool test cases
xiangyushawn Mar 4, 2017
ba54360
close datasource, test setQueryTimeout(), count number of threads
xiangyushawn Mar 7, 2017
1780179
add java docs for tests
xiangyushawn Mar 10, 2017
a9d41cc
add class level java doc
xiangyushawn Mar 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
import java.util.Set;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -6824,7 +6826,7 @@ final void TryProcessFeatureExtAck(boolean featureExtAckReceived) throws SQLServ
final class TimeoutTimer implements Runnable {
private final int timeoutSeconds;
private final TDSCommand command;
private Thread timerThread;
private ExecutorService executor = Executors.newCachedThreadPool();
private volatile boolean canceled = false;

TimeoutTimer(int timeoutSeconds,
Expand All @@ -6837,17 +6839,19 @@ final class TimeoutTimer implements Runnable {
}

final void start() {
timerThread = new Thread(this);
timerThread.setDaemon(true);
timerThread.start();
//if ExecutorService is shutdown already, reset it
if(executor.isShutdown()){
executor = Executors.newCachedThreadPool();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The executor does not create daemon Threads by default, thus the result may be a little different.

I would probably use a thread factory as a parameter that use daemon threads.

}
executor.execute(this);
}

final void stop() {
executor.shutdownNow();
canceled = true;
timerThread.interrupt();
}

public void run() {
public void run() {
int secondsRemaining = timeoutSeconds;
try {
// Poll every second while time is left on the timer.
Expand Down