Skip to content

Commit

Permalink
8328709: AIX os::get_summary_cpu_info support Power 10
Browse files Browse the repository at this point in the history
Reviewed-by: lucy, jkern
  • Loading branch information
MBaesken committed Mar 25, 2024
1 parent 19a0151 commit b235682
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/hotspot/os/aix/os_aix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ extern "C" int getargs(procsinfo*, int, char*, int);
#define ERROR_MP_VMGETINFO_FAILED 102
#define ERROR_MP_VMGETINFO_CLAIMS_NO_SUPPORT_FOR_64K 103

// excerpts from systemcfg.h that might be missing on older os levels
// excerpts from sys/systemcfg.h that might be missing on older os levels
#ifndef PV_7
#define PV_7 0x200000 /* Power PC 7 */
#endif
Expand All @@ -157,7 +157,12 @@ extern "C" int getargs(procsinfo*, int, char*, int);
#ifndef PV_9_Compat
#define PV_9_Compat 0x408000 /* Power PC 9 */
#endif

#ifndef PV_10
#define PV_10 0x500000 /* Power PC 10 */
#endif
#ifndef PV_10_Compat
#define PV_10_Compat 0x508000 /* Power PC 10 */
#endif

static address resolve_function_descriptor_to_code_pointer(address p);

Expand Down Expand Up @@ -1306,6 +1311,9 @@ void os::print_memory_info(outputStream* st) {
void os::get_summary_cpu_info(char* buf, size_t buflen) {
// read _system_configuration.version
switch (_system_configuration.version) {
case PV_10:
strncpy(buf, "Power PC 10", buflen);
break;
case PV_9:
strncpy(buf, "Power PC 9", buflen);
break;
Expand Down Expand Up @@ -1345,6 +1353,9 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
case PV_9_Compat:
strncpy(buf, "PV_9_Compat", buflen);
break;
case PV_10_Compat:
strncpy(buf, "PV_10_Compat", buflen);
break;
default:
strncpy(buf, "unknown", buflen);
}
Expand Down

5 comments on commit b235682

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on b235682 Apr 3, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-b235682a in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-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 b235682a from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 25 Mar 2024 and was reviewed by Lutz Schmidt and Joachim Kern.

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/jdk21u-dev:

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

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on b235682 Apr 3, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-b235682a in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u: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 b235682a from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 25 Mar 2024 and was reviewed by Lutz Schmidt and Joachim Kern.

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/jdk22u:

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

Please sign in to comment.