Skip to content

Commit

Permalink
8269175: [macosx-aarch64] wrong CPU speed in hs_err file
Browse files Browse the repository at this point in the history 
Reviewed-by: dholmes, dcubed, stuefe
  • Loading branch information
Gerard Ziemski committed Oct 18, 2021
1 parent 426bcee commit bcbe384
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/hotspot/os/bsd/os_bsd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1311,13 +1311,17 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
strncpy(machine, "", sizeof(machine));
}

const char* emulated = "";
#if defined(__APPLE__) && !defined(ZERO)
if (VM_Version::is_cpu_emulated()) {
emulated = " (EMULATED)";
snprintf(buf, buflen, "\"%s\" %s (EMULATED) %d MHz", model, machine, mhz);
} else {
NOT_AARCH64(snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz));
// aarch64 CPU doesn't report its speed
AARCH64_ONLY(snprintf(buf, buflen, "\"%s\" %s", model, machine));
}
#else
snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz);
#endif
snprintf(buf, buflen, "\"%s\" %s%s %d MHz", model, machine, emulated, mhz);
}

void os::print_memory_info(outputStream* st) {
Expand Down

5 comments on commit bcbe384

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on bcbe384 Dec 16, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-bcbe3845 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit bcbe3845 from the openjdk/jdk repository.

The commit being backported was authored by Gerard Ziemski on 18 Oct 2021 and was reviewed by David Holmes, Daniel D. Daugherty and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u VladimirKempik-backport-bcbe3845:VladimirKempik-backport-bcbe3845
$ git checkout VladimirKempik-backport-bcbe3845
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u VladimirKempik-backport-bcbe3845

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on bcbe384 Dec 17, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-bcbe3845 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit bcbe3845 from the openjdk/jdk repository.

The commit being backported was authored by Gerard Ziemski on 18 Oct 2021 and was reviewed by David Holmes, Daniel D. Daugherty and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev VladimirKempik-backport-bcbe3845:VladimirKempik-backport-bcbe3845
$ git checkout VladimirKempik-backport-bcbe3845
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev VladimirKempik-backport-bcbe3845

Please sign in to comment.