Skip to content

[GR-64194] Invoke teardown hooks in Shutdown#exit substitution. #11034

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

Closed
wants to merge 1 commit into from
Closed

[GR-64194] Invoke teardown hooks in Shutdown#exit substitution. #11034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions ...ratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_Shutdown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,29 @@ static void beforeHalt() {
private static void logRuntimeExit(int status) {
// Disable exit logging (GR-45418/JDK-8301627)
}

@Alias
static native void runHooks();

@Alias
static native void halt(int status);

/**
* This substitution makes a few modifications to {@code Shutdown#exit}:
* <ul>
* <li>it omits {@code logRuntimeExit} (exit logging is disabled: GR-45418/JDK-8301627).</li>
* <li>it omits {@code beforeHalt} (not implemented).</li>
* <li>it runs teardown hooks after running shutdown hooks and before halting.</li>
* </ul>
*/
@Substitute
static void exit(int status) {
synchronized (Target_java_lang_Shutdown.class) {
runHooks();
RuntimeSupport.executeTearDownHooks();
halt(status);
}
}
}

/** Utility methods for Target_java_lang_Shutdown. */
Expand Down
Loading