hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in simulation runner ThreadPoolExecutor

Browse Source
This commit is contained in:
Sampo Niskanen 2012-04-09 07:51:42 +00:00
parent 7902b9e3c5
commit 898c024cb7
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/ChangeLog
View File

@ -1,3 +1,7 @@
2012-04-09 Sampo Niskanen
* [BUG] Cancelling simulation causes later simulations to fail
2012-03-27 Sampo Niskanen 2012-03-27 Sampo Niskanen
* [BUG] Inputting negative rotation angle values of components * [BUG] Inputting negative rotation angle values of components

31
core/src/net/sf/openrocket/gui/main/SimulationRunDialog.java
View File

@ -10,8 +10,11 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JDialog; import javax.swing.JDialog;
@ -58,8 +61,28 @@ public class SimulationRunDialog extends JDialog {
private static final double APOGEE_PROGRESS = 0.7; private static final double APOGEE_PROGRESS = 0.7;
private final static ExecutorService executor = Executors.newFixedThreadPool( /**
SwingPreferences.getMaxThreadCount()); * A single ThreadPoolExecutor that will be used for all simulations.
* This executor must not be shut down.
*/
private static final ThreadPoolExecutor executor;
static {
int n = SwingPreferences.getMaxThreadCount();
executor = new ThreadPoolExecutor(n, n,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(),
new ThreadFactory() {
private ThreadFactory factory = Executors.defaultThreadFactory();
@Override
public Thread newThread(Runnable r) {
Thread t = factory.newThread(r);
t.setDaemon(true);
return t;
}
});
}
private final JLabel simLabel, timeLabel, altLabel, velLabel; private final JLabel simLabel, timeLabel, altLabel, velLabel;
@ -172,10 +195,10 @@ public class SimulationRunDialog extends JDialog {
* the Cancel button on the dialog. * the Cancel button on the dialog.
*/ */
public void cancelSimulations() { public void cancelSimulations() {
executor.shutdownNow();
for (SimulationWorker w : simulationWorkers) { for (SimulationWorker w : simulationWorkers) {
w.cancel(true); w.cancel(true);
} }
executor.purge();
} }