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

8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo #23013

Closed
wants to merge 3 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Jan 9, 2025

The functions unix_getParentPidAndTimings and unix_getCmdlineAndUserInfo in src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c used to hold an implementation that was shared between Solaris and AIX. Linux and MacOS already had specific implementations. After the removal of the Solaris port, these two functions can be removed in favor of inline implementations of os_getParentPidAndTimings and os_getCmdlineAndUserInfo in src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23013/head:pull/23013
$ git checkout pull/23013

Update a local copy of the PR:
$ git checkout pull/23013
$ git pull https://git.openjdk.org/jdk.git pull/23013/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23013

View PR using the GUI difftool:
$ git pr show -t 23013

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23013.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 9, 2025

@MBaesken This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo

Reviewed-by: rriggs, clanger, jkern

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 26 new commits pushed to the master branch:

  • 46ba515: 8346669: Increase abstraction in SetupBuildLauncher and remove extra args
  • e7e8f60: 8347302: Mark test tools/jimage/JImageToolTest.java as flagless
  • 9cf7d42: 8346184: C2: assert(has_node(i)) failed during split thru phi
  • 1bf2f5c: 8343510: JFR: Remove AccessControlContext from FlightRecorder::addListener specification
  • beb0e60: 8347397: Cleanup of JDK-8169880
  • c5c4efd: 8347120: Launchers should not have java headers on include path
  • ec7393e: 8347287: JFR: Remove use of Security Manager
  • 12752b0: 8347346: Remove redundant ClassForName.java and test.policy from runtime/Dictionary
  • 57af52c: 8346581: JRadioButton/ButtonGroupFocusTest.java fails in CI on Linux
  • 1f45797: 8347124: Clean tests with --enable-linkable-runtime
  • ... and 16 more: https://git.openjdk.org/jdk/compare/72f1114909854aaed5d190d1c74a98527600a0c2...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title JDK-8347270: Remove unix_getParentPidAndTimings and unix_getCmdlineAndUserInfo 8347270: Remove unix_getParentPidAndTimings and unix_getCmdlineAndUserInfo Jan 9, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 9, 2025
@openjdk
Copy link

openjdk bot commented Jan 9, 2025

@MBaesken The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 9, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2025

Webrevs

Copy link
Contributor

@JoKern65 JoKern65 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Nice cleaup. Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 9, 2025
Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

Looks good, but I have a few requests/suggestions:

  1. Please update the copyright years
  2. In ProcessHandleImpl_aix.c you could add an SAP copyright line
  3. In line 57 of src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c there is another mentioning of Solaris which could be removed
  4. On the same lines you could get rid of unix_getChildren in src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c and move the implementation to os_getChildren in src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jan 10, 2025
@MBaesken
Copy link
Member Author

Hi Christoph, I adjusted the COPYRIGHT info and removed unix_getChildren .
Regarding 'Solaris' mentioning in this file , I removed that one too but a grep shows there are plenty of Solaris comments etc. in the codebase.

@MBaesken MBaesken changed the title 8347270: Remove unix_getParentPidAndTimings and unix_getCmdlineAndUserInfo 8347270: Remove unix_getParentPidAndTimings, unix_getChildren and unix_getCmdlineAndUserInfo Jan 10, 2025
@@ -78,7 +78,7 @@
* ProcessHandleImpl_unix.h which is included into every
* ProcessHandleImpl_<os>.c file.
*
* Example 1:
* Example :
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* Example :
* Example:

@RealCLanger
Copy link
Contributor

Hi Christoph, I adjusted the COPYRIGHT info and removed unix_getChildren . Regarding 'Solaris' mentioning in this file , I removed that one too but a grep shows there are plenty of Solaris comments etc. in the codebase.

Looks good, thanks for incorporating the suggestion. Found one other minor nit.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 10, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jan 10, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 10, 2025
@MBaesken
Copy link
Member Author

Thanks for the reviews !

/integrate

@openjdk
Copy link

openjdk bot commented Jan 13, 2025

Going to push as commit 1f7925c.
Since your change was applied there have been 35 commits pushed to the master branch:

  • 9fafd63: 8346828: javax/swing/JScrollBar/4865918/bug4865918.java still fails in CI
  • f04a642: 8346717: serviceability/dcmd/vm/SystemDumpMapTest.java failing on Windows with "Stack base not yet set for thread id"
  • 3145278: 8346727: JvmtiVTMSTransitionDisabler deadlock
  • 761774a: 8346143: add ClearAllFramePops function to speedup debugger single stepping in some cases
  • 6f1f2f2: 8347063: Add comments in ClassFileFormatVersion for class file format evolution history
  • 10f7142: 8347295: Fix WinResourceTest to make it work with WiX v4.0+
  • 01c8ba2: 8347298: Bug in JPackageCommand.ignoreFakeRuntime()
  • d69463e: 8347300: Don't exclude the "PATH" var from the environment when running app launchers in jpackage tests
  • 4b554b5: 8346722: (fs) Files.probeContentType throws ClassCastException with custom file system provider
  • 46ba515: 8346669: Increase abstraction in SetupBuildLauncher and remove extra args
  • ... and 25 more: https://git.openjdk.org/jdk/compare/72f1114909854aaed5d190d1c74a98527600a0c2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 13, 2025
@openjdk openjdk bot closed this Jan 13, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 13, 2025
@openjdk
Copy link

openjdk bot commented Jan 13, 2025

@MBaesken Pushed as commit 1f7925c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants