Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JesperIRL committed Jan 12, 2023
2 parents 33412c1 + 4b92fb0 commit 9887047
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/java.base/share/classes/java/lang/ProcessBuilder.java
Expand Up @@ -1004,6 +1004,8 @@ public ProcessBuilder redirectErrorStream(boolean redirectErrorStream) {
* be required to start a process on some operating systems.
* As a result, the subprocess may inherit additional environment variable
* settings beyond those in the process builder's {@link #environment()}.
* The minimal set of system dependent environment variables
* may override the values provided in the environment.
*
* <p>If there is a security manager, its
* {@link SecurityManager#checkExec checkExec}
Expand Down Expand Up @@ -1181,6 +1183,8 @@ private Process start(Redirect[] redirects) throws IOException {
* be required to start a process on some operating systems.
* As a result, the subprocess may inherit additional environment variable
* settings beyond those in the process builder's {@link #environment()}.
* The minimal set of system dependent environment variables
* may override the values provided in the environment.
* <p>
* If there is a security manager, its
* {@link SecurityManager#checkExec checkExec}
Expand Down
2 changes: 2 additions & 0 deletions src/java.base/share/classes/java/lang/Runtime.java
Expand Up @@ -569,6 +569,8 @@ public Process exec(String[] cmdarray, String[] envp) throws IOException {
* be required to start a process on some operating systems.
* As a result, the subprocess may inherit additional environment variable
* settings beyond those in the specified environment.
* The minimal set of system dependent environment variables
* may override the values provided in the environment.
*
* <p>{@link ProcessBuilder#start()} is now the preferred way to
* start a process with a modified environment.
Expand Down
8 changes: 6 additions & 2 deletions src/java.base/share/classes/java/lang/foreign/Linker.java
Expand Up @@ -303,8 +303,8 @@ static Option firstVariadicArg(int index) {
* before it can be overwritten by the Java runtime, or read through conventional means}
* <p>
* A downcall method handle linked with this option will feature an additional {@link MemorySegment}
* parameter directly following the target address parameter. This memory segment must be a
* native segment into which the captured state is written.
* parameter directly following the target address, and optional {@link SegmentAllocator} parameters.
* This memory segment must be a native segment into which the captured state is written.
*
* @param capturedState the names of the values to save.
* @see CaptureCallState#supported()
Expand All @@ -323,6 +323,10 @@ static CaptureCallState captureCallState(String... capturedState) {
* <p>
* Execution state is captured by a downcall method handle on invocation, by writing it
* to a native segment provided by the user to the downcall method handle.
* For this purpose, a downcall method handle linked with the {@link #captureCallState(String[])}
* option will feature an additional {@link MemorySegment} parameter directly
* following the target address, and optional {@link SegmentAllocator} parameters.
* This parameter represents the native segment into which the captured state is written.
* <p>
* The native segment should have the layout {@linkplain CaptureCallState#layout associated}
* with the particular {@code CaptureCallState} instance used to link the downcall handle.
Expand Down

1 comment on commit 9887047

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.