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.

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

8346796: [CRaC] Initialize clock before restore on Mac #169

Open
wants to merge 1 commit into
base: crac
Choose a base branch
from
Open
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions src/hotspot/share/runtime/threads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ jint Threads::check_for_restore(JavaVMInitArgs* args) {
jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
extern void JDK_Version_init();

#ifdef __APPLE__
// BSD clock would be initialized in os::init() but we need to do that earlier
// as crac::restore() calls os::javaTimeNanos().
os::Bsd::clock_init();
#endif
if (check_for_restore(args) != JNI_OK) return JNI_ERR;

// Preinitialize version info.
Expand Down