mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 17:33:38 +00:00
Code Issues Projects Releases Wiki Activity

[java] Run finalisers only if main/2 returns normally

Browse Source 
finalisers should be executed only if main/2 returns normally, it does not
throw an exception.  The C backends already do this correctly but the Java
backend did not.  The C# backend has the same bug, this patch does not fix
the C# backend.

java/runtime/MercuryThreadPool.java:
    Add a parameter to the shutdown() method to specify whether the backend
    is aborting.

    In runMain(), run finalisers only if the runtime is exiting normally.

java/runtime/MercuryRuntime.java:
    Add a new finalise() method that takes a parameter allowing standalone
    Java applications to specify whether or not they are aborting when the
    finalise the RTS.

doc/reference_manual.texi:
    Specify the behaviour of finalise directives if main/2 terminates
    with an uncaught exception.

samples/java_interface/standalone_java/JavaMain.java:
    Conform to changes in MercuryRuntime.java.
This commit is contained in:
Paul Bone
2014-12-29 22:34:15 +11:00
parent c60aab937b
commit 21fb0a74fc
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/runtime/MercuryThreadPool.java
View File

@@ -93,6 +93,9 @@ public class MercuryThreadPool
// Has a shutdown request been received (protected by tasks_lock)
private boolean shutdown_request;
// Shutdown because the program is aborting (if true then don't run
// finalisers).
private boolean shutdown_abort;
// True if worker threads should exit (the pool is shutting down).
private boolean shutdown_now;
// True if the thread pool is running (including starting up and
@@ -129,6 +132,7 @@ public class MercuryThreadPool
*/
tasks = new ArrayDeque<Task>(size*4);
shutdown_request = false;
shutdown_abort = false;
shutdown_now = false;
running = false;
num_tasks_submitted = 0;
@@ -495,7 +499,8 @@ public class MercuryThreadPool
num_tasks_submitted = this.num_tasks_submitted;
num_tasks_completed = this.num_tasks_completed;
okay_to_shutdown =
(num_tasks_submitted == num_tasks_completed);
(num_tasks_submitted == num_tasks_completed) ||
shutdown_abort;
will_shutdown = okay_to_shutdown && shutdown_request;
if (!will_shutdown) {
@@ -648,12 +653,13 @@ public class MercuryThreadPool
* This method is asynchronous, it will not wait for the thread pool to
* shutdown.
*/
public boolean shutdown()
public boolean shutdown(boolean abort)
{
tasks_lock.lock();
try {
if (running && !shutdown_request) {
shutdown_request = true;
shutdown_abort = abort;
} else {
return false;
}
@@ -676,10 +682,13 @@ public class MercuryThreadPool
run_main_and_shutdown = new Runnable() {
public void run() {
boolean aborted = true;
try {
run_main.run();
aborted = false;
} finally {
shutdown();
shutdown(aborted);
}
}
};
@@ -703,7 +712,9 @@ public class MercuryThreadPool
* until the program is finished
*/
run();
jmercury.runtime.JavaInternal.run_finalisers();
if (!shutdown_abort) {
jmercury.runtime.JavaInternal.run_finalisers();
}
/*
* We always wait for the thread pool to shutdown as worker
* threads may either be completing work or reporting the reason