Merge upstream-jdk

src/java.base/share/man/java.1

@@ -1710,10 +1710,12 @@ This prevents the JVM from exiting and keeps the process active so that
 you can attach a debugger to it to investigate the cause of the error.
 By default, this option is disabled.
 .TP
-\f[V]-XX:StartFlightRecording=\f[R]\f[I]parameter\f[R]\f[V]=\f[R]\f[I]value\f[R]
+\f[V]-XX:StartFlightRecording:\f[R]\f[I]parameter\f[R]\f[V]=\f[R]\f[I]value\f[R]
 Starts a JFR recording for the Java application.
 This option is equivalent to the \f[V]JFR.start\f[R] diagnostic command
 that starts a recording during runtime.
+\f[V]-XX:StartFlightRecording:help\f[R] prints available options and
+example command lines.
 You can set the following \f[I]parameter\f[R]\f[V]=\f[R]\f[I]value\f[R]
 entries when starting a JFR recording:
 .RS
@@ -1760,6 +1762,8 @@ written when the recording is stopped, for example:
 .PP
 If %p and/or %t is specified in the filename, it expands to the
 JVM\[aq]s PID and the current timestamp, respectively.
+The filename may also be a directory in which case, the filename is
+generated from the PID and the current date in the specified directory.
 .RE
 .TP
 \f[V]name=\f[R]\f[I]identifier\f[R]
@@ -1840,6 +1844,9 @@ The whitespace delimiter can be omitted for timespan values, i.e.
 20ms.
 For more information about the settings syntax, see Javadoc of the
 jdk.jfr package.
+.PP
+To only see warnings and errors from JFR during startup set
+-Xlog:jfr+startup=warning.
 .RE
 .TP
 \f[V]-XX:ThreadStackSize=\f[R]\f[I]size\f[R]

src/jdk.jcmd/share/man/jcmd.1

@@ -528,7 +528,7 @@ is not used: \[aq]m\[aq] or \[aq]M\[aq] for megabytes OR \[aq]g\[aq] or
 If no name is given, data from all recordings is dumped.
 (STRING, no default value)
 .IP \[bu] 2
-\f[V]path-to-gc-root\f[R]: (Optional) Flag for saving the path to
+\f[V]path-to-gc-roots\f[R]: (Optional) Flag for saving the path to
 garbage collection (GC) roots at the time the recording data is dumped.
 The path information is useful for finding memory leaks but collecting
 it can cause the application to pause for a short period of time.
@@ -606,7 +606,7 @@ Make note of the generated name that is shown in the response to the
 command so that you can use it with other commands.
 (STRING, system-generated default name)
 .IP \[bu] 2
-\f[V]path-to-gc-root\f[R]: (Optional) Flag for saving the path to
+\f[V]path-to-gc-roots\f[R]: (Optional) Flag for saving the path to
 garbage collection (GC) roots at the end of a recording.
 The path information is useful for finding memory leaks but collecting
 it is time consuming.
@@ -681,6 +681,55 @@ If no path is provided, the data from the recording is discarded.
 value)
 .RE
 .TP
+\f[V]JFR.view\f[R] [\f[I]options\f[R]]
+Display event data in predefined views.
+.RS
+.PP
+Impact: Medium
+.PP
+\f[B]Note:\f[R]
+.PP
+The \f[I]options\f[R] must be specified using either \f[I]key\f[R] or
+\f[I]key\f[R]\f[V]=\f[R]\f[I]value\f[R] syntax.
+If no parameters are entered, then a list of available views are
+displayed.
+.PP
+\f[I]options\f[R]:
+.IP \[bu] 2
+\f[V]cell-height\f[R]: (Optional) Maximum number of rows in a table
+cell.
+(INT, default value depends on the view)
+.IP \[bu] 2
+\f[V]maxage\f[R]: (Optional) Length of time for the view to span.
+(INT followed by \[aq]s\[aq] for seconds \[aq]m\[aq] for minutes or
+\[aq]h\[aq] for hours, default value is 10m)
+.IP \[bu] 2
+\f[V]maxsize\f[R]: (Optional) Maximum size for the view to span in bytes
+if one of the following suffixes is not used: \[aq]m\[aq] or \[aq]M\[aq]
+for megabytes OR \[aq]g\[aq] or \[aq]G\[aq] for gigabytes.
+(STRING, default value is 32MB)
+.IP \[bu] 2
+\f[V]truncate\f[R]: (Optional) Maximum number of rows in a table cell.
+(INT, default value depends on the view)
+.IP \[bu] 2
+\f[V]verbose\f[R]: (Optional) Displays the query that makes up the view.
+(BOOLEAN, default value is false)
+.IP \[bu] 2
+\f[V]width\f[R]: (Optional) The width of the view in characters.
+(INT, default value depends on the view)
+.PP
+\f[I]arguments\f[R]:
+.IP \[bu] 2
+\f[V]view\f[R]: Name of the view or event type to display.
+Use \f[V]help JFR.view\f[R] to see a list of available views.
+(STRING, no default value)
+.PP
+The view parameter can be an event type name.
+Use \f[V]JFR.view types\f[R] to see a list.
+To display all views, use \f[V]JFR.view all-views\f[R].
+To display all events, use \f[V]JFR.view all-events\f[R].
+.RE
+.TP
 \f[V]JVMTI.agent_load\f[R] [\f[I]arguments\f[R]]
 Loads JVMTI native agent.
 .RS