Skip to content

Commit

Permalink
8310512: Cleanup indentation in jfc files
Browse files Browse the repository at this point in the history
Reviewed-by: egahlin
  • Loading branch information
RealCLanger committed Jun 21, 2023
1 parent f286e5a commit 3be50da
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 30 deletions.
27 changes: 12 additions & 15 deletions src/jdk.jfr/share/conf/jfr/default.jfc
Expand Up @@ -735,8 +735,8 @@
</event>

<event name="jdk.Deserialization">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.InitialSecurityProperty">
Expand All @@ -745,13 +745,13 @@
</event>

<event name="jdk.SecurityPropertyModification">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.SecurityProviderService">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.TLSHandshake">
Expand All @@ -760,13 +760,13 @@
</event>

<event name="jdk.X509Validation">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.X509Certificate">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.JavaExceptionThrow">
Expand Down Expand Up @@ -918,8 +918,6 @@








Expand All @@ -929,7 +927,7 @@
carry the control attribute.
-->
<control>
<selection name="gc" default="normal" label="Garbage Collector">
<selection name="gc" default="normal" label="Garbage Collector">
<option label="Off" name="off">off</option>
<option label="Normal" name="normal">normal</option>
<option label="Detailed" name="detailed">detailed</option>
Expand Down Expand Up @@ -974,7 +972,7 @@
</selection>

<condition name="object-allocation-enabled" true="true" false="false">
<not>
<not>
<test name="allocation-profiling" operator="equal" value="off"/>
</not>
</condition>
Expand Down Expand Up @@ -1122,7 +1120,6 @@
<text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">20 ms</text>

<flag name="class-loading" label="Class Loading">false</flag>

</control>

</configuration>
29 changes: 14 additions & 15 deletions src/jdk.jfr/share/conf/jfr/profile.jfc
Expand Up @@ -735,8 +735,8 @@
</event>

<event name="jdk.Deserialization">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.InitialSecurityProperty">
Expand All @@ -745,13 +745,13 @@
</event>

<event name="jdk.SecurityPropertyModification">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.SecurityProviderService">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.TLSHandshake">
Expand All @@ -760,13 +760,13 @@
</event>

<event name="jdk.X509Validation">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.X509Certificate">
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
<setting name="enabled">false</setting>
<setting name="stackTrace">true</setting>
</event>

<event name="jdk.JavaExceptionThrow">
Expand Down Expand Up @@ -927,7 +927,7 @@
carry the control attribute.
-->
<control>
<selection name="gc" default="detailed" label="Garbage Collector">
<selection name="gc" default="detailed" label="Garbage Collector">
<option label="Off" name="off">off</option>
<option label="Normal" name="normal">normal</option>
<option label="Detailed" name="detailed">detailed</option>
Expand All @@ -945,11 +945,11 @@
</condition>

<condition name="gc-enabled-detailed" true="true" false="false">
<or>
<or>
<test name="gc" operator="equal" value="detailed"/>
<test name="gc" operator="equal" value="high"/>
<test name="gc" operator="equal" value="all"/>
</or>
</or>
</condition>

<condition name="gc-enabled-high" true="true" false="false">
Expand All @@ -967,7 +967,7 @@
<option label="Off" name="off">0/s</option>
<option label="Low" name="low">150/s</option>
<option label="Medium" name="medium">300/s</option>
<option label="High" name="high">1000/s</option>
<option label="High" name="high">1000/s</option>
<option label="Maximum" name="maximum">1000000000/s</option>
</selection>

Expand Down Expand Up @@ -1120,7 +1120,6 @@
<text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>

<flag name="class-loading" label="Class Loading">false</flag>

</control>

</configuration>

5 comments on commit 3be50da

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@JesperIRL
Copy link
Member

Choose a reason for hiding this comment

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

/tag jdk-22+3

@openjdk
Copy link

@openjdk openjdk bot commented on 3be50da Jun 22, 2023

Choose a reason for hiding this comment

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

@JesperIRL The tag jdk-22+3 was successfully created.

@RealCLanger
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on 3be50da Oct 17, 2023

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Christoph Langer on 21 Jun 2023 and was reviewed by Erik Gahlin.

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:

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

Please sign in to comment.