Compare commits

..

1674 Commits

Author SHA1 Message Date
Maxim Kartashev
191c53b993 JBR-9902 Wayland: support modal dialogs without native modality aid 2026-01-21 17:53:27 +04:00
Maxim Kartashev
8c38fe1930 JBR-9792 Wayland: clarify synchronization for SurfaceData and others 2026-01-21 11:39:20 +04:00
Maxim Kartashev
017804507b JBR-9813 Vulkan: proper lifetime management of SurfaceData 2026-01-21 11:39:16 +04:00
Maxim Kartashev
fae9f61e99 JBR-9792 Wayland: avoid using awtLock 2026-01-21 11:39:11 +04:00
Nikita Tsarev
c8d2af74b1 JBR-9898 Wayland: Keep clipboard ownership when copying within the same process
This patch makes the WLClipboard not call lostOwnershipNow() when a data
offer is available that was made previously by this clipboard. To do
this, WLClipboard's data sources announce a random cookie string as one
of the supported mime types. This string is then checked for when
receiving a data offer.
2026-01-20 11:00:33 +01:00
Maxim Kartashev
4092f5ee0b JBR-9893 Closed and disposed windows leak through WLGraphicsDevice.toplevels 2026-01-20 11:59:17 +04:00
Egor Ushakov
3386881f2e JBR-1354 com/sun/tools/attach/PermissionTest.java: access denied ("java.util.PropertyPermission" "sun.tools.attach.tmp.only" "read")
(cherry picked from commit 3a09f6c1db)
(cherry picked from commit 3b2399fc35)
2026-01-20 01:04:25 +01:00
Egor Ushakov
cfe6077502 JBR-1061 .attach_pid files in the working dir - flag to put .attach file in tmp dir only
(cherry picked from commit 4bd3f7835e)
(cherry picked from commit b7a3a346e6)
2026-01-20 01:04:25 +01:00
Vitaly Provodin
cfd060c792 update exclude list on results of main.3948 test runs 2026-01-20 01:04:25 +01:00
Maxim Kartashev
fb85751097 JBR-9875 On wayland modal dialog moves the parent window when dragged
Support for gnome-specific dialog modality is disabled by default.
Use -Dsun.awt.wl.NativeModality=true to enable.
2026-01-20 01:04:25 +01:00
Nikita Tsarev
2a8b90b2cc JBR-9874 Wayland: Add certain XF86 keysyms 2026-01-20 01:04:25 +01:00
Vitaly Provodin
f80c01f9ca Update README.md 2026-01-20 01:04:25 +01:00
Maxim Kartashev
4bc5e3e246 JBR-9871 Wayland: undecorated window crashes on close 2026-01-20 01:04:25 +01:00
Vitaly Provodin
9ceef2b1f2 Update README.md 2026-01-20 01:04:25 +01:00
Vitaly Provodin
2f04073f86 update exclude list on results of main.3938 test runs 2026-01-20 01:04:25 +01:00
Vladimir Lagunov
2c933da38b JBR-9779 io-over-nio: RandomAccessFile now can open Windows pipes
The WinAPI function `GetFileAttributesW` actually opens a file and immediately closes it. If the file is a named pipe, it triggers a connection to the listener of the pipe. The listener closes the connection also asynchronously.

If the pipe is created with `nMaxInstances=1`, this code does not work:

```java
var path = Path.of("""\\.\pipe\openssh-ssh-agent""")

// `readAttributes` calls `GetFileAttributesW`, it opens the file and then closes it.
if (Files.readAttributes(path, BasicFileAttributes.class).isRegularFile()) {
  // Very probable race condition: the listener of the pipe has already received
  // the request of opening the file triggered by `GetFileAttributesW`
  // but hasn't closed the connection on their side yet.
  Files.newByteChannel(path);  // Fails with ERROR_PIPE_BUSY.
}
```

This revision adds an explicit check if some file looks like a Windows pipe. In these cases `RandomAccessFile` and `FileInputStream` don't call `Files.readAttributes` for the file.
2026-01-20 01:04:24 +01:00
Vladimir Lagunov
842bd7beb4 JBR-9779 Refactor: extract common logic for getting nio path in FileInputStream, RandomAccessFile, and FileOutputStream 2026-01-20 01:04:24 +01:00
Nikita Gubarkov
b1551ce136 JBR-9552 Isolated JBR API context per classloader 2026-01-20 01:04:24 +01:00
Maxim Kartashev
9555a82670 JBR-9772 Ubuntu + Wayland: SIGSEGV at Java_sun_awt_wl_GtkFrameDecoration_nativeNotifyConfigured 2026-01-20 01:04:24 +01:00
Maxim Kartashev
b1c5d29a8a JBR-9768 sources/TestNoNULL.java: 'NULL' found in src/hotspot/share/runtime/arguments.cpp at line 3878 2026-01-20 01:04:24 +01:00
Vitaly Provodin
88abc9b54f update exclude list on results of main.3913 test runs 2026-01-20 01:04:24 +01:00
Maxim Kartashev
36cbd94c79 JBR-9561 Wayland: Cannot invoke "WLMainSurface.hasSurfaceData()" because "this.wlSurface" is null 2026-01-20 01:04:24 +01:00
Maxim Kartashev
fbd5dbc4cb JBR-9503 Wayland: IDE frame disappears after click on 'Cancel' 2026-01-20 01:04:24 +01:00
Alexey Ushakov
a364787e63 JBR-9301 Vulkan: SwingSet2 crash window server
Clear native peer on windowClosing in Frame object

(cherry picked from commit 441bb9d12ebff4bf2e1629115b9414b0b22ec858)
2026-01-20 01:04:24 +01:00
Maxim Kartashev
66f0e8da74 JBR-9738 Wayland: crash in nativeHideFrame() 2026-01-20 01:04:24 +01:00
Vitaly Provodin
8c8da4ab1b Update README.md 2026-01-20 01:04:24 +01:00
Vitaly Provodin
a01e56b9c7 JBR-9756 take JBR debug symbols from images/symbols 2026-01-20 01:04:23 +01:00
Vitaly Provodin
899d3f7dd1 fixup! JBR-4154 initiate OPENJDK_TAG with base value in case tag was not set 2026-01-20 01:04:23 +01:00
Maxim Kartashev
8ed709110d JBR-9739 Wayland: AssertionError in WLComponentPeer.moveToOverlap() 2026-01-20 01:04:23 +01:00
Vitaly Provodin
2ca10fc331 update exclude list on results of main.3839 test runs 2026-01-20 01:04:23 +01:00
Maxim Kartashev
d30d795ce9 JBR-9730 Wayland: to add a secondary expression in assertions 2026-01-20 01:04:23 +01:00
Maxim Kartashev
67059a6d27 JBR-9733 Wayland: enable unconstrained popup positioning
Use getRootPane()
.putClientProperty("wlawt.popup_position_unconstrained", Boolean.TRUE)
to enable unconstrained popup positioning.
2026-01-20 01:04:23 +01:00
Anton Shangareev
de3b3a105f JBR-8947 Reimplement CArrayUtils in a MSVC-compatible way 2026-01-20 01:04:23 +01:00
Anton Shangareev
6125e3cdb2 Fix incorrect use of 'inline' in place of 'static'/'static inline' in some C files 2026-01-20 01:04:23 +01:00
Anton Shangareev
cfac355c19 Fix stray unsigned comparison warning 2026-01-20 01:04:23 +01:00
Maxim Kartashev
7d2a1682ef JBR-9728 Wayland: AssertionError in WLGraphicsDevice. 2026-01-20 01:04:23 +01:00
Maxim Kartashev
61f682065f JBR-9727 Wayland: assertion error in ShadowImpl.updateSurfaceData 2026-01-20 01:04:23 +01:00
Nikita Tsarev
1e82bae857 JBR-9483 Wayland: Support toplevel icons
This patch implements support for the xdg_toplevel_icon_v1 protocol.
The image choosing logic is just to pick the largest square image for
now. The image scale factor is also not set, since it's unclear if it's
needed and how it interacts with multi-monitor setups.

NOTE: this patch introduces a dependency on wayland-protocols 1.37+.
2026-01-20 01:04:23 +01:00
Nikita Provotorov
5985e58644 JBR-9719: Wayland: input methods in Speed search don't work if WLInputMethodZwpTextInputV3 logger is enabled
Resetting the text iterator of each InputMethodEvent after it gets logged.

(cherry picked from commit 3355214b43)
2026-01-20 01:04:22 +01:00
Maxim Kartashev
357d3ad901 Revert "JBR-9301 Vulkan: SwingSet2 crash window server"
This reverts commit 7d3c3b33b8cb917411333aadfd9d74b1566f9aa9.
2026-01-20 01:04:22 +01:00
Maxim Kartashev
15fce392e9 Revert "JBR-9503 Wayland: IDE frame disappears after click on 'Cancel'"
This reverts commit f25d35abec46a409caa6a19a109aa5dc8b4e6db4.
2026-01-20 01:04:22 +01:00
Vitaly Provodin
0bfa927fec update exclude list on results of main.3838 test runs 2026-01-20 01:04:22 +01:00
Nikita Tsarev
33bf9893cc JBR-9699 Build with newer wayland-protocols
Updates the CI build scripts to look for wayland protocols in
/opt/wayland-protocols
2026-01-20 01:04:22 +01:00
Maxim Kartashev
52b6fc6088 JBR-9698 Wayland: session auto-detection doesn't work with binary launcher 2026-01-20 01:04:22 +01:00
Vladimir Lagunov
24859d26b1 JBR-9531 Prevent unexpected recursive usage of java.io over nio wrappers
Shortly said, we don't need to handle recursive invocations of the `java.io` to nio adapters, while this recursion leads to problems.

# Problem 

Since we're not allowed to modify public API of Java classes, an unreliable workaround `IoOverNio.PARENT_FOR_FILE_CHANNEL_IMPL` had been introduced. This trick lets us pass some object into a called function without adding a new function argument.

The trick backfired at the following code:

```java
// at java.base/java.io.IoOverNioFileSystem.initializeStreamUsingNio (simplified code)
IoOverNio.PARENT_FOR_FILE_CHANNEL_IMPL.set(owner);
return initializeStreamsUsingNio0(owner, nioFs, file, nioPath, optionsForChannel, channelCleanable);


// at java.base/java.io.IoOverNioFileSystem.initializeStreamsUsingNio0
channel = nioFs.provider().newFileChannel(nioPath, optionsForChannel);
```

The intention of setting `PARENT_FOR_FILE_CHANNEL_IMPL` is to path `owner` inside a constructor of `sun.nio.ch.FileChannelImpl` which may be called by `newFileChannel(nioPath, optionsForChannel)`.

The implementation of `newFileChannel` in IntelliJ triggered class loading. The classloader of IntelliJ triggered the call `java.nio.file.Files.readAllBytes`. The latter code also invoked the constructor of `FileChannelImpl`, and the constructor got from the thread-local variable the value for the field `parent`. That value was supposed to be passed to a different invocation of the constructor.

The observable result of this bug was a `NullPointerExceptions` from `java.io.FileOutputStream.close`. Hypothetically, this bug could also lead to closing file descriptors earlier as expected in other unpredictable places.

# Rejected approaches

* The cleanest solution could be passing specific function arguments through function arguments. 
  
  However, we may neither create a new public function in the module `java.base`, nor add an argument to an existing one. Thus, we have to keep dealing with thread-local variables.
* To hold several values in the thread-local variable. 

  In this case, the constructor of `FileChannelImpl` should somehow choose the right value from the list. The only possible way for filtering values is by the provided path. It doesn't look like a performant and reliable solution.
 
# Chosen solution
 
This commit disables recursive invocations of `java.io` from `java.nio` adapters.
  
The chosen solution is tied to specifics of IntelliJ. The reason for introducing java.io over java.nio adapter was to be able to access files from remote machines without rewriting old code. It is not expected that an implementation of `java.nio.file.spi.FileSystemProvider` accesses the file system using `java.io`. The only imaginable way to get a `java.io` call from `java.nio` is class loading. In case of IntelliJ, it's assumed that the class loader never accesses classes and jars from a remote machine.
2026-01-20 01:04:22 +01:00
Maxim Kartashev
e84065eb3c JBR-9672 Wayland: popup focus broken in Plasma 6.5.2, with Focus Stealing prevention >= Medium 2026-01-20 01:04:22 +01:00
Maxim Kartashev
190bb51449 JBR-9656 Wayland: toFront() does not work on KDE Plasma 6.5.2
KWin does not accept the serial number from a "keyboard enter" event in
a window activation request, while a recent input event serial is OK.
Gnome, however, requires the "keyboard enter" event serial.
2026-01-20 01:04:22 +01:00
Vitaly Provodin
a02fc2ca82 Update README.md 2026-01-20 01:04:22 +01:00
Maxim Kartashev
bb13870af1 JBR-6187 Wayland: implement server-side decoration support
Use -Dsun.awt.wl.WindowDecorationStyle=server to activate
2026-01-20 01:04:22 +01:00
Nikita Tsarev
8254a12c9f JBR-9642 Wayland: Call wl_data_offer.finish()
This patch adds a call to wl_data_offer.finish() upon a successful
completion of a drag-and-drop operation, as well as more synchronized
annotations in WLDataOffer, to match the existing ones.

Calling finish() doesn't seem to be required by most compositors when
performing drag-and-drop, at least within the same window. Other
toolkits, such as Qt, only call it when dealing with cross-application
drag-and-drop. In the interest of maximal compatibility, this patch
implements calling finish() always when a drag-and-drop operation
succeeds.
2026-01-20 01:04:21 +01:00
Nikita Tsarev
f9c98335c1 JBR-9591 Wayland: Fix wrong DnD action on KWin
This patch implements a workaround for a bug that exists on KWin 6.5. For
some reason, KWin sends a wl_data_source.action(0) event immediately
after wl_data_source.dnd_drop_finished(). This makes the drag source
think that the DnD operation failed, even though it succeeded.
The workaround it to ignore the wl_data_source.action() events
after a successful wl_data_source.dnd_drop_finished()

In addition to this, this patch also fixes some inconsistency with
translating between AWT and Wayland DnD operation masks. This doesn't
have any visible effect though, since the mask values happen to be the
same.
2026-01-20 01:04:21 +01:00
Vitaly Provodin
4c522d8348 JBR-9637 revert test/jdk changes made in 8370344, 8371315, 8371474 2026-01-20 01:04:21 +01:00
Maxim Kartashev
854f880fda JBR-9577 Extra info on JVM crash to the terminal 2026-01-20 01:04:21 +01:00
Dmitry Drobotov
fb8b4bb2c0 JBR-9580 Fix crash in [MenuAccessibility accessibilityChildren]
* Add null checks for variables that can have null values to prevent hard crash
* Add missing CHECK_EXCEPTION after JNI call
* Add missing DeleteLocalRef for axComponent

(cherry picked from commit 96fcd9e591)
2026-01-20 01:04:21 +01:00
Alexey Ushakov
b11d2d53b5 JBR-9612 Update fontconfigmanager.c with upstream changes in fontpath.c
Applied changes from JDK-8357252
2026-01-20 01:04:21 +01:00
bourgesl
700bd804f2 JBR-9609 JBR Metal compilation error on Intel MacBooks
Wrapped MTLDrawable.drawableID usages in getDrawableId to check macOS version
2026-01-20 01:04:21 +01:00
Maxim Kartashev
6b60ccff12 JBR-9598 Wayland: auto-detect Wayland session at startup
Adds -Dawt.toolkit.name=auto to prefer WLToolkit over XToolkit when
available. The default is still XToolkit.
2026-01-20 01:04:21 +01:00
Sergey Shelomentsev
2e89a28f54 JBR-9610 Set TimerQueue thread exclusion for BugJBR9563.java 2026-01-20 01:04:21 +01:00
Maxim Kartashev
83c8dfe7d7 JBR-5989 Wayland: added more tests to jdk_awt_wayland 2026-01-20 01:04:21 +01:00
Maxim Kartashev
cbc56d32cb JBR-9608 Correct README.md to suggest contributing through OpenJDK 2026-01-20 01:04:21 +01:00
Vitaly Provodin
360d9f3f17 Update README.md 2026-01-20 01:04:21 +01:00
Vitaly Provodin
b7b02081a5 Update README.md 2026-01-20 01:04:20 +01:00
Vitaly Provodin
ed601e5d21 Update README.md 2026-01-20 01:04:20 +01:00
Dmitrii Morskii
ff3d80cc75 JBR-6044 handle absence of fontConfig library in setupRenderingFontHints
(cherry picked from commit 6d41e07ffa)
2026-01-20 01:04:20 +01:00
Dmitrii Morskii
b59cbeb994 JBR-6041 started using correct type inside FcPatternGetValueFuncType
(cherry picked from commit fc2b096811)
2026-01-20 01:04:20 +01:00
Dmitrii Morskii
aee497d93b JBR-5844: fixed other part of issue. Added missing implementation of native methods in fontconfigmanager
(cherry picked from commit dbd70b4401)
2026-01-20 01:04:20 +01:00
Nikita Tsarev
d26d97f3c2 JBR-9581 Wayland: Find xkbcommon at configure time
This commit changes how WLToolkit loads libxkbcommon. It will now be
linked as a normal dynamic library at build time, instead of being
loaded via dlopen. This commit also introduces dependency on
libxkbcommon headers and removes the corresponding declarations from
WLKeyboard.c.
2026-01-20 01:04:20 +01:00
bourgesl
46b0d2084d JBR-8651 Pycharm Crashing after lock/sleep: SIGABRT at # C [libsystem_kernel.dylib+0x9388] __pthread_kill / __displaycb_handle_block_invoke
Minimal changes for JBR-21: added @try/&@catch(nsexception) in ThreadUtilities.processQueuedCallbacks() to handle any native or java exception and avoid crashing the main run loop
2026-01-20 01:04:20 +01:00
bourgesl
1970be695c Revert "JBR-8651 Pycharm Crashing after lock/sleep: SIGABRT at # C [libsystem_kernel.dylib+0x9388] __pthread_kill / __displaycb_handle_block_invoke"
This reverts commit 986d5787313bdb25a3c55a5b63b289198d609265.
2026-01-20 01:04:20 +01:00
bourgesl
86f98be2da Revert "JBR-8651 remove logging producing warnings in stderr"
This reverts commit d919ba48645040f44e9eec06fda8b48f806d6c4b.
2026-01-20 01:04:20 +01:00
Sergey Shelomentsev
2dc98bce23 JBR-9563 Add test to verify that new threads aren't spawned infinitely 2026-01-20 01:04:20 +01:00
Nikita Gubarkov
27779ac49e JBR-5594 Pass display configuration from outside on full display update 2026-01-20 01:04:20 +01:00
Nikita Gubarkov
41d17a2f19 JBR-5594 Pass display configuration info from AppKit to EDT 2026-01-20 01:04:19 +01:00
Nikita Tsarev
fc7a456310 JBR-9542 Wayland: Fix modifier mask on modifier key press/release
When pressing a modifier key such as Shift or Alt, other toolkits
include the corresponding bit in the modifier mask. Similiarly, when
releasing a modifier key, other toolkits will not include this bit if
the just released modifier key was the last key producing this bit.

When pressing such a key, Wayland compositors first send the
wl_keyboard.key event, and only then the wl_keyboard.modifiers event.
This causes the reported AWT modifier mask to be inconsistent with
XToolkit. This patch fixes this.
2026-01-20 01:04:19 +01:00
Vitaly Provodin
4d39a5f5a9 JBR-8651 remove logging producing warnings in stderr 2026-01-20 01:04:19 +01:00
bourgesl
112520cd83 JBR-8651 Pycharm Crashing after lock/sleep: SIGABRT at # C [libsystem_kernel.dylib+0x9388] __pthread_kill / __displaycb_handle_block_invoke
Rewritten exception handling to adopt the improved NSApplicationAWT exception handler (log all exceptions, avoid crash GUI)
Fixed JNI_COCOA_EXIT(env) usages to test also pending JNI exceptions
Added JNI_COCOA_EXIT_FATAL(message) used by NSApplicationAWT.sendEvent to report a crash with full details
Unified logException to report both crash and exceptions
Added isAWTCrashOnException() using the system property 'apple.awt.crashOnException' to crash on any exception occuring in NSApplication level
Added missing CHECK_EXCEPTION after (*env)->Call...Method()
Intercept all exception in NSApplicationAWT as NSExceptionHandlerDelegate + added tests in LWCToolkit (native) and Java code to test all exceptions are reported in logs and caught properly
2026-01-20 01:04:19 +01:00
Nikita Tsarev
5fffcc38cf JBR-9547: Fix macOS build failure with Xcode 26.0.1 2026-01-20 01:04:19 +01:00
Vitaly Provodin
763fb9fb6f Update README.md 2026-01-20 01:04:19 +01:00
Vitaly Provodin
08b1fc0240 update exclude list on results of main.3734 test runs 2026-01-20 01:04:19 +01:00
Nikita Tsarev
ff9991f437 JBR-9527: Fix NPE with WLDataDevice.performDeletionsOnEDT() when headless [WLToolkit] 2026-01-20 01:04:19 +01:00
Ilia K
26ee4011b4 JBR-9515 Allow size of per-directory buffer used to retrieve events to be configurable to avoid OVERFLOW_EVENT 2026-01-20 01:04:19 +01:00
Maxim Kartashev
8465521f8a JBR-9503 Wayland: IDE frame disappears after click on 'Cancel' 2026-01-20 01:04:19 +01:00
Vitaly Provodin
87c36e7739 Update README.md 2026-01-20 01:04:19 +01:00
Nikita Tsarev
2d324d0438 JBR-8353: Use a deletion queue to destroy data transfer objects [WLToolkit] 2026-01-20 01:04:19 +01:00
Nikita Gubarkov
b2cafa2bbe JBR-9505 Vulkan: Remove sun.java2d.vulkan.accelsd from tests 2026-01-20 01:04:18 +01:00
Vitaly Provodin
a6dd119a94 clean up fixed issues from exclude lists 2026-01-20 01:04:18 +01:00
Nikita Gubarkov
996c6ebb4b JBR-9486 Vulkan: Handle VK_ERROR_OUT_OF_DATE_KHR 2026-01-20 01:04:18 +01:00
Nikita Gubarkov
b2a7296a66 JBR-9481 Vulkan: OOM-safe BLIT 2026-01-20 01:04:18 +01:00
Vitaly Provodin
b707407cae Update README.md 2026-01-20 01:04:18 +01:00
bourgesl
da8a46431a JBR-9375 macOS: Right-click context menu shows blurry animation when opening
Disable NSWindow animationBehavior (=NSWindowAnimationBehaviorNone) by default except if the system property 'apple.awt.window.animation' = true
+ Fixed J2dRlsTraceLn
2026-01-20 01:04:18 +01:00
Nikita Gubarkov
910085f446 JBR-9477 JBR API: Update local artifact group 2026-01-20 01:04:18 +01:00
Vitaly Provodin
9e1262efff Update README.md 2026-01-20 01:04:18 +01:00
Nikita Gubarkov
f155830d1e JBR-9438 Vulkan: JBR API for accessing configuration info 2026-01-20 01:04:18 +01:00
Nikita Provotorov
ec1cd6efcd JBR-5672: Wayland: support input methods.
Providing support of the "text-input-unstable-v3" protocol, except its surrounding text API (zwp_text_input_v3::set_surrounding_text + zwp_text_input_v3::delete_surrounding_text).
A new system property "sun.awt.wl.im.enabled"[=true|false] is introduced to enable/disable all the integrations with Wayland's native input methods. Set to 'true' by default.

(cherry picked from commit 1c37490f00)
2026-01-20 01:04:18 +01:00
Nikita Tsarev
c20afde879 JBR-8353: Fix wrong order of java/wayland object destruction in DataOffer/DataSource [WLToolkit] 2026-01-20 01:04:18 +01:00
Nikita Gubarkov
72f9aee8d9 JBR-9457 Vulkan: Enable accelerated surfaces by default 2026-01-20 01:04:17 +01:00
Nikita Gubarkov
e81f588977 JBR-7646 Vulkan: Implement painting modes
Implement support for generic painter pipelines with an implementation for GRADIENT_PAINT.
2026-01-20 01:04:17 +01:00
Vitaly Provodin
20858ae775 Update README.md 2026-01-20 01:04:17 +01:00
Alexey Ushakov
d3b6efb2e7 JBR-9452 Vulkan: Make allocator logging less verbose
Log level was increased for some messages
2026-01-20 01:04:17 +01:00
Alexey Ushakov
516e0ed2b2 JBR-9292 Vulkan: RenderPerfTest missing frames
Flush rendering in case of a changed clip
2026-01-20 01:04:17 +01:00
Maxim Kartashev
ff51b351d4 JBR-9451 Wayland: Calling other JNI functions in the scope of Get/ReleasePrimitiveArrayCritical or Get/ReleaseStringCritical 2026-01-20 01:04:17 +01:00
Nikita Tsarev
d6454c5138 JBR-9449: Use wl_proxy_create_wrapper when creating data source objects for thread-safety [WLToolkit] 2026-01-20 01:04:17 +01:00
Nikita Gubarkov
99599e479d JBR-9450 Vulkan: Unify pipelines 2026-01-20 01:04:17 +01:00
bourgesl
5a7d53a821 JDK-8341381 Random lines appear in graphic causing by the fix of JDK-8297230
- Fix cubic offsetting artefacts (sort cubic roots + fixed numerical accuracy problem in ROC^2-w^2 = 0 solver + fixed EliminateInf)
- Restored lower precision using ulp(float) in point, line or flat bezier curve checks
2026-01-20 01:04:17 +01:00
Vitaly Provodin
5a6e356f65 update exclude list on results of main.3677 test runs 2026-01-20 01:04:17 +01:00
Nikita Gubarkov
d4e56099dc JBR-9439 Vulkan: Fix blit composites 2026-01-20 01:04:17 +01:00
Nikita Gubarkov
03a711a260 JBR-8344 Vulkan: Fix color XOR 2026-01-20 01:04:17 +01:00
Maxim Kartashev
e08db0ae30 JBR-9364 Wayland: Popups are shifted with multiple monitor setup after monitor reconnected (Ubuntu) 2026-01-20 01:04:16 +01:00
Nikita Gubarkov
a40b9826e4 JBR-9425 Vulkan: Fix surface disposal 2026-01-20 01:04:16 +01:00
Vitaly Provodin
a9031225ed Update README.md 2026-01-20 01:04:16 +01:00
bourgesl
3b64b83085 JBR-9408 Fix Marlin renderer statistics
Revert JBR-9283 changes to StatLong (completely) to avoid future conflicts
2026-01-20 01:04:16 +01:00
bourgesl
d7759fc2e3 JBR-9408 Fix Marlin renderer statistics
Revert JBR-9283 changes to StatLong + fixed Long constants
2026-01-20 01:04:16 +01:00
Maxim Kartashev
e24c6fead3 JBR-9384 Wayland: ShowPopupAfterHidePopupTest.java fails 2026-01-20 01:04:16 +01:00
Alexey Ushakov
bca6f49da8 JBR-9405 Vulkan: provide pre-commit jtreg test group
Added jdk_render_wayland_vulkan group and exclude list
2026-01-20 01:04:16 +01:00
Vitaly Provodin
f4c9e2d227 Update README.md 2026-01-20 01:04:16 +01:00
Maxim Kartashev
62c1230ea1 JBR-9378 Wayland: Nullpointer exception in DefaultFrameDecoration, IDE hang on KDE 2026-01-20 01:04:16 +01:00
Vitaly Provodin
2be0e23d54 JBR-9274 test against streaming output for attach API 2026-01-20 01:04:16 +01:00
Nikita Tsarev
5b7116dcff JBR-9330: Set scale for drag images [WLToolkit] 2026-01-20 01:04:16 +01:00
Maxim Kartashev
d0f8ddc909 JBR-6990 Wayland: utilize relative-pointer-unstable-v1 protocol 2026-01-20 01:04:16 +01:00
Alexey Ushakov
0bc5fc88fa JBR-9301 Vulkan: SwingSet2 crash window server
Clear native peer on windowClosing in Frame object
2026-01-20 01:04:15 +01:00
Vitaly Provodin
2fbd67c61c Revert "8367017: Remove legacy checks from WrappedToolkitTest and convert from bash"
This reverts commit e1071797a4.
2026-01-20 01:04:15 +01:00
Alexey Ushakov
1c3354d840 JBR-9376 Vulkan: Incorrect deallocation in VKDevice_Reset
Moved texture pool into VKRenderer
2026-01-20 01:04:15 +01:00
vlad20012
95d2f61aaa JBR-8303 Provide JBR API method to perform GC with more intensive heap shrinking 2026-01-20 01:04:15 +01:00
Maxim Kartashev
3cf2e22200 JBR-7457 Provide JBR API method to explicitly call gc() 2026-01-20 01:04:15 +01:00
Dmitry Batrak
19a954a334 JBR-9365 Unnecessary operations on tree node update 2026-01-20 01:04:15 +01:00
Alexey Ushakov
c1c39004ac JBR-9312 Vulkan: Icorrect semaphore usage validation error
Mute error for now
2026-01-20 01:04:15 +01:00
bourgesl
857c7c67a3 JBR-9351 jb/java/awt/Counters/UpdateWindowsCounter.java fails by time out
Fixed Timers to be daemon
2026-01-20 01:04:15 +01:00
bourgesl
2b3e29dae2 JBR-9350 javax/swing/JOptionPane/8081019/bug8081019.java: Cannot invoke "sun.lwawt.LWWindowPeer.getTarget()" because "this.peer" is null
Added peer null checks + use perfCountersEnabled flag
2026-01-20 01:04:15 +01:00
Maxim Kartashev
905e17b974 JBR-6769 Make it possible to get info whether IDE is running in a virtual env
Added system property intellij.os.virtualization with possible values
"none", "Xen", "KVM", "VMWare", "HyperV"

(cherry picked from commit 92e4311f13)
2026-01-20 01:04:15 +01:00
Maxim Kartashev
ae12ef0933 JBR-6979 Modernize more WaitForSingleObject on Windows
Use -XX:+UnlockExperimentalVMOptions -XX:-UseModernSynchAPI
to switch back to the original implementation
2026-01-20 01:04:15 +01:00
Nikita Provotorov
2c92a1d4e4 JBR-9349 Do_Not_Use_calloc_Use_safe_Calloc_Instead: is not a member of global namespace
Refactoring the code of JBR-4478 so that C++ standard library headers get only included in AccessibleCaret.cpp and not in any headers.

(cherry picked from commit 12bbc14e5e)
2026-01-20 01:04:14 +01:00
Nikita Tsarev
f450452dba JBR-9336: Fix build error with old wayland protocol headers [WLToolkit]
(cherry picked from commit 95f6cb6d66649109b18da8179fd015f0f331bc69)
2026-01-20 01:04:14 +01:00
Nikita Gubarkov
cefd093002 JBR-9111 Vulkan: Lock RQ while disposing the surface
(cherry picked from commit 75cc5b3c25e15498139ed2dc81bf8c47cc2471b0)
2026-01-20 01:04:14 +01:00
Maxim Kartashev
d1c444545f JBR-9332 Wayland: popups are not closed when parent looses focus
(cherry picked from commit f85b08add5c9505629eaad4d88378b193a2a2c5a)
2026-01-20 01:04:14 +01:00
Nikita Tsarev
e617f547eb JBR-9326 Support TransferHandler.setDragImage [WLToolkit]
(cherry picked from commit 351f13f526a6ac37264a845618ece397a631410a)
2026-01-20 01:04:14 +01:00
Maxim Kartashev
3bce4a8002 JBR-9310 Wayland: Gtk-WARNING in swing app
(cherry picked from commit cdf2ad9a2b6a2048e3eeaadb667e75f511cbcd81)
2026-01-20 01:04:14 +01:00
Dmitry Drobotov
213988c303 JBR-4478 Implement support for native accessible caret events on Windows
The feature adds caret tracking support for assistive tools that don't work with Java Access Bridge, specifically, for the built-in Windows Magnifier.
It works by implementing Win32 IAccessible interface for the text caret, and sending EVENT_OBJECT_LOCATIONCHANGE events whenever it changes.
It's enabled by default and can be disabled by setting `sun.awt.windows.use.native.caret.accessibility.events` property to false.

(cherry picked from commit 88f1599bad)
(cherry picked from commit 3f6c1d54e10d49dc72f9d02f30e52f4aa32e099d)
2026-01-20 01:04:14 +01:00
bourgesl
f0e4aef87c JBR-9283 Enhance Window counters to provide statistics
Enhanced Window counters to provide statistics (using the new marlin StatDouble class), enhanced logging code to dump regularly (10s) window stats, added shutdown hook, bumpCounter() renamed to incrementCounter(), added addStat(window, name, value) used by MTLLayer to report blitTexture & nextDrawable timings (ms), use InnocuousThread for shutdown hooks, fixed D3DSurfaceData bumpCounter() usages to incrementCounter()
2026-01-20 01:04:14 +01:00
Maxim Kartashev
cb0d1eb831 JBR-9302 Wayland: default window decoration to look more like KDE 2026-01-20 01:04:14 +01:00
Maxim Kartashev
454d1d1eb9 JBR-9016 Add API for making screenshots of some regions of the application without interacting with OS 2026-01-20 01:04:14 +01:00
Dmitry Batrak
b09b5caf61 JBR-4665 Focus 'jitter' on window showing in WSLg
(cherry picked from commit 9b32c2a577)
(cherry picked from commit 2952a2eeb4)
2026-01-20 01:04:14 +01:00
Dmitry Batrak
e501cd97a5 JBR-4535 Popup windows disappear on mouse hover when 'Focus strictly under mouse' policy is used in KDE
(cherry picked from commit a70a83e7fe)
2026-01-20 01:04:13 +01:00
Dmitry Batrak
f290753134 JBR-2759 Typeahead issue on Linux
(cherry picked from commits 76bdaf1131, b20c56ff3e, c9609330f2, a170b4e4ae)

(cherry picked from commit 281e6abf47)
2026-01-20 01:04:13 +01:00
Maxim Kartashev
018d9ffafa JBR-9289 Wayland: an option to turn window shadow off
Use -Dsun.awt.wl.Shadow=false to turn all the window shadows off
2026-01-20 01:04:13 +01:00
Maxim Kartashev
26dd5d5d67 JBR-9288 Wayland: use builtin window decorations in KDE 2026-01-20 01:04:13 +01:00
Maxim Kartashev
007a59e405 JBR-9228 KDE: jb/java/awt/Toolkit/DetectingOSThemeTest.java fails 2026-01-20 01:04:13 +01:00
Nikita Gubarkov
00655d12a1 JBR-7334 Skip custom title bar reconfiguration if nothing changed 2026-01-20 01:04:13 +01:00
Vladimir Lagunov
d1bbd4126a JBR-9260 Different ExtendedOptions.NOSHARE_DELETE in WindowsChannelFactory
Before this commit there was a race condition: `sun.nio.fs.ExtendedOptions.InternalOption.register(java.nio.file.OpenOption)` could register only one option.

There have been two similar options:
* `sun.nio.fs.ExtendedOptions.NOSHARE_DELETE`
* `java.io.JbExtendedOpenOptions.NOSHARE_DELETE`

This led to the following failure:
```
Caused by: java.lang.UnsupportedOperationException
    at java.base/sun.nio.fs.WindowsChannelFactory$Flags.toFlags(WindowsChannelFactory.java:131)
    at java.base/sun.nio.fs.WindowsChannelFactory.newFileChannel(WindowsChannelFactory.java:151)
    at java.base/sun.nio.fs.WindowsFileSystemProvider.newFileChannel(WindowsFileSystemProvider.java:114)
    at java.base/java.io.IoOverNioFileSystem.initializeStreamsUsingNio0(IoOverNioFileSystem.java:294)
    at java.base/java.io.IoOverNioFileSystem.initializeStreamUsingNio(IoOverNioFileSystem.java:279)
    at java.base/java.io.RandomAccessFile.<init>(RandomAccessFile.java:332)
```

This commit fixes the issue, now both options are supported.
2026-01-20 01:04:13 +01:00
Vladimir Lagunov
847c9656e8 JBR-9181 IoOverNio.isAllowedInThisThread also checks IS_ENABLED_IN_GENERAL
`IoOverNio.isAllowedInThisThread` contained a bug: it could return `true` even if the feature is totally disabled.

Luckily, all usages of `IoOverNio.isAllowedInThisThread` don't exploit this bug. However, this problem can suddenly hit us later.
2026-01-20 01:04:13 +01:00
Vladimir Lagunov
c6354e83b7 JBR-9179 ZipFile over nio: more usages of custom nio fs 2026-01-20 01:04:13 +01:00
Maxim Kartashev
087a328458 JBR-9239 Wayland: IDE partially hangs on any modal dialog 2026-01-20 01:04:13 +01:00
Nikita Gubarkov
c8b008c0aa JBR-9236 Vulkan: Proper builds without Vulkan 2026-01-20 01:04:13 +01:00
Nikita Tsarev
e3083bf7b1 JBR-9243: Report key modifiers in key typed events [WLToolkit] 2026-01-20 01:04:13 +01:00
Vitaly Provodin
1a9bd6c41a JBR-9238 Introduce distinct test groups for Vulkan runs 2026-01-20 01:04:12 +01:00
Maxim Kartashev
58e732b6ba JBR-9081 Wayland: GTK title bar does not respect theme on Fedora 42 2026-01-20 01:04:12 +01:00
Maxim Kartashev
3a21fccfc9 JBR-9189 Avoid really hiding a window that was never shown 2026-01-20 01:04:12 +01:00
Nikita Tsarev
92a7c7c203 JBR-9149: Also report lowercased mime types when offering data sources [WLToolkit] 2026-01-20 01:04:12 +01:00
bourgesl
1459943d83 JBR-7582: use completedHandler to freeDrawableCount to fix the broken cpu barrier with window-sharing and 1 external monitor as the Presented Handler is not safe enough (missing calls or delayed) 2026-01-20 01:04:12 +01:00
Nikita Gubarkov
b404ec7123 Revert "JBR-8937 Vulkan: crash in disposal code"
This reverts commit 442ac6f6605366c3acb43cc220ca44153ce96a8c.
2026-01-20 01:04:12 +01:00
Alexey Ushakov
54dd45d950 JBR-8937 Vulkan: crash in disposal code
Added synchronization before disposal
2026-01-20 01:04:12 +01:00
Nikita Gubarkov
242e744128 JBR-9070 Vulkan: Add sun.java2d.vulkan=True diagnostics 2026-01-20 01:04:12 +01:00
Nikita Gubarkov
ff7d182bf3 JBR-9060 Vulkan: Fix MASK_FILL artifacts
Change local maskPos calculation from integer to floating point subtraction.
2026-01-20 01:04:12 +01:00
Nikita Gubarkov
8a53e9f4fd JBR-8810 Vulkan: Exclude native Vulkan files from vk=off builds 2026-01-20 01:04:12 +01:00
Nikita Gubarkov
4e052fe385 JBR-8740 Vulkan: Optimize BLIT 2026-01-20 01:04:12 +01:00
Nikita Gubarkov
a28ccd9713 JBR-8739 Vulkan: Optimize SURFACE_TO_SW_BLIT 2026-01-20 01:04:11 +01:00
Nikita Gubarkov
b34bdcef09 JBR-8738 Vulkan: Optimize ISO_BLIT 2026-01-20 01:04:11 +01:00
Nikita Gubarkov
52243fee3c JBR-8737 Vulkan: Respect nonCoherentAtomSize in allocator 2026-01-20 01:04:11 +01:00
Nikita Gubarkov
8ac60e17e4 JBR-9176 Vulkan: Refactor dynamic buffer data allocation 2026-01-20 01:04:11 +01:00
Nikita Gubarkov
90b0254acf JBR-9174 Vulkan: Cleanup image/buffer barriers 2026-01-20 01:04:11 +01:00
Nikita Gubarkov
9ee8587445 JBR-9173 Vulkan: Unify cleanup logic 2026-01-20 01:04:11 +01:00
Vladimir Lagunov
70de6e146e JBR-8965 java.io over nio: improve the performance of IoOverNioFileSystem.getBooleanAttributes
The new code avoids creating unnecessary exceptions.
2026-01-20 01:04:11 +01:00
Maxim Kartashev
8f93a5198e JBR-6145 Wayland: synthetic focus for popups 2026-01-20 01:04:11 +01:00
Maxim Kartashev
df4f4b39d4 JBR-6145 Wayland: refactor surface-to-peer mapping 2026-01-20 01:04:11 +01:00
Artem Bochkarev
54b6fdc933 JBR-6478 Add possibility to determine builtin display under OSX 2026-01-20 01:04:11 +01:00
Vitaly Provodin
9cb0114be8 update exclude list on results of main.3468 test runs 2026-01-20 01:04:11 +01:00
Maxim Kartashev
6b69edf268 JBR-9095 JBR API for HiDPI info 2026-01-20 01:04:11 +01:00
Vitaly Provodin
cd6e6b8c41 update exclude list on results of main.3451 test runs 2026-01-20 01:04:10 +01:00
Vitaly Provodin
176835c77b JBR-9065 split part4 onto parts 2026-01-20 01:04:10 +01:00
Sergey Shelomentsev
e88fff72f7 JBR-5318 add Github workflow usage for pull requests pre-commit testing
(cherry picked from commit f36aa7f9fa)
2026-01-20 01:04:10 +01:00
Maxim Kartashev
3c74708d56 JBR-6876 Wayland: GTK title bar
GTK title bar is displayed iff gtk/gdk/glib libraries are available.
Controlled with -Dsun.awt.wl.WindowDecorationStyle=[gtk|builtin].
2026-01-20 01:04:10 +01:00
Gustavo Fão Valvassori
ca22c80520 JBR-9035 Support RTL on Decorated Window Title Bar (#540) 2026-01-20 01:04:10 +01:00
Nikita Tsarev
eec46c19dd JBR-9043: Return null from getPlatformImageBytesForFormat for images with unknown extents on macOS 2026-01-20 01:04:10 +01:00
Nikita Tsarev
36a06add56 JBR-9044: Use getPlatformImageBytes to transfer TIFF images on macOS 2026-01-20 01:04:10 +01:00
Vitaly Provodin
82fe768250 update exclude list on results of main.3434 test runs 2026-01-20 01:04:10 +01:00
Maxim Kartashev
af102e29e0 JBR-6876 Wayland: refactor frame decorations
Also removes decorations from fullscreen windows
2026-01-20 01:04:10 +01:00
Nikita Tsarev
ab08605579 JBR-8952: Respect data flavor when encoding images on macOS 2026-01-20 01:04:10 +01:00
Maxim Kartashev
4c7bb17fb7 JBR-9002 Wayland: deadlock with J2DDemo 2026-01-20 01:04:10 +01:00
Maxim Kartashev
063dde93b9 JBR-8994 Wayland test runs cause agents to reboot, cannot be completed 2026-01-20 01:04:10 +01:00
Vitaly Provodin
d35aad242b Update README.md 2026-01-20 01:04:09 +01:00
Maxim Kartashev
79359edb75 JBR-8990 Wayland: make sure activating surface is valid when performing toFront() 2026-01-20 01:04:09 +01:00
Vladimir Kharitonov
e7f4ba35ba JBR-8992 fix com.jetbrains:jbr-api:SNAPSHOT pom file 2026-01-20 01:04:09 +01:00
Maxim Kartashev
a07b83518f JBR-8991 Wayland: javax/swing/JMenu/bug4342646.java: PopupMenu is incorrectly placed at left of menu 2026-01-20 01:04:09 +01:00
Vitaly Provodin
764fc8c0af update exclude list on results of 3399 test runs 2026-01-20 01:04:09 +01:00
Maxim Kartashev
f0f0e15766 JBR-8626 Wayland: window shadow 2026-01-20 01:04:09 +01:00
Maxim Kartashev
9da5d9e0a6 JBR-8626 Wayland: sub-surface support 2026-01-20 01:04:09 +01:00
Maxim Kartashev
2ed13a2a66 JBR-8626 Wayland: proper encapsulation for WLComponentPeer 2026-01-20 01:04:09 +01:00
Maxim Kartashev
16b45a3f78 JBR-8626 Wayland: uniform data access synhronization for WLComponentPeer 2026-01-20 01:04:09 +01:00
Maxim Kartashev
c951d71892 JBR-8626 Wayland: relocate rounded corner painting to WLWindowPeer 2026-01-20 01:04:09 +01:00
Maxim Kartashev
0896db9e6b JBR-8626 Wayland: fall-back client-side window decorations 2026-01-20 01:04:09 +01:00
Vitaly Provodin
ac94ff7d5e Update README.md 2026-01-20 01:04:08 +01:00
Vitaly Provodin
86718d94fe fixup! JBR-7800 use jmod from the build for signing libs and execs inside jmod files 2026-01-20 01:04:08 +01:00
Dmitry Drobotov
eb7ec35116 JBR-8490 Improve searching for scroll bars in ScrollAreaAccessibility.
Use JScrollPane.getVerticalScrollBar/getHorizontalScrollBar methods to look for scroll bars. In some cases a scroll bar might be not a direct child of the scroll area, but it can still be assigned to the vertical/horizontalScrollBar property.

(cherry picked from commit 646d2e478f)
2026-01-20 01:04:08 +01:00
Dmitry Drobotov
221945d874 JBR-8408 Post accessibility value changed events for scroll bars
3rd party apps might want to subscribe for scroll bar value changed events to track scroll position. VoiceOver and Zoom don't react on these events.

(cherry picked from commit 4214897d5e)
2026-01-20 01:04:08 +01:00
Nikita Tsarev
f3f4886014 JBR-5860: Implement drag-and-drop [WLToolkit] 2026-01-20 01:04:08 +01:00
Vitaly Provodin
a63add97b7 update exclude list on results of 3379 test runs 2026-01-20 01:04:08 +01:00
Nikita Tsarev
9a0216d9c3 JBR-8912: Fix pasting unicode content from clipboard [WLToolkit] 2026-01-20 01:04:08 +01:00
Maxim Kartashev
d16a8a8a59 JBR-8949 Wayland: java/awt/Gtk/GtkVersionTest/GtkVersionTest.java: Wrong GTK library version: null 2026-01-20 01:04:08 +01:00
Maxim Kartashev
f1430a37ce JBR-7087 Wayland: enable more GTK tests 2026-01-20 01:04:08 +01:00
Vitaly Provodin
62f5fdb3b8 update exclude list on results of 3373 test runs 2026-01-20 01:04:08 +01:00
Alexey Ushakov
d1c56fc067 JBR-8911 Backport: 8304825: MacOS metal pipeline - window isn't painted if created during display sleep
Adjusting OpenJDK patch for display link
2026-01-20 01:04:08 +01:00
Vitaly Provodin
50733d5197 Update README.md 2026-01-20 01:04:08 +01:00
Sergey Shelomentsev
b6e3a60fb4 fixup! JBR-4154 use -V to sort versions 2026-01-20 01:04:07 +01:00
Nikita Gubarkov
77f8475187 JBR-8884 JBR API: Use proper class loader for class resolution in ProxyGenerator 2026-01-20 01:04:07 +01:00
Nikita Tsarev
2614cc8bd1 JBR-8833: Refactor Wayland data device abstraction [WLToolkit] 2026-01-20 01:04:07 +01:00
Vitaly Provodin
ff46507efd fixup! JBR-4154 fix extracting version info from sources 2026-01-20 01:04:07 +01:00
Vitaly Provodin
7db37b7810 fixup! JBR-4154 fix extracting version info from sources 2026-01-20 01:04:07 +01:00
Vitaly Provodin
3208e3ce3a clean up fixed issues from exclude lists 2026-01-20 01:04:07 +01:00
Vitaly Provodin
5c3c5eeb11 fixup! JBR-4154 fix extracting version info from sources 2026-01-20 01:04:07 +01:00
Artem Bochkarev
4ee07cda70 JBR-8548 Add possibility to build without out-of-process part in Linux. 2026-01-20 01:04:07 +01:00
Vitaly Provodin
a2e7c4b6a2 Update README.md 2026-01-20 01:04:07 +01:00
Maxim Kartashev
679f971a0b JBR-8643 Wayland: popup will not appear if located outside of parent window 2026-01-20 01:04:07 +01:00
Vladimir Lagunov
84ca7d2033 JBR-8664 Optimize sun.nio.fs.WindowsPath.compareTo 2026-01-20 01:04:07 +01:00
Maxim Kartashev
8096583fd2 JBR-8304 Wayland: UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java throws HeadlessException: No X11 DISPLAY variable was set
Pass JVM options to sub-tests in a more reliable and uniform fashion
2026-01-20 01:04:07 +01:00
Vitaly Provodin
c280e9e6a4 Update README.md 2026-01-20 01:04:06 +01:00
Vitaly Provodin
2e991115c4 JBR-6620 restore displayMode to the state that was before running the test
(cherry picked from commit 285d3d3860)
2026-01-20 01:04:06 +01:00
Maxim Kartashev
5921c58b2c JBR-8700 Wayland: Glitchy resize in J2Ddemo 2026-01-20 01:04:06 +01:00
Vitaly Provodin
456f5b61c8 Update README.md 2026-01-20 01:04:06 +01:00
Nikita Provotorov
dc609d0113 JBR-6085: java/awt/event/KeyEvent/AltGraphModifier.java: Modifier Mask is not set.
Stabilizing the test by getting rid of false-positive errors.
2026-01-20 01:04:06 +01:00
Vitaly Provodin
b64489135a update exclude list on results of 3316 test runs 2026-01-20 01:04:06 +01:00
Sergey Shelomentsev
db16c9a4f0 JBR-5819 fix custom title bar tests 2026-01-20 01:04:06 +01:00
bourgesl
a5cbce25c5 JBR-8276: fixed CPlaformWindow.flushBuffers() to use LWCTooolkit.invokeAndWait() discarded when CGDisplayRegisterReconfigurationCallback() is in progress (ThreadUtilities.blockingThread + removed isWithinPowerTransition code)
- fixed CVDisplayLink management on wake-ups/sleep and display reconfiguration
- restored opengl changes
2026-01-20 01:04:06 +01:00
bourgesl
ae39075803 JBR-8278: fixed performOnMainThreadWaiting run block condition to fix FullscreenWindowProps and NoResizeEventOnDMChangeTest tests 2026-01-20 01:04:06 +01:00
Vitaly Provodin
bba64ffa00 update exclude list on results of 3297 test runs 2026-01-20 01:04:06 +01:00
Nikita Tsarev
20a796cefb JBR-8685: Add new macOS 15.4 shortcuts to the system shortcuts API 2026-01-20 01:04:06 +01:00
Nikita Tsarev
8fca43bd8b JBR-8684: Fix for a buffer overrun when reading system hotkey configuration with unexpected shortcuts on macOS 2026-01-20 01:04:05 +01:00
Nikita Gubarkov
4e3e880b8f JBR-8682 Vulkan: logicOpEnable Validation Error 2026-01-20 01:04:05 +01:00
Vitaly Provodin
3f506e0150 update exclude list on results of 3293 test runs 2026-01-20 01:04:05 +01:00
Nikita Gubarkov
32b062458c JBR-8673 Disable watch.desktop.geometry on excessive event count 2026-01-20 01:04:05 +01:00
Nikita Gubarkov
3245e29ffd JBR-6225 Revert CGGI_GlyphInfoDescriptor refactoring 2026-01-20 01:04:05 +01:00
Maxim Kartashev
4190db8cd5 JBR-3323 Exclude parts of VM code from sanitizer checks
Exclude VM error-reporting code that treats memory as a raw sequence of
bytes from address sanitizer checks. This is needed to only get true
reports when running tests against the --enable-asan build.

(cherry picked from commit 4c2085b5f7)
2026-01-20 01:04:05 +01:00
Vitaly Provodin
2fe48ad0cb update exclude list on results of 3278 test runs 2026-01-20 01:04:05 +01:00
Maxim Kartashev
6c6895c861 JBR-8618 Wayland: GTK LaF does not change appearance when system theme changes 2026-01-20 01:04:05 +01:00
Nikita Gubarkov
d772473bdf JBR-8112 Revert swing.bufferPerWindow back to false on Windows 2026-01-20 01:04:05 +01:00
Dmitrii Morskii
1df5eda356 JBR-7040 implemented FPS counter on D3D 2026-01-20 01:04:05 +01:00
Dmitrii Morskii
3036deb389 JBR-7900 Improve logic of detecting toolkit inside registerShutdownHook 2026-01-20 01:04:05 +01:00
Dmitrii Morskii
6da7a35d7b JBR-7051 Improved D3D Toolkit:
-Increased rendering performance
	-Improved text rendering quality
	-Accelerated repainting during window resizing
	-Removed unnecessary fallback to GDI rendering
	-Eliminated unnecessary hardware limitations
2026-01-20 01:04:05 +01:00
Anton Tarasov
548072fa6e JRE-119 [use default "sun.java2d.dpiaware=true" to be dpi-aware on Window 7]
This lets awt_Win32GraphicsEnv.cpp SetProcessDPIAwareProperty() call Win7 specific ::SetProcessDPIAware() API func.

(cherry picked from commit 5e7a766090810d839f4352d06fc2812499d766f8)
(cherry picked from commit 7d1d43bfa1)
(cherry picked from commit 2351382562)
2026-01-20 01:04:04 +01:00
Maxim Kartashev
1a564bbff7 JBR-8639 Wayland: exclude tests depending on mouseMove 2026-01-20 01:04:04 +01:00
Maxim Kartashev
39cbb464ac JBR-8572 Wayland: java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java: Wrong GTK library version: null 2026-01-20 01:04:04 +01:00
Maxim Kartashev
08f94ae8af JBR-7087 Wayland: GtkFileDialogPeer implementation 2026-01-20 01:04:04 +01:00
Maxim Kartashev
60c39c821b JBR-7087 Wayland: Desktop support via GNOME 2026-01-20 01:04:04 +01:00
Maxim Kartashev
ae6218acac JBR-7087 Wayland: GTKLookAndFeel support 2026-01-20 01:04:04 +01:00
Sergey Shelomentsev
8541d89698 Add problem list for fastdebug configurations 2026-01-20 01:04:04 +01:00
Nikita Gubarkov
c73ac5f824 JBR-7882 Calculate point size from both x and y transform components 2026-01-20 01:04:04 +01:00
Nikita Gubarkov
f27b212b2a JBR-8289 Fix invisible glyph encoding in composite fonts 2026-01-20 01:04:04 +01:00
Maxim Kartashev
f8efb3fd1e JBR-8210 Exclude javax/swing/JPopupMenu/7156657/bug7156657.java for WLToolkit 2026-01-20 01:04:04 +01:00
Nikita Gubarkov
dfaa7242ba JBR-8608 Vulkan: Cleanup capability checks 2026-01-20 01:04:04 +01:00
Maxim Kartashev
a05f7538ee JBR-7892 Generate a descriptive error message when awt cannot be loaded 2026-01-20 01:04:04 +01:00
Vladimir Lagunov
35c662c365 JBR-8539 fix jdk/jfr/event/io/TestFileReadOnly.java: mimic errors in RandomAccessFile.write 2026-01-20 01:04:03 +01:00
Vladimir Lagunov
1bf5501609 JBR-8538 JBR-7700 Change handling of new File("")
A new behavior for java.io.File was introduced in commit 9477c705c0. For example, `new File("").exists()` returns true now, but it used to return false.
2026-01-20 01:04:03 +01:00
Vladimir Lagunov
a6c91bcb4f JBR-7700 Fix the behavior of setReadOnly(false) on Posix 2026-01-20 01:04:03 +01:00
Vladimir Lagunov
0865a425fa JBR-7700 Prepare for cases when getFileAttributeView returns null
It doesn't happen in any default implementation with default attribute classes, but some 3rd party implementations can do that.
2026-01-20 01:04:03 +01:00
Vladimir Lagunov
bfd49f1e52 JBR-7700 Fix the case with deletion of locked file on Windows 2026-01-20 01:04:03 +01:00
Maxim Kartashev
27cc79b9c1 JBR-8551 Wayland: javax/swing/JSlider/TestJSliderRendering.java: The slider is not rendered properly 2026-01-20 01:04:03 +01:00
Nikita Gubarkov
9a050f679c JBR-8601 Vulkan: Decouple from Wayland 2026-01-20 01:04:03 +01:00
Vitaly Provodin
21f973d03b Update README.md 2026-01-20 01:04:03 +01:00
Maxim Kartashev
5944831420 JBR-3498 Windows: exception when trying to delete a directory with a trailing space
Allow Windows Path to have a trailing space despite Windows naming conventions
discouraging it. Many programs - including Explorer - successfully work
with such files or directories.

(cherry picked from commit 64a468280c)
2026-01-20 01:04:03 +01:00
Maxim Kartashev
92d4bae6e1 JBR-8587 jb/build/ResolveSymbolsTest/ResolveSymbolsRealEnv.java fails on Alpine 2026-01-20 01:04:03 +01:00
Vitaly Provodin
901bf134f4 JBR-8219 run "clean" separately before building (workaraound for JDK-8349665) 2026-01-20 01:04:03 +01:00
Vitaly Provodin
c0fc58360f update exclude list on results of 3188 test runs 2026-01-20 01:04:02 +01:00
Nikita Tsarev
fd8ecd533b JBR-8533: Fix wrong keys and modifiers being reported for certain non-function key combinations [WLToolkit] 2026-01-20 01:04:02 +01:00
Maxim Kartashev
71772307ab JBR-7896 Wayland: Deadlock in WLClipboard
Avoid performing blocking I/O while holding a lock
2026-01-20 01:04:02 +01:00
Nikita Gubarkov
c3bc87de43 JBR-8555 Vulkan: Do not flush the surface on transform change 2026-01-20 01:04:02 +01:00
Nikita Gubarkov
eeb5970eb4 JBR-8553 Vulkan: Respect filtering hints in blits 2026-01-20 01:04:02 +01:00
Nikita Gubarkov
60cae8dd05 <TEMP> 8353542: No native raster data for common pixel-interleaved BufferedImages
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2026-01-20 01:04:02 +01:00
Nikita Gubarkov
f2c1393b2d JBR-8525 Vulkan: Fix offscreen surface scaling 2026-01-20 01:04:02 +01:00
Maxim Kartashev
4317192ee2 JBR-8436 Describe various type of github releases 2026-01-20 01:04:02 +01:00
Vitaly Provodin
c61a3eecf4 update exclude list on results of 3184 test runs 2026-01-20 01:04:02 +01:00
Alexey Ushakov
e5d621047f JBR-7725 Vulkan: low performance in SwingMark
Implemented intermediate buffer for loading raster data
Removed extra synchronization in blits
2026-01-20 01:04:02 +01:00
Nikita Gubarkov
39a3f89707 JBR-8485 Vulkan: Blit surface into itself 2026-01-20 01:04:02 +01:00
Alexey Ushakov
1b5925ab38 JBR-8479 Support Vulkan accelerated mode in perf scripts
Added the new option, minor refactoring
2026-01-20 01:04:02 +01:00
Nikita Gubarkov
0fb823bbec JBR-8478 Vulkan: Pull real supported formats from the device 2026-01-20 01:04:01 +01:00
Nikita Gubarkov
cda8fbe625 JBR-8473 Vulkan: Support for various source blit formats via swizzling 2026-01-20 01:04:01 +01:00
Nikita Gubarkov
9b6de53b62 JBR-8472 Vulkan: Respect source alpha type in blit routines 2026-01-20 01:04:01 +01:00
Nikita Gubarkov
c6b4737907 JBR-8471 Vulkan: Reuse descriptor sets in blit routines 2026-01-20 01:04:01 +01:00
Nikita Tsarev
3fe69ba1f6 JBR-8422: A temporary workaround for crash in SystemHotkey setup on macOS 15.4 beta 2026-01-20 01:04:01 +01:00
Vitaly Provodin
007a3cec5d update exclude list on results of 3147 test runs 2026-01-20 01:04:01 +01:00
Nikita Gubarkov
f250fc66cb JBR-8448 Vulkan: Cleanup & fix Sw->Surface blit 2026-01-20 01:04:01 +01:00
Nikita Gubarkov
debdcde396 JBR-8447 Vulkan: Implement multi-view images 2026-01-20 01:04:01 +01:00
bourgesl
48ba5c54b6 JBR-5497: change the default value for the system property "awt.mac.flushBuffers.invokeLater" to 'enabled' to avoid any potential freeze (safe) until a better solution 2026-01-20 01:04:01 +01:00
bourgesl
28c4113093 JBR-5497: follow-up fix
- monitors sleep/wake-up notifications to define ThreadUtilities.isWithinPowerTransition()
- fixed CPlatformWindow.flushBuffers() to use this pwm flag to use invokeLater() when the system property '-Dawt.mac.flushBuffers.pwm=true'
- always use invokeLater() when display mirroring is enabled (i.e. '-Dawt.mac.flushBuffers.invokeLater'=[auto|default])
- always use the timeout=0.666s in CPlatformWindow.flushBuffer()
- always use the time limit=13.333s in LWCToolkit.doAWTRunLoop() to ensure avoiding any potential hangs / freezes on macOS
2026-01-20 01:04:01 +01:00
bourgesl
433ce2fcff JBR-8183: fixed cherry-pick (bad merge) 2026-01-20 01:04:01 +01:00
bourgesl
3cca887053 JBR-8183: get low resolution display modes (mac intel) and do not call anymore the DisplayConfiguration transaction on the main thread avoid main thread as it hangs for several seconds on macbook intel + macOS 15 2026-01-20 01:04:00 +01:00
Nikita Gubarkov
85fc971a12 <TEMP> 8352407: PixelInterleavedSampleModel with unused components throws RasterFormatException: Incorrect pixel stride
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2026-01-20 01:04:00 +01:00
Nikita Gubarkov
66867134aa JBR-8442 Vulkan: Fix OPAQUE mode rendering 2026-01-20 01:04:00 +01:00
Nikita Gubarkov
9c42e382c5 JBR-8440 Vulkan: Pass the surface format to native code 2026-01-20 01:04:00 +01:00
Nikita Gubarkov
7693d6d267 JBR-8441 Vulkan: Update CArrayUtil.h 2026-01-20 01:04:00 +01:00
Nikita Gubarkov
9f44058647 JBR-8439 Vulkan: Cleanup Surface->Surface blit 2026-01-20 01:04:00 +01:00
Alexey Ushakov
2782de2bfe JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Added regression test and flush content of the destination surface
2026-01-20 01:04:00 +01:00
Alexey Ushakov
d55a0c4904 JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Passed transform to VKRenderer code
2026-01-20 01:04:00 +01:00
Alexey Ushakov
b2dc6d188a JBR-8430 Vulkan: move RenderingContext into Renderer
Moved context to the VKRenderer
2026-01-20 01:04:00 +01:00
Vitaly Provodin
5e6b26f533 update exclude list on results of 3113 test runs 2026-01-20 01:04:00 +01:00
Vitaly Provodin
2a3c1b4d34 JBR-8417 specify XCODE_PATH for JBR building on macOS 2026-01-20 01:04:00 +01:00
Maxim Kartashev
1125ba774d JBR-8419 sources/TestNoNULL.java: Test found 32 usages of 'NULL' in source files 2026-01-20 01:04:00 +01:00
Nikita Gubarkov
21a41fc02a JBR-8424 Vulkan: Format-aware Surface->Sw blit 2026-01-20 01:03:59 +01:00
Nikita Gubarkov
c93b65f4a1 JBR-8423 Vulkan: Expose VKFormat on Java side 2026-01-20 01:03:59 +01:00
Nikita Provotorov
74fbdc7260 JBR-7659 [macOS] SIGILL at [CoreFoundation+0x1d47c5] CFRunLoopRunSpecific.cold.1+0xe / sun.lwawt.macosx.CAccessibility.getChildrenAndRolesRecursive (2K frames).
Fixes crashes caused by multiple javax.accessibility.AccessibleState.EXPANDED/COLLAPSED changes by making sure AppKit has not more than one event of each type being processed or pending in its queue. The logic can be rolled back via a new system property -Dsun.lwawt.macosx.CAccessible.eventsCoalescingEnabled=false.

(cherry picked from commits 84012b5f39, a2707d4e95, fa8c4705e6, a23ab5a040, fe07d2731a)
2026-01-20 01:03:59 +01:00
Vladimir Lagunov
31f481ee91 JBR-8396 JBR-7700 Fix FileTest.getCanonicalPath on macOS 2026-01-20 01:03:59 +01:00
Alexey Ushakov
b673701269 JBR-8398 Vulkan: refactor shader code to use transforms
Replaced normalization logic with transform matrix
2026-01-20 01:03:59 +01:00
Nikita Gubarkov
3b863266dd JBR-8413 Vulkan: Make surfaces VKGPU-aware 2026-01-20 01:03:59 +01:00
Nikita Gubarkov
200d8a1b69 JBR-8412 Vulkan: Add generic offscreen GraphicsConfig implementation 2026-01-20 01:03:59 +01:00
Nikita Gubarkov
a8be658969 JBR-8411 Vulkan: Move generic VKGraphicsConfig implementation into shared code 2026-01-20 01:03:59 +01:00
Nikita Gubarkov
414fe2d3ad JBR-8410 Vulkan: Expose VKDevice on Java side 2026-01-20 01:03:59 +01:00
Nikita Gubarkov
4e9cde2bf2 JBR-8391 Vulkan: Split instance and device into separate files 2026-01-20 01:03:59 +01:00
Vladimir Lagunov
9c3f6db9c7 JBR-7700 Classes from package java.io. use java.nio.file inside
The option can be enabled/disabled by specifying `-Djbr.java.io.use.nio=true/false`
2026-01-20 01:03:59 +01:00
Vitaly Provodin
0c3000eef8 update exclude list on results of 3097 test runs 2026-01-20 01:03:58 +01:00
Vitaly Provodin
e38f4c4ec7 Update README.md 2026-01-20 01:03:58 +01:00
Nikita Gubarkov
7f46b6b5a0 JBR-8363 Vulkan: Organize usage of FlushRenderPass and FlushSurface 2026-01-20 01:03:58 +01:00
Nikita Gubarkov
679190c137 JBR-8359 Vulkan: Put VK_DRAW after VKRenderer_AllocateMaskFillBytes
As VKRenderer_AllocateMaskFillBytes can invalidate draw call state due to overflow, it (and future similar functions) must be called before VK_DRAW.
2026-01-20 01:03:58 +01:00
Nikita Gubarkov
5234d34eb5 JBR-8358 Vulkan: Framebuffer destruction queue
Can be generalized to destroy arbitrary resources later.
2026-01-20 01:03:58 +01:00
Nikita Gubarkov
c9df99acc1 JBR-8350 Vulkan: Refactor pipeline cache & composites
This is needed for the implementation of painters (JBR-7646)
- Request pipelines one-by-one instead of a "pipeline sets"
- Split pipeline key into separate "shader" and "topology" (more items may need to be added later)
- Move management of composites into its own file
2026-01-20 01:03:58 +01:00
Alexey Ushakov
2221c29a82 JBR-8347 Download gtk-shell.xml if absent
Added downloading code
2026-01-20 01:03:58 +01:00
Vitaly Provodin
86b375440d update exclude list on results of 3054 test runs 2026-01-20 01:03:58 +01:00
Vitaly Provodin
fc5baeeae5 JBR-8196 fix calculating the number of attempts 2026-01-20 01:03:58 +01:00
Nikita Gubarkov
df66ccff3d JBR-8342 Vulkan: Skip validation setup if extension is unavailable 2026-01-20 01:03:58 +01:00
Nikita Tsarev
85874d9fdd JBR-7994: Properly report non-base-level function keys [WLToolkit] 2026-01-20 01:03:58 +01:00
Artem Bochkarev
259b76abb8 JBR-8138 Sign jcef binaries with separate entitlements
Revert to true the OSX entitlement "com.apple.security.cs.allow-dyld-environment-variables"
2026-01-20 01:03:58 +01:00
Vladimir Kharitonov
8bc80ddf18 JBR-8118 TextureWrapperImage for MTLTexture 2026-01-20 01:03:57 +01:00
Alexey Ushakov
8cf43a4f6f JBR-8297 Vulkan: Implement ISO_BLIT
Implemented general logic of the blit, removed extra logging
Corrected clipping logic, updated regression tests
Added some flush and init code for the surfaces
2026-01-20 01:03:57 +01:00
Dmitry Drobotov
3768aa9682 JBR-8216 Implement setAccessibilityValue method for NavigableTextAccessibility
* This method allows for third-party tools to modify text component contents through the accessibility API on macOS;
* The setAccessibilityValue method is implemented similarly to NavigableTextAccessibility.setAccessibilitySelectedText. On the Java side, it calls AccessibleEditableText.setTextContents according to the comment in JavaTextAccessibility.accessibilitySetValueAttribute;
* The isAccessibilitySelectorAllowed method is implemented similarly to JavaTextAccessibility.accessibilityIsValueAttributeSettable: it checks if the text component implements AccessibleEditableText, is enabled, and additionally checks if the editable property is true, because some components could be enabled but not editable, and we shouldn't allow setting the value in this case.

(cherry picked from commit 61a501351a)
2026-01-20 01:03:57 +01:00
Vitaly Provodin
ec2d1e9fce Update README.md 2026-01-20 01:03:57 +01:00
Vitaly Provodin
7e6ea50f3a JBR-8255 pass WLToolkit-related settings to subprocesses launched by tests 2026-01-20 01:03:57 +01:00
Vitaly Provodin
c581580a4d JBR-8244 add logging stdout/stderr of subprocesses
(cherry picked from commit 41d655243f)
2026-01-20 01:03:57 +01:00
Vitaly Provodin
2e33196888 update exclude list on results of 3034 test runs 2026-01-20 01:03:57 +01:00
Alexey Ushakov
c0a1b2146c JBR-8287 Vulkan: enable hw accelerated VolatileImage
Moved robot pixel grabber into windows surface data
Created offscreen surface data
Separated surfaces implementation into two files
Moved offscreen surface to the shared code

Fix
2026-01-20 01:03:57 +01:00
Nikita Gubarkov
fcdab20d41 JBR-8288 Vulkan: Synchronous render queue flush.
RQ doesn't expose async flush operation. All RQ flushes wait for the queue to be drained, effectively serializing queue flusher and EDT execution while still making it prone to deadlocks.
The periodic flush feature of the queue flusher thread is of no use as well, as every observable effect of RQ operation is already immediately followed by a forced flush.
As Vulkan functions have no restriction on the calling thread, keep it simple - lock the monitor and drain the queue synchronously.
2026-01-20 01:03:57 +01:00
Maxim Kartashev
466993c5a4 JBR-8264 java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java throws StackOverflowError at WLComponentPeer.getMinimumSize 2026-01-20 01:03:57 +01:00
Nikita Gubarkov
3ab11f44ce JBR-8284 Vulkan: fix $VULKAN_SDK autoconf check. 2026-01-20 01:03:57 +01:00
Nikita Gubarkov
1b1be1821e JBR-8254 Buffer X11GraphicsEnvironment.rebuildDevices calls. 2026-01-20 01:03:56 +01:00
Maxim Kartashev
d644fe2715 JBR-8234 IDE cannot start on Wayland with large scale
Make sure the surface used for the cursor is marked as such prior to
being committed in order to receive an exception from enforcing the rule
about the buffer size having to be multiple of its scale.
2026-01-20 01:03:56 +01:00
Maxim Kartashev
ba5045a3c2 JBR-7897 Tool window resizes is not smooth 2026-01-20 01:03:56 +01:00
Vitaly Provodin
880cfa26cb Update README.md 2026-01-20 01:03:56 +01:00
Vitaly Provodin
488f8752a8 update exclude list on results of 3005 test runs 2026-01-20 01:03:56 +01:00
Vitaly Provodin
cd2dd6ffbc Update README.md 2026-01-20 01:03:56 +01:00
Maxim Kartashev
5c9def3ebd JBR-8209 javax/swing/JPopupMenu/NestedFocusablePopupTest.java: WLRobotPeer: wakefield extension not present in Wayland instance 2026-01-20 01:03:56 +01:00
Alexey Ushakov
1e5618a388 JBR-8201 Vulkan: crash in VKRenderer_MaskFill
Supported fully opaque mask
2026-01-20 01:03:56 +01:00
Vitaly Provodin
27cdabdb30 Update README.md 2026-01-20 01:03:56 +01:00
Maxim Kartashev
aee7e446f0 JBR-8197 Wayland: Robot fails if offset in monitor configuration exists 2026-01-20 01:03:56 +01:00
Roman Shevchenko
65581dff68 JBR-8198: substituting empty extension with the "Unix executable" type in the macOS file dialog (#479) 2026-01-20 01:03:56 +01:00
Maxim Kartashev
5a4467f345 JBR-8066 Wayland: clipboard size is limited to 65000 symbols 2026-01-20 01:03:56 +01:00
Maxim Kartashev
12e19b4555 JBR-8116 Wayland: support RounderCornersManager JBR API 2026-01-20 01:03:55 +01:00
Nikita Gubarkov
6d9f1a3124 Added Clion project setup
(cherry picked from commit db962149ec)
2026-01-20 01:03:55 +01:00
Nikita Gubarkov
df758c27d9 Updated IDEA project setup 2026-01-20 01:03:55 +01:00
Vitaly Provodin
6a926f330f enabling dtrace-tests: added dtrace keyword
(cherry picked from commit 0b5119ca89)
(cherry picked from commit 1959e4a2a4)
2026-01-20 01:03:55 +01:00
bourgesl
1e2d131571 JBR-8159: kill CVDisplayLink zombies (sleep / wake-up with multiple monitors in mirroring) + deal with display link thread shutdown (destroy threads at sleep) and restart when needed 2026-01-20 01:03:55 +01:00
Sergey Shelomentsev
3a85242566 JBR-8046 repack java.base.jmod with correct module hashes after signing 2026-01-20 01:03:55 +01:00
Vitaly Provodin
9376e9b8d1 JBR-8161 Move docker files under jbr-tools 2026-01-20 01:03:55 +01:00
Vitaly Provodin
b1dba8ac4f update exclude list on results of 2963 test runs 2026-01-20 01:03:55 +01:00
Alexey Ushakov
21b9105953 JBR-8091 X: jb/java/wayland/RobotGet tests thorw java.awt.AWTException: headless environment
Do not run test logic in the headless environment
2026-01-20 01:03:55 +01:00
Roman Shevchenko
8e7e16e28f JBR-8156 restoring WSL visibility in the folder picker mode 2026-01-20 01:03:55 +01:00
Nikita Tsarev
f7e57eb2c8 JBR-5851: Fix 'DVORAK - QWERTY Cmd' layout 2026-01-20 01:03:55 +01:00
Vitaly Provodin
2d0bb99481 Update README.md 2026-01-20 01:03:54 +01:00
Maxim Kartashev
f5ccf9b36b JBR-8133 Runtime crash after jfr drag and drop to IU 2026-01-20 01:03:54 +01:00
Alexey Ushakov
bab4a0cf3f JBR-7990 Vulkan: Robot pixel grabbing for Vulkan surfaces
Implemented grabbing pixels via partly supported SurfaceToSwBlit, fixed multi-monitor scenario
2026-01-20 01:03:54 +01:00
Vitaly Provodin
a553e0c136 Update README.md 2026-01-20 01:03:54 +01:00
Nikita Tsarev
e1493b6acc JBR-8004: Support the context menu key on macOS 2026-01-20 01:03:54 +01:00
Maxim Kartashev
a17c68cf8d JBR-8123 NPE because FileSystems.getDefault() is null with -Djava.util.zip.use.nio.for.zip.file.access=true 2026-01-20 01:03:54 +01:00
Vitaly Provodin
155de9ea9b JBR-8104 OL8: enable premier support for docker images 2026-01-20 01:03:54 +01:00
Vitaly Provodin
ef040071f6 JBR-8072 move JBR docker images to registry.jetbrains.team 2026-01-20 01:03:54 +01:00
Vitaly Provodin
c5de785887 update exclude list on results of 2925 test runs 2026-01-20 01:03:54 +01:00
Maxim Kartashev
f6af0be0fd JBR-6247 Update JBR-specific tests after JDK-8314823
(cherry picked from commit 791448a24d)
2026-01-20 01:03:54 +01:00
Maxim Kartashev
1683ba6a2a JBR-1430 (8195129) Windows: use UTF16 version of Win32 API to load DLL
Also correct library name encoding in exception messages.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 82a239a61d)
2026-01-20 01:03:54 +01:00
Vitaly Provodin
9ed1ad6260 update exclude list on results of 2910 test runs 2026-01-20 01:03:53 +01:00
Vitaly Provodin
d6e7917c1c JBR-7929 remove java/awt/event/KeyEvent/AcceleratorTes/AcceleratorTest.html
that clashes with another test due to revert of "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts" caused by JBR-6387
2026-01-20 01:03:53 +01:00
Vitaly Provodin
0697ae0aac update exclude list on results of 2898 test runs 2026-01-20 01:03:53 +01:00
Maxim Kartashev
fe31b9ceee JBR-7988 Wayland: WLPopupLocation test: incorrect size detected 2026-01-20 01:03:53 +01:00
bourgesl
bce5f813b2 JBR-8048: only log system property 'awt.mac.flushBuffers.invokeLater' if manually set 2026-01-20 01:03:53 +01:00
bourgesl
3d0f779ed2 JBR-5497: improved system property (awt.mac.flushBuffers.invokeLater) handling to support false/auto/true modes and log used value at startup 2026-01-20 01:03:53 +01:00
bourgesl
3bbcc5d02f JBR-5497: simple fix to avoid deadlocks on macOS + mirroring displays:
- added more instrumentation on awt threads and AWTThreading.invokeAndWait() to detect and diagnose deadlocks
- enhanced awtLockListener to adopt nanotime for time accuracy + more advanced logging (caller, wait time) with histograms
- major ThreadUtilities performOnMainThread refactoring to observe thread coordination (state, callstacks) in order to avoid deadlocks while the appkit/main thread is waiting (performOnMainThreadWaiting:YES) in conflict with LWCToolkit.invokeLater() blocked in doAWTRunLoop (2nd)
- fixed CPlatformWindow.flushBuffers() to use LWCToolkit.invokeLater() to avoid deadlocks (EDT <-> main) if the the system property '-Dawt.mac.flushBuffers.invokeLater=true'
- use the new CGraphicsDevice.IsMirroring() to enable fix in CPlatformWindow.flushBuffers() too
- removed changes for JBR-5461 + cleanup + simplified awtLock() + keep few more invokeLater() when computer returns from sleep or displayChanged() to avoid deadlocks until solved definitely
- fixed review comments
2026-01-20 01:03:53 +01:00
bourgesl
3d27c551ea JBR-5497: revert JRSUIController changes (performOnMainThreadWaiting:YES) to avoid UI freeze but appkit violations must be fixed in follow-up fix 2026-01-20 01:03:53 +01:00
Vitaly Provodin
0257037d30 update exclude list on results of 2865 test runs 2026-01-20 01:03:53 +01:00
Maxim Kartashev
faa7958895 JBR-7889 Wayland: java/awt/Focus/ComponentLostFocusTest.java: class sun.awt.NullComponentPeer cannot be cast to class java.awt.peer.TextFieldPeer 2026-01-20 01:03:53 +01:00
Maxim Kartashev
c30768096b JBR-7989 Wayland: WLPopupVisibility test is failing if launched with fractional sun.java2d.uiScale
Use ceil when scaling the size, use floor when scaling the location
2026-01-20 01:03:53 +01:00
Vitaly Provodin
44e60bbc4d JBR-8006 specify path to gcc-toolset-10 2026-01-20 01:03:53 +01:00
Maxim Kartashev
923bf32fed JBR-7993 Menus are not displayed directly underneath main menu if offset in monitor configuration exists 2026-01-20 01:03:52 +01:00
Vladimir Kharitonov
c04a58f805 JBR-7983 adapt the Dockerfile.oraclelinux to build jcef 2026-01-20 01:03:52 +01:00
Sergey Shelomentsev
f0f1b0b364 JBR-7919 add tests for Wayland popups 2026-01-20 01:03:52 +01:00
Maxim Kartashev
463e63dd4f JBR-7972 Wayland: EXTREME lag when scrolling through any type of list in the settings when using WLToolkit
Avoid requesting the Wayland server to change the cursor when the change
is vacuous
2026-01-20 01:03:52 +01:00
Maxim Kartashev
02fd56c5ad JBR-7969 Wayland: some popups misplaced when maximized with fractional scale 2026-01-20 01:03:52 +01:00
Maxim Kartashev
ef2004c376 JBR-7071 Wayland: cursor does not change when hovering over gutter icons 2026-01-20 01:03:52 +01:00
Maxim Kartashev
d7ccea2057 JBR-7879 Wayland: Self-moving quick-doc popup in nightly
- Position popups at the exact offset given; this is achieved by
  using the XDG_POSITIONER_ANCHOR_TOP_LEFT anchor
- Update of popups location is done in sync with all other updates
  that affect the size (like the surface size update)
- Maintain a popup's location relative to the popup's parent, not
  its toplevel window
2026-01-20 01:03:52 +01:00
Vitaly Provodin
0262ebfb2e update exclude list on results of 2827 test runs 2026-01-20 01:03:52 +01:00
Vitaly Provodin
5ffee1bab1 Update README.md 2026-01-20 01:03:52 +01:00
Sergey Shelomentsev
d2016df57f JBR-7939 set max wait to 1 min for jetsign client 2026-01-20 01:03:52 +01:00
Nikita Gubarkov
9e555748e1 JBR-7683 Revert "8185862: AWT Assertion Failure in ::GetDIBits(hBMDC, hBM, 0, 1, 0, gpBitmapInfo, 0) 'awt_Win32GraphicsDevice.cpp', at line 185"
This reverts commit 1ad3ebcf
2026-01-20 01:03:52 +01:00
Vitaly Provodin
cdf5402bdc Update README.md 2026-01-20 01:03:51 +01:00
Vitaly Provodin
355c03f437 update exclude list on results of 2777 test runs 2026-01-20 01:03:51 +01:00
Sergey Shelomentsev
22357136d5 JBR-7867 Notarization scripts: fail build if signing of separate files are failed 2026-01-20 01:03:51 +01:00
Maxim Kartashev
98258c554b JBR-7916 Wayland: tests open-sourced in 2024.09 fail 2026-01-20 01:03:51 +01:00
Vitaly Provodin
b1441ba17c update exclude list on results of 2765 test runs 2026-01-20 01:03:51 +01:00
Maxim Kartashev
b9675a936b JBR-5483 MacOSXWatchService assumes that the default file system is the UnixFileSystem, which might not be the case
(cherry picked from commit 0af640f048)
2026-01-20 01:03:51 +01:00
Maxim Kartashev
14d58b4774 JBR-3862 Implement native WatchService on MacOS
The watch service is based on FSEvents API that notifies about file
system changes at a directory level. It is possible to go back to
using the old polling watch service with -Dwatch.service.polling=true.

Features include:
- support for FILE_TREE option (recursive directory watching),
- minimum necessary I/O (no filesystem access more than once
  unless needed),
- one thread ("run loop") per WatchService instance,
- changes are detected by comparing file modification times with
  millisecond precision,
- a directory tree snapshot is taken at the time of WatchKey creation
  and can take a long time (proportional to the number of files).

(cherry picked from commit f91ddf657a)
2026-01-20 01:03:51 +01:00
Maxim Kartashev
4ea0ec57a1 JBR-7859 Wayland: Unexpected focus owner set in a Window 2026-01-20 01:03:51 +01:00
Maxim Kartashev
45b8c276f1 JBR-7851 Wayland: IDEA crashes if Esc is pressed to close Diff window 2026-01-20 01:03:51 +01:00
Maxim Kartashev
3441fa5e4b JBR-3572 Wayland: java/awt/Window/WindowTitleVisibleTest/WindowTitleVisibleTestLinuxGnome.java: title bar shown and hidden are the same.
Exclude the test when running under XWayland that doesn't implement
screen capture necessary for the test to function.

(cherry picked from commit 4326028811)
2026-01-20 01:03:51 +01:00
Maxim Kartashev
6ccc701b8f JBR-7760 Pure wayland: incorrect popup scale
(cherry picked from commit d16c50248d)
2026-01-20 01:03:51 +01:00
Sergey Shelomentsev
4d6a66e99b JBR-7856 use jmod from currently built JDK
(cherry picked from commit 5c90a8d4aa)
2026-01-20 01:03:51 +01:00
Sergey Shelomentsev
3bb31c856e fixup! JBR-7800 Add jnativescan to signing
(cherry picked from commit 3ef8a52e0c)
2026-01-20 01:03:50 +01:00
Nikita Gubarkov
ce9e881d26 JBR-7846 Vulkan: Fix compilation in Musl Docker container
(cherry picked from commit 79b9f5b71c)
2026-01-20 01:03:50 +01:00
sergey.shelomentsev
a7a59b1419 JBR-7800 Fix notarization of jbrsdk (sign libs and execs inside jmod files)
(cherry picked from commit dbb42d10f5)
2026-01-20 01:03:50 +01:00
Vitaly Provodin
51fd4984dd Update README.md
(cherry picked from commit ff4c5dc7b5)
2026-01-20 01:03:50 +01:00
Vitaly Provodin
45320bc596 JBR-6144 enable building JBR with Vulkan
(cherry picked from commit 099698fa19)
2026-01-20 01:03:50 +01:00
Nikita Gubarkov
d28c85e600 JBR-7840 Vulkan: Fix compilation in Docker container
(cherry picked from commit f678372d66)
2026-01-20 01:03:50 +01:00
Dmitrii Morskii
b278e1ab5c JBR-6754 setting nopixfmt in case of running on Remote Desktop
(cherry picked from commit de5d101cac)
2026-01-20 01:03:50 +01:00
Dmitry Batrak
1d1e6e4efc JBR-7833 Wayland: typeahead problem in a popup
(cherry picked from commit 6093b65936)
2026-01-20 01:03:50 +01:00
Maxim Kartashev
89554cef3d JBR-7811 Wayland: IDE dialogs and popups flash black before opening
(cherry picked from commit 0703011d40)
2026-01-20 01:03:50 +01:00
Sergey Shelomentsev
dc6f330da3 JBR-7734 add zip distribution for Windows
(cherry picked from commit da26c98b82)
2026-01-20 01:03:50 +01:00
Maxim Kartashev
5e40707a2d JBR-7700 Route java.io file system operations via java.nio.file
Use -Djbr.java.io.use.nio=false to undo

(cherry picked from commit ef22b4cc55)
2026-01-20 01:03:50 +01:00
Konstantin Nisht
22ec145a97 JBR-7466 Exception on VM startup with -Djava.util.zip.use.nio.for.zip.file.access=true
(cherry picked from commit 79f79bf137)
2026-01-20 01:03:50 +01:00
Konstantin Nisht
a456582c1e JBR-7392: Use NIO FS in ZipFile
(cherry picked from commit e21c67095b)
2026-01-20 01:03:49 +01:00
Vitaly Provodin
62da474fb3 Update README.md
(cherry picked from commit 0d66d2bf26)
2026-01-20 01:03:49 +01:00
Vitaly Provodin
b666ee6fc1 JBR-7797 build fastdebug without jcef
(cherry picked from commit cb322fe90d)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
4c067cfcf0 JBR-6691 test/jdk/jdk/internal/misc/VM/RuntimeArguments.java fails on Linux
(cherry picked from commit a3ecac8a79)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
a06e1cf879 JBR-7663 Wayland: make gtk-shell1 protocol support optional
(cherry picked from commit 30e6c720b6)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
5913e86eed JBR-7663 Wayland: generate proxy code with wayland-scanner on the fly
(cherry picked from commit d599043b7d)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
d53febbb58 JBR-7663 Wayland: add wayland-protocols to the docker files
(cherry picked from commit 8d207ee7e7)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
215e15097c JBR-7726 X11 toolkit: Dialog buttons rendering black rectangle after hovering
(cherry picked from commit 18e63514c5)
2026-01-20 01:03:49 +01:00
Dmitrii Morskii
2e2d2788a2 JBR-7302 added additional emptiness check in getGlyphOutlineBounds
(cherry picked from commit 60fd39e59d)
2026-01-20 01:03:49 +01:00
Nikita Gubarkov
213de2e1fa JBR-7766 Fix VKTexturePool OOM.
(cherry picked from commit 1a806f4f1b)
2026-01-20 01:03:49 +01:00
Nikita Tsarev
82b20ff3fc JBR-7764: Disable window decorations in test/jb/java/awt/Window/RestoreFromFullScreen.java, so that the test doesn't fail spuriously on some WMs
(cherry picked from commit 80c2a5969d)
2026-01-20 01:03:49 +01:00
Maxim Kartashev
5257f8626f JBR-7749 Settings popup invoked from the main toolbar appears misaligned if fractional scaling set
(cherry picked from commit d41d89e8b4)
2026-01-20 01:03:48 +01:00
Nikita Gubarkov
5a5325de0b JBR-4725 File dialog modality
(cherry picked from commit 2a5b044c95)
2026-01-20 01:03:48 +01:00
Maxim Kartashev
0b58575530 JBR-7544 Wayland: Cannot resize window to more that 3500px vertically
(cherry picked from commit ef3dfff3ae)
2026-01-20 01:03:48 +01:00
Vitaly Provodin
8f435cf919 Update README.md
(cherry picked from commit 7b6bc93034)
2026-01-20 01:03:48 +01:00
Maxim Kartashev
a378825ad3 JBR-7748 java/awt/font/JNICheck/FreeTypeScalerJNICheck.java: JNI call made without checking exceptions when required to from CallVoidMethod
(cherry picked from commit ad45f6aec0)
2026-01-20 01:03:48 +01:00
Vitaly Provodin
3683f3392e Update README.md
(cherry picked from commit dd41dbcb7b)
2026-01-20 01:03:48 +01:00
Maxim Kartashev
ee4a231355 JBR-7721 Copying from IntelliJ in pure Wayland on ChromeOS confuses UTF-8 and UTF-16
Avoid data flavor without an explicit charset

(cherry picked from commit 86acba5870)
2026-01-20 01:03:48 +01:00
Nikita Tsarev
98cc27168c JBR-6324: JBR API for System Shortcuts (macOS)
(cherry picked from commit 22d406a76b)
2026-01-20 01:03:48 +01:00
Nikita Tsarev
e91ba094d0 JBR-5690: Reload next window shortcut when it changes
(cherry picked from commit be0d27983c)
2026-01-20 01:03:48 +01:00
Nikita Tsarev
32d8bbc0fd JBR-5726: Report 'Move focus to the previous window in application' system shortcut
(cherry picked from commit 5721bd6908)
2026-01-20 01:03:48 +01:00
Nikita Gubarkov
256cde9567 JBR-7653 Prepare Docker images for Vulkan builds
(cherry picked from commit 249c46bb6b)
2026-01-20 01:03:48 +01:00
Nikita Gubarkov
1b602c033a JBR-7673 Cleanup docker scripts
(cherry picked from commit 473686a92e)
2026-01-20 01:03:48 +01:00
Nikita Tsarev
2e0c59aeee JBR-5448: Return all shortcuts from readSystemHotkeys
(cherry picked from commit bb25ab3424)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
0f6f118dd6 JBR-7579 Fix SurfaceManager.cacheMap retaining strong references.
(cherry picked from commit b8434796ae)
2026-01-20 01:03:47 +01:00
Alexey Ushakov
761d75faff JBR-7724 Add vulkan support to the performance scripts
Implemented -vulkan option

(cherry picked from commit 6f1ecb9b47)
2026-01-20 01:03:47 +01:00
Vitaly Provodin
0db256a4ec Update README.md
(cherry picked from commit a51b24a7eb)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
46db65b4f6 JBR-7565 Vulkan: Implement clip 2026-01-20 01:03:47 +01:00
Nikita Gubarkov
619e47895d JBR-7645 Vulkan: Implement hash table for pipeline sets 2026-01-20 01:03:47 +01:00
Nikita Gubarkov
4d672f2faf JBR-7563 Vulkan: Implement MASK_FILL
Mask bytes are copied to texel buffer to be used in shader.
Up to 256KiB (configurable) of mask can be rendered in a single draw call, with no limit on number of MASK_FILL operations in a single batch.

Also added dirty implementation of greyscale-AA DRAW_GLYPH_LIST and FILL_AAPARALLELOGRAM over MASK_FILL.

(cherry picked from commit 4651c3f096)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
c77a116a7d JBR-7564 Vulkan: Fix HIDPI and multi-monitor scenarios
(cherry picked from commit 7f0b10ad23)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
10fc6abb72 JBR-7575 Vulkan: Implement composites (blending and XOR mode)
- Implemented dynamic pipeline compilation.
- Added 64-bit per pixel format usage in debug mode for testing.
- Now passing colors from Java to Vulkan with straight alpha.

(cherry picked from commit 3d7baad687)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
94eaeca80f JBR-7943 Vulkan: Provide utilities for inspecting image formats 2026-01-20 01:03:47 +01:00
Vitaly Provodin
64d5401d90 Update README.md
(cherry picked from commit 770c075320)
2026-01-20 01:03:47 +01:00
Nikita Gubarkov
daa2ffea8b JBR-7574 Vulkan: Implement memory allocator
(cherry picked from commit 0be149c84e)
2026-01-20 01:03:47 +01:00
Nikita Tsarev
bde4e9f215 JBR-7524: Workaround for showing window tiling actions when hovering over the maximize button on macOS
(cherry picked from commit 8fb519bec4)
2026-01-20 01:03:46 +01:00
Maxim Kartashev
8a40380a92 JBR-7504 Use accurate event serial number with the clipboard
(cherry picked from commit d935bd156e)
2026-01-20 01:03:46 +01:00
Maxim Kartashev
dce314d258 JBR-7504 WLToolkit - Middle click paste doesn't work properly when pasting to other applications
(cherry picked from commit b553c722be)
2026-01-20 01:03:46 +01:00
Alexey Ushakov
7472dee01d JBR-7677 Vulkan: Implement Graphics.drawImage()
Implemented:
 - raster loading and blit primitive
 - transform for VKBlitSwToTextureViaPooledTexture
Used texture pool to get temporary image

(cherry picked from commit bf04a71bce)
2026-01-20 01:03:46 +01:00
Vitaly Provodin
c24f72262e Update README.md
(cherry picked from commit 64f5af4fda)
2026-01-20 01:03:46 +01:00
Nikita Tsarev
226b7cd25e JBR-7672: Only abort key repeat when the key that is being repeated is released [WLToolkit]
(cherry picked from commit a500b52ecb)
2026-01-20 01:03:46 +01:00
Nikita Tsarev
be64aa4787 JBR-7662: Fix key repeat manager sometimes not cancelling properly [WLToolkit]
(cherry picked from commit e1b1116bb9)
2026-01-20 01:03:46 +01:00
Vitaly Provodin
ab611ec9ec JBR-7511 migrate build platforms to OL8
- remove Vulcan part that causing builds to fail
- modify scripts for building images from Oracle Linux 8
- update jb/build/VerifyDependencies.java to check libraries have no dependency on symbols from glibc version higher than 2.28
- rename Ubuntu2004 docker files
- upgrade wayland up to wayland-devel-1.21.0-1

(cherry picked from commit 2092570840)
2026-01-20 01:03:46 +01:00
bourgesl
b56b5f7624 JBR-7616: fixed type (str)
(cherry picked from commit a6569241db)
2026-01-20 01:03:46 +01:00
Nikita Tsarev
c6c134fcc9 JBR-7675: Respect disabling key repeat [WLToolkit]
(cherry picked from commit 723f45aca7)
2026-01-20 01:03:46 +01:00
Vitaly Provodin
b0fc99a359 JBR-7566 apply standard measurement scripts to Render
(cherry picked from commit be24b3e8ed)
2026-01-20 01:03:46 +01:00
Vitaly Provodin
c5043ea035 JBR-7567 apply standard measurement scripts to Dacapo
(cherry picked from commit 289121d0ea)
2026-01-20 01:03:46 +01:00
bourgesl
95e316f5c7 JBR-7616: added ThreadUtilities.lwc_plog(env, formatMsg, ...) to use LWCToolkit's PlatformLogger instead of NSlog (only as fallback now) used by MTLRenderQueue, updated MTLUtils to share mtlDstTypeToStr(op)
(cherry picked from commit 8d240740ce)
2026-01-20 01:03:45 +01:00
Vitaly Provodin
aa23bd852b Update README.md
(cherry picked from commit f3fc7649fb)
2026-01-20 01:03:45 +01:00
Vitaly Provodin
49ebb8dfd3 Update README.md
(cherry picked from commit 12dd44c724)
2026-01-20 01:03:45 +01:00
Nikita Gubarkov
64824f4ff6 JBR-7572 Bring back VKBuffer functions
(cherry picked from commit 90e516f24c)
2026-01-20 01:03:45 +01:00
Nikita Gubarkov
9b8c56c435 JBR-7644 Vulkan: Move barrier state tracking from surface into image
(cherry picked from commit 76dbad4387)
2026-01-20 01:03:45 +01:00
Nikita Gubarkov
698614792e JBR-7572 Vulkan: Implement vertex buffer pool
Track and reuse vertex buffers, no need to allocate and bind a new buffer on each draw.

(cherry picked from commit e607e789c2)
2026-01-20 01:03:45 +01:00
Vitaly Provodin
902696ef7b Update README.md
(cherry picked from commit 62d575dfe4)
2026-01-20 01:03:45 +01:00
Nikita Gubarkov
f1420d2f1c JBR-7556 Check negative glyphID in HBShaper
(cherry picked from commit 76852278f4)
2026-01-20 01:03:45 +01:00
bourgesl
987b05d4b7 JBR-7616: improved MTLRenderQueue exception handling
(cherry picked from commit ea57bf75e7)
2026-01-20 01:03:45 +01:00
Maxim Kartashev
f17ea7e0ad JBR-7600 Provide ability to add messages to fatal error log
Use JNU_LOG_EVENT(env, msg, ...) to save a message in the internal
JVM ring buffer that gets printed out to the Events section
of the fatal error log if JVM crashed.

(cherry picked from commit 7a6184d309)
2026-01-20 01:03:45 +01:00
Nikita Provotorov
5c9472ca48 JBR-5673: Wayland: support touch scrolling.
- Adding information to WLPointerEvent about wl_pointer::axis* events along the X axis;
- Introducing 'WLComponentPeer#convertPointerEventToMWEParameters' - a routine for converting WLPointerEvent parameters to parameters required for MouseWheelEvent s;
- Handling both X and Y axes within the WLPointerEvent dispatching routine.

(cherry picked from commit 6afbc34d4b)
(cherry picked from commit 8b091f52d1)
2026-01-20 01:03:45 +01:00
Nikita Provotorov
8e53f4490c JBR-7459: Wayland: touchpad scrolling is too sensitive.
- Remaking the mapping of wl_pointer::axis events values to MouseWheelEvent rotations to eliminate the touchpad scrolling behavior "the more slowly the fingers move, the more pixels are scrolled";
- Accumulating the fraction parts of wl_pointer::axis events values to improve the accuracy of touchpad scrolling;
- Distinguishing between wheel scrolling and touchpad scrolling to fine-tune MouseWheelEvent parameters for each of these cases.

(cherry picked from commit 874d5698bc)
(cherry picked from commit cb41fa53f0)
2026-01-20 01:03:44 +01:00
Vitaly Provodin
a12365d7ef Update README.md
(cherry picked from commit 29f3f9f229)
2026-01-20 01:03:44 +01:00
Sergei Tachenov
f1054e5f1e JBR-7586 Fix title click ungrab when an active user component is clicked
Swing requires that clicking frame decorations should cause the window
to be ungrabbed. However, if a custom title is used, and that title contains
user-provided components, then clicking such components should not
cause the window to be ungrabbed, otherwise a menu located in a custom
title behaves incorrectly.

Fix by using the same logic as for the native actions, such as moving the window.
If the native actions are allowed, then ungrabbing is allowed as well.
Otherwise, do not ungrab, let the component behave like it's located in the client area.

The fix is supplemented with a new regression test "test/jdk/jb/javax/swing/CustomTitleBar/JMenuClickToCloseTest.java".

(cherry picked from commit f82c018914)
2026-01-20 01:03:44 +01:00
Nikita Tsarev
5dba04941b JBR-7594 Check for LWCToolkit in JBR TextInput API
(cherry picked from commit 3c1fd1c3e6)
2026-01-20 01:03:44 +01:00
Sergei Tachenov
b899943c25 JBR-7484 Update the cursor on mouse entered/exited
AppKit resets the cursor on native mouse entered/exited events. Depending on the order of events, it may end up setting the wrong cursor. So update it forcibly on such events.

(cherry picked from commit 2de56405aa)
2026-01-20 01:03:44 +01:00
Sergei Tachenov
4f7ba544b6 JBR-7481 Work around mouse entered/exited bug
To fix missing mouse entered/exited events when
using rounded corners, we keep track of mouse moved events. When a mouse moved event is detected, and the current peer under the cursor belongs to a different window, we send fake mouse entered/exit events to the old and new windows. We also filter late mouse exited events.

The workaround is enabled by default with the VM option "awt.mac.enableMouseEnteredExitedWorkaround" to disable it in case something breaks.

About the test:
Use the robot to find the points when the mouse
entered event is sent to the popup when the mouse
enters through a rounded corner, and the similar
point for entering the outer window when exiting
through such a corner.

Once the points are found, move the mouse back
and forth to that point, but not beyond.
The correct behavior is that when the mouse
enters the popup, a mouse exited event is sent
to the outer frame and vice versa.
Therefore, every mouse entered/exited event
should be received exactly once.

Use reflection to set the rounded corners,
as JBR API isn't available in tests.

(cherry picked from commit 0b5beaf2eb)
2026-01-20 01:03:44 +01:00
Vitaly Provodin
9fef6a80eb Update README.md
(cherry picked from commit 170a7cfa7f)
2026-01-20 01:03:44 +01:00
Alexey Ushakov
06025ec947 JBR-7588 Metal: Reuse MTLContext for all GCs of the same GPU
Implemented reference counting for shared MTLContext objects. Supported multiple display links per MTLContext. Also, works for macOS version < 10.13

(cherry picked from commit c6aa7f18e5)
2026-01-20 01:03:44 +01:00
Nikita Gubarkov
83c2648f80 JBR-5973 Vulkan: Fix validation errors (#452)
- Added proper synchronization and image layout transitions.
- Refactored VKRenderer to hold per-device rendering context. Isolated surface rendering contexts.
- Implemented reusing of command buffers and semaphores
- Fixed surface resize, made surface initialization more robust.
- Added on-demand pipeline creation for actual surface formats.
- Added missing destruction logic.
- Added macros for easy checking of return codes, logging with source code location.
- Moved implementation details out of headers where possible. Stripped dead code.
- Implemented consistent OOM strategy from dynamic arrays and ring buffers.

(cherry picked from commit 91aafbe5d2)
2026-01-20 01:03:44 +01:00
Maxim Kartashev
36aff6309b JBR-5615 added missing part for WLToolkit
(cherry picked from commit f407b957f2)
2026-01-20 01:03:44 +01:00
Dominik Matta
73a67d0604 JBR-6763 Wayland: application crashes when popup closed
Certain Wayland compositors (wlroots) invalidate xdg_surface after window with popup loses focus. Subsequent attempts to
commit the popup window fail with protocol error "xdg_surface has never been configured".

Handle popup_done event by hiding the popup window. Also emit WINDOW_CLOSING event as otherwise focus remains on the popup parent.

Co-authored-by: Maxim Kartashёv <maxim@kartashev.spb.ru>
(cherry picked from commit 873a085de4)
2026-01-20 01:03:44 +01:00
Maxim Kartashev
307d641fb3 JBR-6468 Wayland: java/awt/datatransfer/MimeFormatsTest.java fails by timeout
Excluded the test from jdk_awt_wayland as it can't be made to work
under Wayland.

(cherry picked from commit 7a3077ded9)
2026-01-20 01:03:44 +01:00
Maxim Kartashev
ad0df5a615 Added proper copyright headers
(cherry picked from commit 0d5aea938e)
2026-01-20 01:03:43 +01:00
Nikita Gubarkov
436eb312d2 Fix WindowMoveService on Wayland
(cherry picked from commit 00f213d0ff)
2026-01-20 01:03:43 +01:00
Nikita Gubarkov
4b5643024f JBR-7570 Implemented ring buffer. Added lazy implicit initialization for dynamic arrays. (#451)
(cherry picked from commit 7b89fe2311)
2026-01-20 01:03:43 +01:00
Nikita Gubarkov
9233f36434 JBR-7568 Vulkan: Refactor VKLogicalDevice into VKDevice (#449)
* Renamed VKLogicalDevice to VKDevice for conformance and convenience.
* Refactored device->device to device->handle for clarity.

(cherry picked from commit aba56fd3a9)
2026-01-20 01:03:43 +01:00
Nikita Gubarkov
0f19db6984 JBR-7569 Removed VMA-Hpp (#450)
(cherry picked from commit 3867557192)
2026-01-20 01:03:43 +01:00
Dmitrii Morskii
573528c97d JBR-7126 add more possible names for cursor arrow icon
(cherry picked from commit 95e391166d)
2026-01-20 01:03:43 +01:00
Vitaly Provodin
87f5ae401c JBR-5989 Wayland: jdk_swing_wayland test group 2026-01-20 01:03:43 +01:00
Maxim Kartashёv
52474b72c7 JBR-7016 IDEA 2024.2 Wayland: UI Crash when selecting Code and pressing Alt+Enter
(cherry picked from commit 35776b5975)
2026-01-20 01:03:43 +01:00
Maxim Kartashёv
a41de70c6f JBR-7493 Wayland: can't start in maximized state on WSL
(cherry picked from commit 18e39cafa0)
2026-01-20 01:03:43 +01:00
Maxim Kartashёv
f4c56629cb JBR-7516 Wayland: DamageList_AddList: Assertion `list != add' failed
(cherry picked from commit 674b7d1dac)
2026-01-20 01:03:43 +01:00
Maxim Kartashёv
fcae285daf JBR-7501 Wayland: SurfaceData.flush() method is mis-used
(cherry picked from commit 1299f0f6c6)
2026-01-20 01:03:43 +01:00
Nikita Tsarev
11214e0845 JBR-7478: Fix wrong timestamps on KEY_TYPED events [WLToolkit]
(cherry picked from commit c47edfa7c7)
2026-01-20 01:03:42 +01:00
lbourges
82ce1dbaaf JBR-7461: Implement VKTexturePool for the linux vulkan pipeline:
- based on common AccelTexturePool
 - new VKTexturePool instance in VKLogicalDevice
 - fixed SIGSEGV in VKImage dispose
 - store device in TPI
 - indentation fixes
 - merged with latest changes for JBR-7460
 - use (ATexturePoolLock_init)(void)
 - fixed logs in lock implementations + fixed indentation
 - fixed MTLTexturePool to pre-processor conditions (not runtime) on USE_ACCEL_TEXTURE_POOL

(cherry picked from commit 5515b0fbfc)
2026-01-20 01:03:42 +01:00
Maxim Kartashёv
3394c86cda JBR-7313 Wayland: error: xdg_surface buffer does not match the configured maximized state
(cherry picked from commit 4bb0306175)
2026-01-20 01:03:42 +01:00
Maxim Kartashev
be8039f1d0 JBR-7397 Wayland: make certain interfaces optional
(cherry picked from commit a1dcba231a)
2026-01-20 01:03:42 +01:00
Maxim Kartashev
bc7391fc50 JBR-7397 CLion 2024.2-EAP/Wayland crashes on startup with Miriway
Check if all non-optional interfaces are supported before actually
starting to run

(cherry picked from commit 632a0ace4c)
2026-01-20 01:03:42 +01:00
Nikita Gubarkov
504e582161 JBR-7452 Vulkan: Reuse VkRenderPass for multiple renderers (#428)
Moved shared VkRenderPass to the logical device

(cherry picked from commit 3d782ed0f0)
2026-01-20 01:03:42 +01:00
Nikita Gubarkov
b7e9202c59 JBR-7420 Vulkan: Implement DRAW_PARALLELOGRAM primitive for flat color rendering (#426)
Refactored rendering code. Provided common implementation for fill and draw operations.

(cherry picked from commit 902f65c6ae)
2026-01-20 01:03:42 +01:00
Nikita Gubarkov
6b91905460 JBR-7419 Refactor Vulkan code
- Separate instance and device-specific function tables
- Avoid using device from global context when possible
- Set up debug logger

(cherry picked from commit af4eb8b758)
2026-01-20 01:03:42 +01:00
Maxim Kartashёv
fdc09adb59 JBR-7390 Wayland: need better headless exception message
(cherry picked from commit b68c0ecc6f)
2026-01-20 01:03:42 +01:00
Maxim Kartashёv
922ad655a3 JBR-7259 Find Usages popup can't be resized under Wayland
Popup's positioner size has to be in sync with popup's buffer size

(cherry picked from commit 5d67a135e4)
2026-01-20 01:03:42 +01:00
Maxim Kartashёv
5bef31748d JBR-7254 Impossible to copy/paste files in Project tree
(cherry picked from commit 762cd2b23e)
2026-01-20 01:03:42 +01:00
Maxim Kartashev
9c72c14476 JBR-7290 Wayland: window permanently looses focus after invoking Go To Line dialog
(cherry picked from commit c381634aff)
2026-01-20 01:03:42 +01:00
Alexey Ushakov
4d68c05432 JBR-7308 Vulkan: Build failure in vulkan enabled builds
Added missing header (jni_util.h)

(cherry picked from commit 02fb3aee06)
2026-01-20 01:03:41 +01:00
Nikita Gubarkov
e08cf165b8 JBR-7305 Vulkan: Implement FILL_SPANS primitive for flat color rendering
Implemented flat color shape rendering

(cherry picked from commit 6f84d82d1d)
2026-01-20 01:03:41 +01:00
Nikita Gubarkov
7ebac13b94 JBR-7307 Add stub for VKInstance.initNative with disabled Vulkan.
(cherry picked from commit e834ce867f)
2026-01-20 01:03:41 +01:00
Nikita Gubarkov
8cddd9db20 JBR-7237 Fix cyclic dependency of Wayland and Vulkan initialization (#396)
(cherry picked from commit cde482c1fd)
2026-01-20 01:03:41 +01:00
Maxim Kartashёv
b491ebc1bc JBR-7072 Wayland: clicks on items of floating context menus are ignored (#405)
JBR-7072 Wayland: clicks on items of floating context menus are ignored

(cherry picked from commit 4083b43591)
2026-01-20 01:03:41 +01:00
Nikita Gubarkov
5f68947ded JBR-7256 Vulkan: Implement FILL_PARALLELOGRAM primitive for flat color rendering
(cherry picked from commit 57dc1a9e23)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
909856b05f JBR-7237 Separate display connect from WLToolkit initialization
(cherry picked from commit 768d46d049)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
47b965e107 JBR-7202 wayland: memory leak when resizing windows
(cherry picked from commit 64660b0c00)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
415e79d75d JBR-7206 Wayland: Stylepad demo flickers when resizing on KDE
(cherry picked from commit 996d4f7490)
2026-01-20 01:03:41 +01:00
Nikita Gubarkov
f1df9c8a73 JBR-6543 Vulkan: migrate current code to pure c (#267)
Replaced C++ vulkan rendering with C one

(cherry picked from commit 85e44bf973)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
e0a8d20a14 JBR-7209 Wayland: modernize window decorations
(cherry picked from commit d3496bc966)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
cb8bc05db0 JBR-7201 Wayland: update copyright in files generated by wayland-scanner
(cherry picked from commit 33a7167108)
2026-01-20 01:03:41 +01:00
Maxim Kartashev
49a106ebc1 JBR-7198 Wayland: jvm crashes under KDE
Do not copy the buffer if the drawing buffer has not been resized yet as
the size will not match that of the show buffer.
Also, properly guard against the size change by another thread while
copying.

(cherry picked from commit 8ff1d3c6aa)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
a35f416146 JBR-7158 Wayland: scale with wp_viewport instead of buffer scale
(cherry picked from commit 8227e43343)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
1e631ab3de JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 639a7b4a5e)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
276b32be88 JBR-7047 Deadlock on git fetch on Wayland
(cherry picked from commit eabaada5bc)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
34841bff43 JBR-6576 Wayland: exception when double-clicking dialog title bar
(cherry picked from commit e42b74780b)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
d2bfd9969d JBR-7058 Wayland: IDE hang on the popup appearance
Clean up the damage list when resizing a surface.
Additionally, clamp the damaged area before copying to its current
actual size in order to safeguard against invalid external input.

(cherry picked from commit 392a016333)
2026-01-20 01:03:40 +01:00
tsarn
5ba7e9bb36 JBR-7063: Make .getKeyChar() report chars in KEY_PRESSED/KEY_RELEASED events for compatibility [WLToolkit] (#371)
(cherry picked from commit bc5bdd2b9e)
2026-01-20 01:03:40 +01:00
tsarn
ed3c3a6faf JBR-6848: Support extra mouse buttons for navigation [WLToolkit]
(cherry picked from commit 2fb530835d)
2026-01-20 01:03:40 +01:00
tsarn
91eed3bd42 JBR-6434: Fix pointer leave also resetting the keyboard modifiers [WLToolkit] (#370)
(cherry picked from commit bae7c40fa5)
2026-01-20 01:03:40 +01:00
tsarn
69c391cf3a JBR-7044: Reset clickCount on mouse moves [WLToolkit]
(cherry picked from commit 0dc57e183c)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
c52469ebaf JBR-7010 Wayland: Swing window resizing is not smooth enough
(cherry picked from commit 724bdfbabb)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
ff38bfeaa9 JBR-6926 Wayland: fonts are aliased/grainy on first start
(cherry picked from commit 9ee13ff658)
2026-01-20 01:03:40 +01:00
Maxim Kartashev
69aa9abf63 JBR-6920 Wayland: some IDEA popups positioned incorrectly
(cherry picked from commit e28d2bacc7)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
547e2c4497 JBR-6895 Wayland: cursor changes to resize at edges even when window is maximized
(cherry picked from commit a634a8b345)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
27a9dfc178 JBR-6884 SIGSEGV in Java_sun_java2d_wl_WLSMSurfaceData_pixelsAt
(cherry picked from commit 5b883749de)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
a2beedeaee JBR-6448 Wayland: IDEA window looks pixelated after monitors scale was changed
(cherry picked from commit 3318c2260b)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
56bde1fef7 JBR-6814 Wayland: support sun.java2d.uiScale property
(cherry picked from commit 2d420bfd59)
2026-01-20 01:03:39 +01:00
Alexey Ushakov
2fc409ff47 JBR-6787 WLToolkit/wsl: crash in WLComponentPeer.setCursor
Added check for unavailable cursor pData

(cherry picked from commit b24e4bce02)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
ea46218ad0 JBR-6783 MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java: Found one Java-level deadlock
(cherry picked from commit 4e391051bd)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
560ba62104 JBR-6504 Wayland: optional Robot capability to peek at current window's pixels
(cherry picked from commit 4e1bac1d8e)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
acc5e8756b JBR-6519 Linux: SIGSEGV at [libwayland] wl_proxy_get_version
Guard against passing NULL to libwayland

(cherry picked from commit 74ab4ac224)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
857fd82312 JBR-6736 libwakefield crashes weston
(cherry picked from commit 6777dcb2f7)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
4d87539541 JBR-6722 OutOfMemoryError: Failed to allocate Wayland surface buffer
(cherry picked from commit 8ccf0e158f)
2026-01-20 01:03:39 +01:00
Maxim Kartashev
f8f45c48b5 JBR-6617 Wayland: java/awt/Frame/HugeFrame/HugeFrame.java crashes JVM
(cherry picked from commit 1d9a2193c9)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
bd59728cf6 JBR-6598 Wayland: window gets un-maximized after switching
When the size of the buffer changes, cancel the frame callback
and make sure that the next surface commit happens with the new buffer.

(cherry picked from commit acb2a54349)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
6eda004af6 JBR-6469 Wayland: java/awt/image/ColorModel/DrawCustomColorModel.java throws UnsupportedOperationException
(cherry picked from commit 40da67b44e)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
da21a867e5 JBR-6467 Wayland: java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java fails
(cherry picked from commit 14339b83cd)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
d3ed08f8e2 JBR-6547 WLToolkit: no app icon in GNOME
Allow to associate the application's window with .desktop file with icon
and other info with -Dawt.app.id=... (DBus application name similar to
WM_CLASS in X

(cherry picked from commit 5901915afb)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
16a8edb74a JBR-6559 Wayland: popups may stop working after a while
Cancel the frame callback when hiding a window.

(cherry picked from commit fd4ba3f752)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
9cb7b71c71 JBR-6452 Wayland: avoid copying entire surface buffers
(cherry picked from commit b13bcec55b)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
a62f530f47 JBR-6452 Wayland: measure and improve surface buffer management
Improved rendering performance by
* reducing memory copy and making it more efficient,
* tying the next frame display to the frame event from Wayland,
  which dramatically reduces load for very quick Swing apps,
* limiting the number of buffers to 2.

(cherry picked from commit e625eeca1e)
2026-01-20 01:03:38 +01:00
Dmitrii Morskii
aa0d41bb32 JBR-6372 Wayland:
-correctly positioning SplashScreen on multiple monitors;
-correctly correctly handles cases of SplashScreen with gif with transparent parts;
-refactoring;

(cherry picked from commit 7d750cfbcf)
2026-01-20 01:03:38 +01:00
Alexey Ushakov
684b56a12f JBR-6445 Prepare RepaintManager code for displaySync=false
Refactored AWTAccessor code

(cherry picked from commit acbd18f361)
2026-01-20 01:03:38 +01:00
Dmitry Batrak
54423f1694 JBR-5961 Wayland: can't switch between projects using menu
fix activation not working on Ubuntu 23 (mutter 45.2), after a mouse button has been pressed in the originally active window

(cherry picked from commit 07fa18103e)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
691177bc5d JBR-6416 Wayland: IDEA maximize button out of sync sometimes
(cherry picked from commit 6122875478)
2026-01-20 01:03:38 +01:00
Maxim Kartashev
f78e8f06a8 JBR-6391 Wayland: memory indicator tooltip flickers
(cherry picked from commit e84bddb1ba)
2026-01-20 01:03:37 +01:00
Dmitrii Morskii
f48316c3be JBR-6213 Wayland: removed blurring on cursor on multiple monitors with different scales
(cherry picked from commit fa7844da7c)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
f793a90144 JBR-6276 Wayland: WLToolkit logs too much
Changed the logging level for such messages to FINE

(cherry picked from commit e946179554)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
0db41f5d6d JBR-6316 Wayland: WLSMSurfaceData.getReplacement() throws UOE
Also fixed the keyboard repeat manager so that it does not prevent
application from shutting down.
Also improved fullscreen support.

(cherry picked from commit a36c9604b1)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
37e35d6ff7 JBR-6321 Wayland: popup windows do not respect screen bounds
(cherry picked from commit b8b08a36aa)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
c21f91121e JBR-6313 Wayland: pasting from clipboard doesn't always work
Also added a flush-to-server command following each Wayland request

(cherry picked from commit 58d2d421e0)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
3704f6f3e7 JBR-6276 Wayland: WLToolkit logs too much
(cherry picked from commit fee20da837)
2026-01-20 01:03:37 +01:00
Nikita Tsarev
b63023fc6f JBR-5678: Refactor Wayland keyboard support
(cherry picked from commit 070ec5bb8c)
2026-01-20 01:03:37 +01:00
Dmitrii Morskii
1bd50836aa JBR-5965 Wayland: implement SplashScreen
(cherry picked from commit c0247eae4f)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
71be0732b4 JBR-6253 Wayland: can't run in weston because of xdg_wm_base version 3
(cherry picked from commit 79ddf65b83)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
1782b8519f JBR-6212 Wayland: app does not terminate upon Wayland protocol error
(cherry picked from commit 5ad4f8a06d)
2026-01-20 01:03:37 +01:00
Maxim Kartashev
b9debb30dd JBR-6209 Wayland: popup windows cannot be moved
(cherry picked from commit 0aecd427d2)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
2f256614b7 JBR-5977 Wayland: make undecorated windows natively resizeable
(cherry picked from commit fc735db0dc)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
5dea1617b6 JBR-6207 Wayland: many popup windows positioned incorrectly
When popup's parent is also its top-level window, use that instead of
null

(cherry picked from commit 47d484b60f)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
e25bd04e5f JBR-6183 Wayland: clipboard-related exception in headless environment
(cherry picked from commit e302f472f2)
2026-01-20 01:03:36 +01:00
Nikita Gubarkov
382094dd26 JBR-6144 Build JBR with Vulkan support
1. Update dockerfile to checkout Vulkan headers
2. Fix --with-vulkan-include configure option

(cherry picked from commit 67c8c4dc1a)
2026-01-20 01:03:36 +01:00
Alexey Ushakov
4ed20fa978 JBR-6158 Cannot build jbr21 with wayland toolkit on wsl2
Added --with-wayland-lib option to provide custom library path

(cherry picked from commit cdc2b1b7a0)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
aabf9bdf10 JBR-5857 Wayland: implement clipboard support
(cherry picked from commit c155acb7f5)
2026-01-20 01:03:36 +01:00
Dmitry Batrak
e0047cd022 JBR-6145 [Wayland toolkit] Popup windows aren't focusable
A partial solution. Cases not still covered:
* Alt+tab from the app and back should keep popup focused if it was focused initially
* Mouse clicks between popup and owner should transfer focus as expected

(cherry picked from commit 903231dc50)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
77ac3a60fe JBR-6138 Wayland: utilize gtk_shell1 protocol to mark dialogs as modal
(cherry picked from commit ba60bfa1f4)
2026-01-20 01:03:36 +01:00
Maxim Kartashev
fbb5c2995e JBR-6117 Wayland: JVM shutdown hang
(cherry picked from commit 20b2eeb0cc)
2026-01-20 01:03:36 +01:00
Dmitry Batrak
38fb007ce3 JBR-5961 Wayland: can't switch between projects using menu
prevent using a pointer to destroyed surface

(cherry picked from commit ba1b5cec5f)
2026-01-20 01:03:36 +01:00
Dmitry Batrak
c68f31a938 JBR-5961 Wayland: can't switch between projects using menu
fix typo

(cherry picked from commit 1ee3c83ef0)
2026-01-20 01:03:36 +01:00
Dmitry Batrak
40997b34a7 JBR-5961 Wayland: can't switch between projects using menu
support Window.toFront in Wayland toolkit

(cherry picked from commit b42043930f)
2026-01-20 01:03:35 +01:00
Maxim Kartashev
7c0e3a51d2 JBR-6071 Alpine Linux compilation: error: implicit declaration of function 'pthread_getname_np'
(cherry picked from commit 72722dac36)
2026-01-20 01:03:35 +01:00
Maxim Kartashev
ecd06482b4 JBR-5989 Wayland: jdk_awt_wayland test group
(cherry picked from commit 05ad0c35dd)
2026-01-20 01:03:35 +01:00
Maxim Kartashev
6dac25a4f8 JBR-6025 Wayland: miscellaneous small improvements
(cherry picked from commit 9dfeaac204)
2026-01-20 01:03:35 +01:00
Alexey Ushakov
45dcb2c5f1 JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Changed access to _name field, minor corrections in verbose print

(cherry picked from commit 36407e978c)
2026-01-20 01:03:35 +01:00
Alexey Ushakov
ad2f816fd8 JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Implemented -Dsun.java2d.vulkan=True and -Dsun.java2d.vulkan.deviceNumber=n VM options

(cherry picked from commit 7ea0f44a6f)
2026-01-20 01:03:35 +01:00
Maxim Kartashev
e5fcd08e1d JBR-6036 Wayland: Cannot invoke "java.awt.Component.getWidth()" because "popupParent" is null
Not all POPUP Window's have their parent set. And only those who do
shall be treated as popups in the Wayland's sense.

(cherry picked from commit 86080923bb)
2026-01-20 01:03:35 +01:00
Nikita Gubarkov
36b1fd260c JBR-5973 Implement rendering of no-AA shapes with Vulkan pipeline
Get rid of maxTextureSize in Vulkan code. This concept was introduced to fix macOS-specific bugs and don't map well to Vulkan implementation, as this value is tied to specific device and texture format, so get rid of it for now and see whether we need it at all.

Refactored native surface data hierarchy. There was a C-style "inheritance" model with VKSDOps having an SurfaceDataOps as its first member and conversions back and forth between them. And then also privOps - pointer to the platform-specific part (WLVK). This was refactored into plain inheritance: SurfaceDataOps -> VKSurfaceData -> VKSwapchainSurfaceData -> WLVKSurfaceData

State management, synchronization & layout transition. Now using dynamic rendering and synchronization2 extensions.
Each device has a single timeline semaphore (basically 64-bit counter), monotonically increasing as device executes our commands, allowing us to track the state of the submitted batches and reuse resources which are no longer in use.

Split command recording into primary and secondary command buffers.
This allows us to record commands "in the past", before current render pass started, which gives possibility for some heavy optimizations:
1. When we suddenly need some texture in the middle of the render pass - no need to stop render pass in order to insert necessary synchronization - we can do it as if we knew it beforehand.
2. When we draw something and then clear the surface - just erase all commands inside current render pass we recorded earlier, so the actual drawing will never happen.

Shaders are compiled with glslc or glslangValidator and bytecode is inlined directly into libawt_wlawt

Memory management via VMA, vertex buffer pool, shader push constants.

Other refactoring.

(cherry picked from commit 9ceaebbb60)
2026-01-20 01:03:35 +01:00
Alexey Ushakov
227a12fc55 JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Protected surfaceAssigned from MT access

(cherry picked from commit e5a3802293)
2026-01-20 01:03:35 +01:00
Alexey Ushakov
cbeb74557e JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Skip sending paint events for not configured peers

(cherry picked from commit 145d6405e4)
2026-01-20 01:03:35 +01:00
Maxim Kartashev
28798fb3d8 JBR-5968 Wayland: support PERPIXEL_TRANSLUCENT
(cherry picked from commit 35bb2d2489)
2026-01-20 01:03:35 +01:00
Nikita Tsarev
cea36bde45 JBR-5963: Fix RobotKeyboard test and implement getLockingKeyState
(cherry picked from commit 8210596700)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
7a88446681 JBR-5962 Wayland: fix the main event loop to allow for secondary queues
Return READ_RESULT_FINISHED_NO_EVENTS from WLToolkit.readEvents() in
case of poll returning with no new data (i.e. via timeout).

(cherry picked from commit 2b68207e79)
2026-01-20 01:03:34 +01:00
Nikita Tsarev
4262b9b3d6 Regenerate wakefield-client-protocol using an older wayland-scanner to temporarily fix build problems
(cherry picked from commit 7310c73a94)
2026-01-20 01:03:34 +01:00
Nikita Tsarev
0a4850aeb4 JBR-5676: Support emulating input events in Wakefield
(cherry picked from commit 6544d9d976)
2026-01-20 01:03:34 +01:00
Nikita Tsarev
c28051b3ed JBR-5900: Fix deadlock when enabling the Wakefield extension
(cherry picked from commit f1712ababd)
2026-01-20 01:03:34 +01:00
Nikita Tsarev
acf11917d4 JBR-5896: Fix WLToolkit being instantiated twice
(cherry picked from commit 1bdfdc275d)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
e6e04a32bd JBR-5861 Wayland: minimum necessary stubs to run IDEA
(cherry picked from commit d8dbfd7249)
2026-01-20 01:03:34 +01:00
Nikita Gubarkov
94df730af3 JBR-5645 Provide basic classes for Vulkan rendering pipeline
Implemented shared classes for cross-platform vulkan implementation and some support for wayland toolkit

(cherry picked from commit 9ea3d2d0b1)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
efd5be2484 JBR-5661 Wayland: implement heavy-weight popup windows
(cherry picked from commit abdfb7231b)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
3a6559d6f1 JBR-5666 Wayland: WLToolkit doesn't work with weston
Multiple Wayland buffers support.

(cherry picked from commit 4541c118ff)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
2f9157e04e JBR-5658 Wayland: incorrect scaling of window content
The buffer scale is changed atomically with the size.
WLGraphicsConfig made immutable and is re-created when scaling changes.
WLGraphicsDevice is also re-created when its position changes.

(cherry picked from commit 2d0d950d5b)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
d85838a9ef JBR-5657 Wayland: sometimes there's a deadlock at the start
Don't exit from toolkit initialization until all the necessary
information has been received from the Wayland server.

(cherry picked from commit 453aa66d79)
2026-01-20 01:03:34 +01:00
Maxim Kartashev
b73e4b5e9b JBR-5655 java/awt/Toolkit/Wayland/WaylandToolkit.java: WLToolkit not found
WLToolkit made operational in headless mode

(cherry picked from commit 5679e134a7)
2026-01-20 01:03:33 +01:00
Maxim Kartashev
5428f0b4d8 Wayland: fix AWT initialization on macOS
(cherry picked from commit 382e6c6989)
2026-01-20 01:03:33 +01:00
Maxim Kartashev
b1d812f43e Wayland: fixed build errors on macOS
(cherry picked from commit 82fe989dd7)
2026-01-20 01:03:33 +01:00
Maxim Kartashev
58cb552768 Wayland: fixed build errors with older versions of Wayland
(cherry picked from commit d6150b8c8b)
2026-01-20 01:03:33 +01:00
Alexey Ushakov
6a1aacc4e7 Initial version of WLToolkit and Vulkan support
Co-authored-by: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
Co-authored-by: Maxim Kartashev <maxim.kartashev@jetbrains.com>
(cherry picked from commit 2e26de3c45)
2026-01-20 01:03:33 +01:00
Vitaly Provodin
8d6fa44cee Update README.md
(cherry picked from commit 49c5e7dd3a)
2026-01-20 01:03:33 +01:00
Vitaly Provodin
abf944d5c1 JBR-7532 upgrade alpine up to 3.14, specify versions of installing packages, and deploy the latest available jdk20 (same as in jbr21)
(cherry picked from commit 794eab0e1f)
2026-01-20 01:03:33 +01:00
Vitaly Provodin
0bc1250ea7 JBR-7456 add regression test checking if implementations of all available the random number generator algorithms can be instantiated, including the default one
(cherry picked from commit 3950e80ba1)
2026-01-20 01:03:33 +01:00
Nikita Tsarev
e60d02eff6 JBR-7529: Explicitly check for press-and-hold in performKeyEquivalent
(cherry picked from commit 9fadadf039)
2026-01-20 01:03:33 +01:00
Vitaly Provodin
39e850a80a JBR-7517 build JBR artefacts with CDS archives
(cherry picked from commit 0b5462b3ec)
2026-01-20 01:03:33 +01:00
Vitaly Provodin
b7c992b5cd Update README.md
(cherry picked from commit d27df085c7)
2026-01-20 01:03:33 +01:00
bourgesl
fde451126b JBR-7460: fixed (macos) MTLTexturePool GC implementation: minor syntax updates from JBR-7461
(cherry picked from commit 713162c6b5)
2026-01-20 01:03:32 +01:00
Nikita Tsarev
d62f7b2252 JBR-7426: Fix cancelling press-and-hold causing some future key events being swallowed
(cherry picked from commit a07d5e4a60)
2026-01-20 01:03:32 +01:00
bourgesl
58ee18cf5e JBR-7460: fixed (macos) MTLTexturePool GC implementation to release texture memory more promptly (regular young GC freeing not reused textures since 15s) + unified API with new generic AccelTexturePool (C) to be shared with the coming vulkan pipeline (linux)
(cherry picked from commit ea12ccdf5e)
2026-01-20 01:03:32 +01:00
Dmitrii Morskii
a0021c7bbf JBR-6772 handled case with adding new timers after VM was suspended
(cherry picked from commit 1dd81b186b)
2026-01-20 01:03:32 +01:00
Maxim Kartashёv
ecf57a1f4a JBR-5956 Provide more details on assertion failure
Use JNU_RUNTIME_ASSERT(env, cond, msg) defined in jni_util.h
to crash JVM when 'cond' is not true with the given message
and source location information in the fatal error log.

(cherry picked from commit fd9bf2c37a)
2026-01-20 01:03:32 +01:00
Sergey Shelomentsev
e2f495e0c5 Update jbr-api version to 1.0.2
(cherry picked from commit 9c4a2ac50a)
2026-01-20 01:03:32 +01:00
Stanislav Dombrovsky
f066901749 Fix rendering of HTML list dots + better vertical align for them.
(cherry picked from commit fa4a404533ba1ef638fe523adc74391aee8a3ebf)

(cherry picked from commit 9f079c66e9)
(cherry picked from commit baf2f0b73f)
2026-01-20 01:03:32 +01:00
Nikita Tsarev
3ccf45e2d6 JBR-6588: JBR API for inspecting certain properties of KeyEvents
(cherry picked from commit cf2abf34d7)
2026-01-20 01:03:32 +01:00
Nikita Tsarev
b126afdab0 JBR-7449: Fix press-and-hold cancel keys not being swallowed by JBR
(cherry picked from commit a0dbdff2b0)
2026-01-20 01:03:32 +01:00
Alexey Ushakov
1730e65229 JBR-6545 java/awt/Mixing/AWT_Mixing/JProgressPaneOverlapping.java fails by time out (sun.java2d.metal.MTLLayer.blitTexture)
Moved test frame by some offset to avoid interaction with mac menu bar

(cherry picked from commit 7d3688ab93)
2026-01-20 01:03:32 +01:00
Artem Bochkarev
09b747bb44 JBR-5405: supported BufImgSurfaceData
(cherry picked from commit 3c2d26f834)
2026-01-20 01:03:32 +01:00
Maxim Kartashev
70548a5740 JBR-6830 Poor performance with KDE Plasma 6 X11
Use -Dwatch.desktop.geometry=false as a workaround until the KWin issue
is fixed

(cherry picked from commit d90f0e524b)
2026-01-20 01:03:32 +01:00
Artem Bochkarev
253bd667c5 JBR-4430 Fixed execution permissions on Linux
(cherry picked from commit f3896017f0)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
7f8c2ed975 update exclude list on results of 21.0.3_b517.1 test runs
(cherry picked from commit 88a92ef655)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
07184a4668 Update README.md
(cherry picked from commit 4d2ddff1f8)
2026-01-20 01:03:31 +01:00
bourgesl
3c4ac0a344 JBR-4530: make opengl & metal handle colorMatching on non-SRGB profile consistently (controlled by the system property 'sun.java2d.osx.colorMatching') + updated MacOSLayerColorTest to test color matching setting on OpenGL & Metal pipelines
(cherry picked from commit 2db47e604e)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
a9384d759e Update README.md
(cherry picked from commit 2edeae7740)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
ca32e220d7 JBR-6696: fix drawableId usage + revert PrinterJob changes (non-appkit thread)
(cherry picked from commit 5229c513e3)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
0c58fd6529 Update README.md
(cherry picked from commit c6583bd7fc)
2026-01-20 01:03:31 +01:00
Vitaly Provodin
ab6c917887 Update README.md
(cherry picked from commit db562b31b0)
2026-01-20 01:03:31 +01:00
bourgesl
230eed8d87 JBR-6696: added MTLContext CVDisplayLink checks, improved MTLLayer drawable lifecycle, hardened appkit main thread usage with ThreadUtilities instrumentation to monitor all performOnMainThread usages and report high latency tasks in LWCToolkit platform logger (use system property 'sun.awt.mac.mainThreadLatency=xx' in milliseconds), fixed few MainThread violations (PrinterView init)
(cherry picked from commit 975b4b8cc9)
2026-01-20 01:03:31 +01:00
Alexey Ushakov
cac6b5629b JBR-5063 macOS: SIGILL at [libsystem_kernel] __kill in java.lang.IllegalStateException: Error - unable to initialize Metal after recreation of graphics device. Cannot load metal library...
Add fallback to MTLCreateSystemDefaultDevice for main display

(cherry picked from commit e523e30250)
2026-01-20 01:03:31 +01:00
Nikita Tsarev
cef8761b5c JBR-6764: Add null check on hostAdapterLocator
(cherry picked from commit 7396316337)
2026-01-20 01:03:31 +01:00
Sergey Shelomentsev
72872ee33e JBR-4912 test moved from JBR repository
(cherry picked from commit 4732942427)
2026-01-20 01:03:30 +01:00
Nikita Provotorov
07bc76d61c JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event.
JBR-7336 Any keyboard shortcut with Alt produces a Windows system sound.

* X11 Linux part: disable posting KEY_TYPED events for VK_ENTER if any modifier except { Shift, Control, Lock, Mode Switch (a.k.a. AltGr), NumLock } is being pressed.
* Windows part: begin ignoring WM_SYSCHAR messages as MSDN instructs.
* Add a regression test.

(cherry picked from commit d732718ef7)
2026-01-20 01:03:30 +01:00
Nikita Tsarev
b68578b9ed JBR-6764: Work around IMEs breaking on macOS due to macOS JavaRuntimeSupport not reporting the correct locale in IMEs once after application startup
(cherry picked from commit d982095f1c)
2026-01-20 01:03:30 +01:00
Vitaly Provodin
b063a2afc1 Update README.md
(cherry picked from commit ca6ad3d091)
2026-01-20 01:03:30 +01:00
Artem Bochkarev
3a71ecbdb5 JBR-5405: implementation of direct raster loading for VolatileImage
(cherry picked from commit d963035445)
2026-01-20 01:03:30 +01:00
Vitaly Provodin
69909d399d update exclude list on results of 21.0.3_b479 test runs
(cherry picked from commit 3c65d18f2e)
2026-01-20 01:03:30 +01:00
bourgesl
52c1afc734 JBR-7170: fixed NPE if peer is null
(cherry picked from commit a786741193)
2026-01-20 01:03:30 +01:00
Sergey Shelomentsev
be7b756642 Set jbr-api version to 1.0.0
(cherry picked from commit fa825aee1d)
2026-01-20 01:03:30 +01:00
Nikita Tsarev
7a02711e26 JBR-7133: JBR API for IME replacement range on macOS
(cherry picked from commit b807d0f946)
2026-01-20 01:03:30 +01:00
Vitaly Provodin
00df68a775 update exclude lists removing lines related to fixed issues
(cherry picked from commit 4526475115)
2026-01-20 01:03:30 +01:00
Vitaly Provodin
7f04c6397a Update README.md
(cherry picked from commit 48e2248486)
2026-01-20 01:03:30 +01:00
Maxim Kartashev
2365ae63af JBR-5761 Make error printing more robust during early stages of VM initialization
(cherry picked from commit 84d95894e4)
2026-01-20 01:03:30 +01:00
bourgesl
b004b76a3e JBR-7170: added explicit @available for addPresentedHandler()
(cherry picked from commit 7973a4cff4)
2026-01-20 01:03:29 +01:00
bourgesl
c6bac065c1 JBR-7170: implement FPS counters for metal using callbacks from MTLLayer presentHandler
(cherry picked from commit cf06dcc383)
2026-01-20 01:03:29 +01:00
Nikita Gubarkov
94eae52d78 JBR-5615 add sun.java2d.logDisplays VM option
It prints to stdout whenever display configuration is changed.

(cherry picked from commit 8eec3188c6)
2026-01-20 01:03:29 +01:00
Nikita Gubarkov
3facc2337a JBR-8602 Migrate JBR API backend to Classfile API 2026-01-20 01:03:29 +01:00
Nikita Gubarkov
26c87e84fc JBR-6357 JBR API v3
JBR API frontend is moved into a separate repository.
Rewritten proxy generation, bridges removed, invokedynamic is used instead.
Mapping is now specified using annotations.
Support for extension methods.
Support for arrays and generics.
Added JBR API implementation version.

JBR-7232 Refactor deriveFontWithFeatures & JBRFileDialog JBR API

(cherry picked from commit a4804efa96)
2026-01-20 01:03:29 +01:00
Roman Shevchenko
e8da49ec4d JBR-7194: extension-based filters in native file dialogs
(cherry picked from commit cf5d136b3e)
2026-01-20 01:03:29 +01:00
Nikita Tsarev
d23cd892c2 JBR-7134: Fix InputMethodTests on macOS
(cherry picked from commit 7a970238af)
2026-01-20 01:03:29 +01:00
Vitaly Provodin
f4a96f3931 Update README.md
(cherry picked from commit 6514818b3b)
2026-01-20 01:03:29 +01:00
Dmitrii Morskii
ad312aed95 JBR-7128 Use the correct WmSize event type for JFrame moved to another monitor
author: Sergei Tachenov
(cherry picked from commit 01f1c7e15d)
2026-01-20 01:03:29 +01:00
Vitaly Provodin
65e8499020 Update README.md
(cherry picked from commit 6242827cd1)
2026-01-20 01:03:29 +01:00
Vitaly Provodin
4dcbd5c109 update exclude list on results of 21.0.3_b453.2 test runs
(cherry picked from commit 1bc34d2a51)
2026-01-20 01:03:29 +01:00
Sergey Shelomentsev
a4ed84f3dd JBR-7117 Set initial display mode after test execution
(cherry picked from commit e4530745c2)
2026-01-20 01:03:28 +01:00
Vitaly Provodin
a00539d703 Update README.md
(cherry picked from commit 0e705dc638)
2026-01-20 01:03:28 +01:00
Maxim Kartashev
5b27687a72 JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 872e73ed1e)
2026-01-20 01:03:28 +01:00
Vitaly Provodin
58c714f362 Update README.md
(cherry picked from commit 9ace20e1e1)
2026-01-20 01:03:28 +01:00
Dmitry Drobotov
1a9a5567d5 JBR-6808 Don't create AccessibleJTreeNode for the tree root if it's not visible
* This fixes an issue with AccessibleJTreeNode#getBounds, which adjusts the node's bounds according to the parent node. For nodes whose parent is the invisible root, getBounds was returning null, and it caused issues with assistive technology like macOS Accessibility Zoom.
* Additionally, NVDA will now report correct tree depth levels because the root node won't add to the levels count (JDK-8249806).

(cherry picked from commit f7c47bf3cf)
(cherry picked from commit e785e9e7c9)
2026-01-20 01:03:28 +01:00
Vitaly Provodin
bfac62c7b1 Update README.md
(cherry picked from commit a66b19eb93)
2026-01-20 01:03:28 +01:00
Vitaly Provodin
4be9dfcd18 Update README.md
(cherry picked from commit 68a09733c8)
2026-01-20 01:03:28 +01:00
Vitaly Provodin
62637f413d update exclude list on results of 21.0.3_b446.1 test runs
(cherry picked from commit a0edd1e725)
2026-01-20 01:03:28 +01:00
Nikita Provotorov
f4877b0886 JBR-6456 Sudden keyboard death on Linux using iBus.
Add a workaround for the iBus's bug which leads to the issue.

(cherry picked from commit b8e9dbf8c9)
(cherry picked from commit 7355948065)
2026-01-20 01:03:28 +01:00
Nikita Tsarev
4721a932dc JBR-7119: respect replacementRange in IME events on macOS
(cherry picked from commit 09c31a6242)
2026-01-20 01:03:28 +01:00
Dmitrii Morskii
3497ec9686 JBR-6376: implement detecting of OS theme on linux
(cherry picked from commit d8aaa3da47)
2026-01-20 01:03:28 +01:00
Dmitrii Morskii
0eb290f3ed Revert "JBR-6372: implement detecting of OS theme on linux"
This reverts commit a657e4e2cbce139f2c5b53c7fb5f30d81f99e311.

(cherry picked from commit c626c9f220)
2026-01-20 01:03:28 +01:00
Nikita Gubarkov
d8ef4358f5 JBR-7046 Tolerate subpixelResolution=0 in Metal and OGL
(cherry picked from commit 28d0f00899)
2026-01-20 01:03:27 +01:00
Maxim Kartashev
8989a31d21 JBR-5611 Window header is visible but body not on Linux Ubuntu with external display
(cherry picked from commit 96494dd000)
2026-01-20 01:03:27 +01:00
Nikita Gubarkov
6e9856b24f JBR-7020 Reorder LCD glyph cache freeing and validation
1. As we started committing the command buffer on glyph cache flush, this invalidates the current encoder. We need to `MTLTR_ValidateGlyphCache` after the flush, not before.
2. There's no reason to maintain separate glyph cache invalidation logic for this singe case (which is a no-op in reality), so just free the cache instead.

(cherry picked from commit 891a9c6c52)
2026-01-20 01:03:27 +01:00
Nikita Tsarev
82d3ba5b7e Disable flappy KeyCodesTest assertions, see JBR-6888
(cherry picked from commit 7f5dd368e3)
2026-01-20 01:03:27 +01:00
Sergei Tachenov
7014e07e23 JBR-6984 Fix BoxLayout/NPECheckRequests test
It was initially written and tested on Linux, but it turns out that
on other systems validate() can be called in between init() and start()
calls, which would break the test even though BoxLayout isn't broken.

(cherry picked from commit 6cc237583b)
2026-01-20 01:03:27 +01:00
Ajit Ghaisas
88142c0d37 update exclude list on results of main.2176 test runs
(cherry picked from commit 82a97445bd)
2026-01-20 01:03:27 +01:00
Vitaly Provodin
1a1bad5c3b introduce jbMuslProblemList.txt exclude list
(cherry picked from commit 17c6238051)
2026-01-20 01:03:27 +01:00
Vitaly Provodin
6337e71164 update exclude list on results of 21.0.2_b427.6 test runs
(cherry picked from commit e768c854cf)
2026-01-20 01:03:27 +01:00
Sergei Tachenov
ea7fd75e4f JBR-6771 BoxLayout throws mysterious NPEs due to previous exceptions
The checkRequests method only does layout initialization
if it isn't initialized already. However, when an exception
is thrown during the initialization, the layout may end up
in a half-initialized state.

Fix this by using the field that is initialized the last to check
if the layout is initialized. If that field is null, it may mean
that the layout isn't initialized or that the last attempt
failed midway. Then we try again. This attempt can,
of course, break for the same reason as the previous one,
but in that case we'll at least get a stack trace pointing
to a real cause of the error and not some mysterious NPE
that seems to be impossible from the logic.

The bug is that if we add a component that throws an exception
in one of its methods called by BoxLayout, then the layout may
end up in a half-initialized state that would mistakenly be considered
fully initialized. Then it would try to access some fields
and throw NPE with a stack trace that tells exactly nothing
about what went wrong and where.

This test checks for the presence of this bug by adding a broken
component to a BoxLayout and then un-breaking this component
and checking that an exception is thrown even though the component
is no longer broken.

(cherry picked from commit 8f5eb72836)
2026-01-20 01:03:27 +01:00
Nikita Gubarkov
541b6533ad JBR-6927 Safe asynchronous destruction of Metal graphics config.
(cherry picked from commit eee433fe5e)
2026-01-20 01:03:27 +01:00
Nikita Gubarkov
9d028431c2 Fix Windows AWT compilation errors
Frame, Window, FileDialog, CustomTitleBar

(cherry picked from commit 2ada4a575b)
2026-01-20 01:03:27 +01:00
Vitaly Provodin
fc051dd9da Update README.md
(cherry picked from commit 0ea55b1641)
2026-01-20 01:03:26 +01:00
Vitaly Provodin
85736f5624 JBR-6639 Docker images for JBR/JCEF testing
(cherry picked from commit 1342899218)
2026-01-20 01:03:26 +01:00
Vitaly Provodin
1f7b0b01cb JBR-6915 add the option -w into mkimages scripts
(cherry picked from commit 56bb878275)
2026-01-20 01:03:26 +01:00
Alexey Ushakov
d2ce90a228 JBR-6911 IDE crashes (EXC_BAD_ACCESS) after disconnecting the secondary display if a markdown file is opened (macOS Sonoma 14.4.1)
Corrected invalid usage of dealloc method, fixed memory leaks.

(cherry picked from commit 8697cfb660)
2026-01-20 01:03:26 +01:00
Dmitrii Morskii
2e8c0bbed7 JBR-6171 removing deadlock related to calling getCurrentServerTime
(cherry picked from commit 5fa4617d38)
2026-01-20 01:03:26 +01:00
Vitaly Provodin
7fcbcbf970 update exclude list on results of 21.0.2_b417.1 test runs
(cherry picked from commit b77ac8db98)
2026-01-20 01:03:26 +01:00
Dmitrii Morskii
e37ae8ed32 JBR-6372: implement detecting of OS theme on linux
(cherry picked from commit 1d47383016)
2026-01-20 01:03:26 +01:00
Vitaly Provodin
38bd45b24b JBR-1668: minor fixes - temporary fix for compilation issue SystemHotkey.m:74:29: error: format string is not a string literal
(cherry picked from commit b6234f5aa7)
2026-01-20 01:03:26 +01:00
Nikita Gubarkov
461cde5577 JBR-6723 Deal with integer overflow in DrawGlyphList with enabled subpixelResolution
(cherry picked from commit 8b34ae396c)
2026-01-20 01:03:26 +01:00
Vitaly Provodin
244e40af0e Update README.md
(cherry picked from commit bdae8e43fb)
2026-01-20 01:03:26 +01:00
Nikita Provotorov
84089ee96f JBR-3112 Linux: Last character issue with Korean.
- Ignores the IM text returned from XmbLookupString/XwcLookupString if the KeyPress event which XmbResetIC was called with was synthetic and the first after a call of XmbResetIC/XwcResetIC.
- Only for the new mode introduced in JBR-2460 (-Djb.awt.newXimClient.preferBelowTheSpot=true): cancel text composing on each mouse press, so that preedit text stops following the caret if it's moving in response to mouse clicks.

(cherry picked from commit 43a9a3a17a)
(cherry picked from commit 156e5d9b65)
(cherry picked from commit 59f0ca804f)
2026-01-20 01:03:26 +01:00
Dmitrii Morskii
15cf6c17ff JBR-6541 Added ability to get supported features and stylistic sets for font
(cherry picked from commit 170e743a13)
2026-01-20 01:03:26 +01:00
Nikita Tsarev
7893dee5bb increase delay in InputMethodTest
(cherry picked from commit 8048ea52f7)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
6f8369e03d JBR-6704: Fix extra IME events when a ctrl shortcut causes window focus switch [macOS]
(cherry picked from commit 4d851790cd)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
7d186e0555 JBR-6331: Fix some memory safety issues in macOS keyboards
(cherry picked from commit 0f9ba8771f)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
c9f3479db7 JBR-6028: Check before attempting to switch to a layout that might not exist in KeyCodesTest
(cherry picked from commit 421dd1fa69)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
5d14e16bb5 InputMethodTest: fix certain IMEs not being added properly
(cherry picked from commit 621a5e37d6)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
227d58deeb JBR-5379: Ignore input events only on permament focus loss
(cherry picked from commit ca8aebd211)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
5122e59709 JBR-5630: vmoption to change dead key reporting behavior on macOS
(cherry picked from commit aeb6569d4c)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
63ddc0c55f JBR-5469: Fix NextAppWinKey behavior with certain keys
(cherry picked from commit 9a1d6d1813)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
5ff5a85802 JBR-5558: macOS keyboard rewrite 2
(cherry picked from commit 81f3819f4e)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
65f77d5dcd JBR-5295: Fix wrong keycodes for non-letter keys that lack a corresponding VK_ constant on macOS
(cherry picked from commit 3c42e56d93)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
a8207501a6 JBR-5254: Fix Caps Lock not working properly on certain Chinese IMs
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit be64a4f3d0)
2026-01-20 01:03:25 +01:00
Nikita Tsarev
b07b0825f7 Revert "8230926: [macosx] Two apostrophes are entered instead of one with "U.S. International - PC" layout"
This reverts commit 5049cad2b0.

After JBR-5173 this workaround is no longer necessary

(cherry picked from commit fbb7ba8c0b)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
6fa13d4e47 JBR-5233 Setup/teardown necessary keyboard layouts in macOS keyboard tests
(cherry picked from commit 1fa48463f2)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
612c7c4d81 JBR-5173 macOS keyboard support rewrite
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 88c281a243)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
0aa671827d Revert "macOS national keyboard support"
This reverts commit 21bffd06bc.

(cherry picked from commit 7806ef7ff3)
2026-01-20 01:03:24 +01:00
Nikita Provotorov
2e0adde933 JBR-5107, JBR-5114: SIGILL/OOM from Java_sun_lwawt_macosx_LWCToolkit_getKeyboardLayoutNativeId.
A theoretical fix, it should:
- Catch any NSException (as it was initially expected);
- Probably fix possible memory leaks (by moving the layoutId var inside autoreleasepool).

(cherry picked from commit ae9520ce4f)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
8e40bb51b9 JBR-4990: Undo changes to ExtendedKeyCodes
(cherry picked from commit 823086623e)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
bd151a65ef JBR-3860: Fix shortcut behavior when Shift is the only modifier
(cherry picked from commit e419730031)
2026-01-20 01:03:24 +01:00
Nikita Tsarev
c5bb59ee46 JBR-4990: Fix regression tests for national keyboard layouts on macOS
(cherry picked from commit 5835150f63)
2026-01-20 01:03:24 +01:00
Vitaly Provodin
f206594ed9 update exclude list on results of 21.0.2_b393.7 test runs
(cherry picked from commit a396e62035)
2026-01-20 01:03:24 +01:00
Nikita Gubarkov
f16d588592 JBR-6723 flush vertex cache and command buffer before freeing glyph cache. (#334)
(cherry picked from commit 1faccf3995)
2026-01-20 01:03:24 +01:00
Alexey Ushakov
49a3664035 JBR-6785 wsl: update build scripts for linux target
Added explicit platform target

(cherry picked from commit 3b96e66202)
2026-01-20 01:03:24 +01:00
Vitaly Provodin
61165110ff Update README.md
(cherry picked from commit 74b00b6c2f)
2026-01-20 01:03:24 +01:00
Vitaly Provodin
51d9e2ab99 Update README.md
(cherry picked from commit 163ce4ecce)
2026-01-20 01:03:23 +01:00
Maxim Kartashev
c18c84af30 JBR-6742 Record resident set size in JVM fatal error log
(cherry picked from commit 5cc72b464b)
2026-01-20 01:03:23 +01:00
Alexey Ushakov
dfcc3cfe80 JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Fix of MT access to shared data in MTLGraphicsConfigInfo

(cherry picked from commit ecc46c6004)
2026-01-20 01:03:23 +01:00
Dmitry Drobotov
86049e07c2 JBR-6593 Fix UI freezes with JAWS announcements
* Execute AccessibleAnnouncer.nativeAnnounce on a background thread on Windows to fix UI freezes. IntelliJ calls this method from EDT, but it doesn't need to run on EDT because on Windows it simply calls screen readers API without interacting with UI components. Additionally, when using a background thread, the JAWS SayString method, which previously could have been running for multiple seconds, is now executed immediately as expected, but the root cause of previous delays is unclear.
* In JawsAnnouncer, initialize COM library with the multithreaded model to allow executing it from different threads. Now COM is initialized and uninitialized on every call of the method as required by the [documentation](https://learn.microsoft.com/en-us/windows/win32/learnwin32/initializing-the-com-library): "Each thread that uses a COM interface must make a separate call to this function. For every successful call to CoInitializeEx, you must call CoUninitialize before the thread exits". IJawsApi COM object is still static and reused by different threads, which is allowed with a multithreaded concurrency model. It shouldn't cause issues because it has no state and only forwards calls to JAWS.

(cherry picked from commit 8cc4cd5cfd)
(cherry picked from commit d7d8d9b8e4)
(cherry picked from commit 8bfd24f89f)
2026-01-20 01:03:23 +01:00
Vitaly Provodin
3e33563174 update exclude list linux-x86 failures
(cherry picked from commit 264bcf41f9)
2026-01-20 01:03:23 +01:00
Vitaly Provodin
923bc03c22 update exclude list on results of 22_b2075 test runs
(cherry picked from commit 37a71238b2)
2026-01-20 01:03:23 +01:00
Vitaly Provodin
32c4b83dba update exclude list - remove failures no having tickets
(cherry picked from commit 4d11023858)
2026-01-20 01:03:23 +01:00
Nikita Provotorov
24192308e6 JBR-3697: Letter-based command mode actions are not triggered when using Chinese input method.
Fixes different platform-specific issues with disabling/enabling input methods support via java.awt.Component#enableInputMethods(boolean):
* Windows: disabling used to require to deactivate and then activate back the app window to be performed completely ;
* macOS: disabling used to leave the input method window visible (however, it wasn't affecting the input) ;
* Linux: with fcitx5 IMF (may not be reproduced with iBus) disabling and then enabling back the input method support used to reset the used input source (keyboard layout) to a default one. It's done via disabling the current XIM when the input method support is disabled instead of disposing it .

(cherry picked from commit 2933ea89f0)

The patch also contains the fix for "JBR-6711: java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java: JButton JPanel not collected."

It unsets its references to tracked components thus not preventing GC from collecting them.

(cherry picked from commit e9aab98a6c)
(cherry picked from commit 13284aa508)
2026-01-20 01:03:23 +01:00
Dmitry Drobotov
a78c8f284c JBR-6325 Implement keyboard focus tracking for macOS Accessibility Zoom
* Call UAZoomChangeFocus function when the keyboard focus is changed or when an accessible selection event is fired. Zoom viewport fill follow the accessible frame of the newly focused component, and if it has a selected child, its frame will be passed as part that needs to be highlighted.
* Fix an exception in ComboBoxAccessibility.accessibilitySelectedChildren when its selection is nil. This happens when a combo box doesn't have a selected item, and it this case Zoom wouldn't be able to follow the combo box location.
* Move the native handler of CAccessibility.focusChanged method from the legacy JavaComponentAccessibility to the new CommonComponentAccessibility class. It calls a class method (like a static method in Java), so there is no difference in which specific class it's located, but it allows to write the new code in the appropriate class.

(cherry picked from commit 75b06421ff)
(cherry picked from commit d0f47ced65)
2026-01-20 01:03:23 +01:00
Vitaly Provodin
27b09a9902 Update README.md
(cherry picked from commit b93b6a39fc)
2026-01-20 01:03:23 +01:00
Dmitrii Morskii
e4b6d4998f JBR-5500 Handled situation of processing WM_ENDSESSION in process of closing application
(cherry picked from commit c87b70ad46)
2026-01-20 01:03:23 +01:00
Vitaly Provodin
c8e57f2493 Update README.md
(cherry picked from commit 588d57f140)
2026-01-20 01:03:23 +01:00
Dmitry Drobotov
32bdfb00c0 JBR-6472 Add default value in CAccessibility.isComboBoxEditable to avoid NPE
(cherry picked from commit 93937603b3)
(cherry picked from commit 6a70aebb6b)
2026-01-20 01:03:22 +01:00
Alexey Ushakov
9093809a53 JBR-6612 Provide standard scripts for performance measurements
run_rp.sh - additional checks

(cherry picked from commit e1cf099c09)
2026-01-20 01:03:22 +01:00
Maxim Kartashev
91958b9ebd JBR-6246 Do not overwrite CDS archives after created with jlink
(cherry picked from commit 457e760872)
2026-01-20 01:03:22 +01:00
Alexey Ushakov
e4b9698323 JBR-6612 Provide standard scripts for performance measurements
Initial implementation for linux and macOS

(cherry picked from commit fe09bf671b)
2026-01-20 01:03:22 +01:00
Nikita Tsarev
c66826bd31 JBR-6297: Don't check for NSInputManager wantsToHandleMouseEvents in mouseDown by default
(cherry picked from commit c08268def6)
2026-01-20 01:03:22 +01:00
Maxim Kartashev
e9fca3b1e6 Update README.md with up-to-date build instructions
(cherry picked from commit 695d0a0577)
2026-01-20 01:03:22 +01:00
Vitaly Provodin
8a9a1e18e4 Update README.md
(cherry picked from commit 22f4dd6d4a)
2026-01-20 01:03:22 +01:00
Vitaly Provodin
1de5b65646 Update README.md
(cherry picked from commit c6cc4d76c1)
2026-01-20 01:03:22 +01:00
Alexey Ushakov
92c324161b JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Performing flush of pending rendering operation before destroying MTLGraphicsConfig

(cherry picked from commit b25bd3ac13)
2026-01-20 01:03:22 +01:00
Nikita Gubarkov
fe0c6cfdad JBR-4618 Force window size update after display reconfiguration
- Re-create all GraphicsDevices on displayChanged()

(cherry picked from commit a59d4903b2)
2026-01-20 01:03:22 +01:00
Dmitrii Morskii
90ff18382d JBR-6671 added option 'freetype.font.rendering'
(cherry picked from commit a24c5bbcdb)
2026-01-20 01:03:22 +01:00
Dmitrii Morskii
ef00d9d8e0 Revert "JBR-6346 update Inter font version"
This reverts commit 7712e529330674b83e39c8e81701db32436d42dc.

(cherry picked from commit 1752433479)
2026-01-20 01:03:22 +01:00
bourgesl
fd711c4975 Revert "JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)"
This reverts commit e7e3638c52.

(cherry picked from commit a2ee33a45a)
2026-01-20 01:03:21 +01:00
bourgesl
d131e22ff2 JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)
(cherry picked from commit 3ddc59a433)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
84aae7fb68 JBR-6649 add synchronization for creating UI
(cherry picked from commit 9618df8e14)
2026-01-20 01:03:21 +01:00
Nikita Gubarkov
d1a1c253a8 JBR-6651 Exclude keycap emoji from EmojiVariation test.
(cherry picked from commit bb1926d974)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
d683515777 update exclude list on results of 22_b2014 test runs
(cherry picked from commit 99eb375cfd)
2026-01-20 01:03:21 +01:00
Dmitrii Morskii
875ddcf67d JBR-6346 update Inter font version
(cherry picked from commit 30820c33ba)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
66311cc579 Update README.md
(cherry picked from commit 4fef254b44)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
76bf54ceee remove resolved issues from exclude list
(cherry picked from commit 1bdef4e67a)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
007745f5a9 Update README.md
(cherry picked from commit 888e8bda45)
2026-01-20 01:03:21 +01:00
Dmitrii Morskii
4686ff4523 JBR-6604 supported case when fonts directory is missing
(cherry picked from commit a622888816)
2026-01-20 01:03:21 +01:00
Aleksey Shipilev
7bc3c9352c update exclude list on results of main.2003 test runs
(cherry picked from commit 2f441c0a3b)
2026-01-20 01:03:21 +01:00
Vitaly Provodin
da1e104194 JBR-6591 specify values for the configure options --with-vendor-url and --with-vendor-bug-url
(cherry picked from commit b7f236be6b)
2026-01-20 01:03:20 +01:00
Dmitry Batrak
a3b25ebf65 JBR-6449 Introduce FontMetricsAccessor into JBR API
JBRE-MR-368

(cherry picked from commits f0d5a907ac, 5befaea6af, ea2c4bfc83, 04601189604827c115a5a3b36aa268ba5c39ef3dб 20468cf28b)

(cherry picked from commit bb67fc186a)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
d65c480f6f JBR-6558 synchronize drawing and the test checking
(cherry picked from commit a8f38d8682)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
cda102fe2f JBR-6556 add saving screenshots for analysis of test failures
(cherry picked from commit 9330ab5416)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
c2aad54143 update exclude list on results of 21.0.1_b334 test runs
(cherry picked from commit f4c811c548)
2026-01-20 01:03:20 +01:00
Dmitrii
c7179caec7 JBR-3098 move repaintPeer event from AppKit thread to EDT on macos
(cherry picked from commit 11d3e5414f)
2026-01-20 01:03:20 +01:00
Nikita Gubarkov
8727c3eb40 JBR-6264 Improved coordinate conversion in XWayland mode
(cherry picked from commit 9c96ecd2f7)
2026-01-20 01:03:20 +01:00
bourgesl
7707cb486b JBR-6505: removed extra setNeedDisplay() in startRedrawIfNeeded() to restore JavaDraw performance (more frames rendered than real vsync FPS)
(cherry picked from commit d046741a56)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
ff64e9f99f update exclude list on results of 21.0.1_b331.1 test runs
(cherry picked from commit 4d755ad656)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
278ab1f48b JBR-5863 add verbose mode thata saves the captured image
(cherry picked from commit b83c0ddca7)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
8a245f1290 JBR-6493 add jtreg test
(cherry picked from commit 96ee046fdc)
2026-01-20 01:03:20 +01:00
Vitaly Provodin
9256a83527 update exclude list on results of 23_b1960 test runs
(cherry picked from commit f36606576d)
2026-01-20 01:03:20 +01:00
Dmitrii Morskii
8cfa1a74b6 Revert "JBR-6346 update Inter font version"
This reverts commit 9aa690a94e.

(cherry picked from commit c97c8eb5fd)
2026-01-20 01:03:19 +01:00
bourgesl
5125fdbd87 JBR-6241: RenderPerf 23.12: remove older RenderPerfTest in src
(cherry picked from commit eeae9a1cb2)
2026-01-20 01:03:19 +01:00
Vitaly Provodin
4f03173645 JBR-6454 add synchronization at disposing windows
(cherry picked from commit 48bc9affc9)
2026-01-20 01:03:19 +01:00
bourgesl
d6c52996c5 JBR-6377: fixed MTLLayer.redrawCount = 1 to avoid extra redraws with multiple windows
(cherry picked from commit 52610b9bf2)
2026-01-20 01:03:19 +01:00
Maxim Kartashev
4f6c8b0233 JBR-6340 Popups displayed shifted after moving IDE to another monitor via shortcut with auto-maximize enabled in Mutter
Windows no longer change their "native" size when moved between monitors
with different scale on Linux. Use -Dresize.with.scale=true to revert
that.

(cherry picked from commit 637d67cbfe)
2026-01-20 01:03:19 +01:00
Nikita Gubarkov
8fc31d4bc1 JBR-5837 retrieve up-to-date default screen device in FullscreenWindowProps test.
Calling setDisplayMode() or setFullScreenWindow() may cause display reconfiguration.

(cherry picked from commit 5e26eb9730)
2026-01-20 01:03:19 +01:00
Alexey Ushakov
a8e0bd749d JBR-6433 Rounded corners of popups disappear after a while
Removed opacity from CAMetalLayer for layers with rounded corners

(cherry picked from commit e9bf36f41a)
2026-01-20 01:03:19 +01:00
Alexey Ushakov
a32fb57257 JBR-5621 Test failures with -Dsun.java2d.metal.displaySync=false
Created intermediate buffer in the MTLLayer
Implemented frame separation of window updates for AWT and Swing
Remove frame delays as they greatly affect throughput
Fixed test/jdk/sun/java2d/GdiRendering/ClipShapeRendering.java
Resolved crash on multi-GPU systems

(cherry picked from commit 20bf935c82)
2026-01-20 01:03:19 +01:00
Dmitrii Morskii
0acac99ab9 JBR-6346 update Inter font version
(cherry picked from commit 37ac0f2c3d)
2026-01-20 01:03:19 +01:00
Nikita Provotorov
457576186b JBR-4687: Japanese IME input window hides what is being typed.
Uses CFS_EXCLUDE instead of CFS_CANDIDATEPOS in the ::ImmSetCandidateWindow() native API, which is more powerful and allows to take into account the issue's case.

(cherry picked from commit 0afe6c37bb)
(cherry picked from commit fa3d03b373)
2026-01-20 01:03:19 +01:00
Vitaly Provodin
ca56d09e98 JBR-6404 synchronize drawing and the test checking
(cherry picked from commit e763bb96ea)
2026-01-20 01:03:18 +01:00
Vitaly Provodin
410b3f7870 JBR-3902 create jbr_all test group
(cherry picked from commit 104bd3086a)
2026-01-20 01:03:18 +01:00
Maxim Kartashev
4a2f3b37bf JBR-6002 Linux: maximized window goes fullscreen after being moved between monitors
(cherry picked from commit 83c4c0364698f5bfb682d715bbe4ac70d50f11b3)
(cherry picked from commit 41dde53a30)
2026-01-20 01:03:18 +01:00
ngubarkov
17fec6907d JBR-5605 ignore empty client area when syncing bounds in XDecoratedPeer.
(cherry picked from commit d2301edbd0de04747817a2d382f587056d954627)
(cherry picked from commit b694ce0e9a)
2026-01-20 01:03:18 +01:00
ngubarkov
e8b495a284 JBR-5438 Fix window bounds in XWM#setShellResizable
(cherry picked from commit 0aee99ac703f3b360277293e6e7a2e1aadfaba33)
(cherry picked from commit 637e8e473e)
2026-01-20 01:03:18 +01:00
ngubarkov
f88bf98a45 JBR-5265 Workaround incorrect position of content window in queryXLocation.
(cherry picked from commit 26684fd4c761dcd2a4c93673d7732095a2050c9b)
(cherry picked from commit 4f44486d15)
2026-01-20 01:03:18 +01:00
ngubarkov
2848618a13 JBR-5417 Fix flickering in multi-monitor setups on Linux.
(cherry picked from commit 9b813e21c361e9e4b97c52bdd8eccef0030a7763)
(cherry picked from commit d0fa8194dd)
2026-01-20 01:03:18 +01:00
Dmitry Batrak
602561cfd7 JBR-5095 Incorrect initial window's location under GNOME
(cherry picked from commit 6995ce47fd)

with fix for JBR-5189 Can't exit fullscreen mode on ubuntu 22.10

(cherry picked from commit b933660cf1)
(cherry picked from commit f4ea24e18d8e6f4cb0420e30344a5cd3f000c021)
(cherry picked from commit 0ee3854a3a)
2026-01-20 01:03:18 +01:00
Sergey Shelomentsev
074853dfe9 JBR-6354 fix custom title bar tests to avoid failure in MacOS 14 fullscreen mode
- moved common logic to a separate part
- moved parts of tests to swing package

(cherry picked from commit 80b6e4ba8cad4c19b0f306ccd64dad9c085a8bab)
(cherry picked from commit 22d1e57928)
2026-01-20 01:03:18 +01:00
Nikita Provotorov
d07d7ab210 JBR-6125: macOS14 java/awt/Window/Grab/GrabTest.java Frame can't be focused.
Fixes a data race in the test.

(cherry picked from commit ca5562225a)
(cherry picked from commit 1ba73c8aaf430ca4c6e8302d1bcee8681aa8584d)
(cherry picked from commit cfbb5e642e)
2026-01-20 01:03:18 +01:00
Vitaly Provodin
921ffc8a8a update exclude list on results of 22_b1930 test runs
(cherry picked from commit def4d8ad64e4b1fea76ace0d9014c1a063e44891)
(cherry picked from commit 32327c3f64)
2026-01-20 01:03:18 +01:00
Vladimir Kharitonov
5b112243d3 RDCT-766 add libwayland-cursor.so to ResolveSymbolsTestMinEnv
(cherry picked from commit 9626cc17447b96e8b4a16908f349e682525e3090)
(cherry picked from commit 09d1ab6ca20b51a46dad120ac044346bb2a8d48e)
(cherry picked from commit b3d3fc5bc0)
2026-01-20 01:03:18 +01:00
Vladimir Kharitonov
37cb9f55b4 JBR-6272 add resolve symbols tests
(cherry picked from commit a4acdf005c53b1765ad356a740d4569db70e8b02)
(cherry picked from commit 9178b241d5d706c7628d5ebfac0fff8b54029b97)
(cherry picked from commit 262cccdd23)
2026-01-20 01:03:17 +01:00
Vitaly Provodin
da047d6974 JBR-6246 add (re)generating cds archives at jlink step
(cherry picked from commit 5f1b08c70d)
2026-01-20 01:03:17 +01:00
Nikita Gubarkov
737711644b Emoji PR sync (experimental)
- Removed font fallback hacks.
- Changed composite font glyph code encoding scheme, refactored to use Font2D instead of PhysicalFont.
- New Emoji logical font type with 2 underlying physical fonts.
- Removed getGlyphVectorOutline - it's unused and broken.
- Got rid of charsToGlyphs[NS] boilerplate.
- Moved emoji tests to separate directory.

(cherry picked from commit 485bdd1d1a)
2026-01-20 01:03:17 +01:00
Sergey Shelomentsev
f2cb844b39 Don't trigger workflow on push
(cherry picked from commit d900720a03)
2026-01-20 01:03:17 +01:00
Dmitrii Morskii
b308e5eea7 JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit 120cac9145)
2026-01-20 01:03:17 +01:00
Alexander Lobas
45a1e23904 JBR-4834 JBR-5139 Rounded corners on Mac OS and Windows: support custom border color
(cherry picked from commit 936f47d811)
2026-01-20 01:03:17 +01:00
Dmitrii Morskii
c546f60ddc JBR-6018 removed incorrect test testFeaturesZeroFrac
(cherry picked from commit e387761828)
2026-01-20 01:03:17 +01:00
Dmitrii
26f3088426 JBR-5502: optimize stringWidth & charsWidth methods of FontDesignMetrics
(cherry picked from commit b9eb40284f)
2026-01-20 01:03:17 +01:00
Dmitrii Morskii
50b5d4d24b JBR-5844: fix case with non-scalable face
(cherry picked from commit 490080a315)
2026-01-20 01:03:17 +01:00
Dmitrii Morskii
46c5c664f5 JBR-5804: refactoring of freetypeScaler and moving fontconfig's logic in separate file
(cherry picked from commit 4700386a2e)
2026-01-20 01:03:17 +01:00
Dmitrii
428159c162 JBR-5246 add OpenType's features support
(cherry picked from commit a2900b0bd9)
2026-01-20 01:03:17 +01:00
Dmitry Batrak
688691d594 JBR-5751 java/awt/Focus/RowToleranceTransitivityTest.java: Focus got stuck while traversing.
(cherry picked from commit d56b4b045d)
2026-01-20 01:03:16 +01:00
Vitaly Provodin
8e1af3626c JBR-5286 make windows-aarch64 building script identical to the same script in jbr17
(cherry picked from commit a451d19108)
2026-01-20 01:03:16 +01:00
Vitaly Provodin
3a5da080da update jetbrains.api hash and API version
(cherry picked from commit 2a53bf894c)
2026-01-20 01:03:16 +01:00
Vitaly Provodin
952aa1cad1 Revert "JBR-5724: fixed serialization and backward compatibility of Font"
This reverts commit c5cc5b4dedbdf73871f14db92afaac15fd985d86.

(cherry picked from commit 34ed77394f)
2026-01-20 01:03:16 +01:00
Vitaly Provodin
3f33824ebb JBR-6246 add default CDS archives into jbrsdk distributions
(cherry picked from commit f103a46a4d)
2026-01-20 01:03:16 +01:00
Dmitry Drobotov
d219dd244f JBR-4479 Add text caret tracking for macOS Accessibility Zoom
(cherry picked from commit 0dfbf34b37)
(cherry picked from commit 29ce00912d)
2026-01-20 01:03:16 +01:00
Dmitry Drobotov
566fe4537d JBR-6194 Fix VoiceOver reading old JComboBox value after changing it
1. Remove `value == nil` check in ComboBoxAccessiblity.accessibilityValue to fix the issue with not updated value of combo box. With `value == nil` check, the value was not reassigned on every get request of `accessibilityValue`, but only on get `accessibilitySelectedChildren`. When changing focus by Tab, only get `accessibilityValue` is called, and because `value` is already not nil, an old value was returned.

2. Set combo box role to NSAccessibilityPopUpButtonRole if it's not editable. Setting role to popup button fixes the bug when combo box value was not updated when using VO cursor navigation. Native MacOS non-editable combo boxes and non-editable HTML <select> elements also have the "popup button" role instead of "combo box", so the role should become more clear. Popup button role additionally enables opening the combo box menu with VO+Space shortcut, and changes VO instructions to be more appropriate when combo box is focused.

3. Add test for VoiceOver-specific issues of JComboBox.

(cherry picked from commit 8982db51d7)
(cherry picked from commit aebfb1439e)
2026-01-20 01:03:16 +01:00
Vitaly Provodin
87cc5f8389 Update README.md
(cherry picked from commit 053f3acae4)
2026-01-20 01:03:16 +01:00
Maxim Kartashev
f8dfd0c336 JBR-6220 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java became failing by time out on Linux
(cherry picked from commit 3f78590707)
2026-01-20 01:03:16 +01:00
Maxim Kartashev
2adb17423d JBR-6142 Impossible to move/resize IDE window after restart if several projects were initially opened on secondary monitor
Announce to Mutter that we are "client-decorated" when a Frame is
undecorated by setting _GTK_FRAME_EXTENTS to all zeroes.
This prevents Mutter from applying certain harmful heuristics.

(cherry picked from commit c5a34ea526)
2026-01-20 01:03:16 +01:00
Maxim Kartashev
83d8a9f8e2 JBR-5971 Wayland: support WindowMove JBR API
Updated the XToolkit implementation to match API changes required for
WLToolkit

(cherry picked from commit 7492c11138)
2026-01-20 01:03:16 +01:00
Maxim Kartashev
a4cda89c6e JBR-5777 isWindowMoveSupported() doesn't work with non-default GraphicsEnvironment
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
(cherry picked from commit 4496757a35)
2026-01-20 01:03:15 +01:00
Maxim Kartashev
8fa0c2881f JBR-5637 Linux: implement window position change with WM help
Introduced JBR.isWindowMoveSupported() and
JBR.getWindowMove().startMovingTogetherWithMouse()

(cherry picked from commit 747bc94e8f)
2026-01-20 01:03:15 +01:00
Maxim Kartashev
0eb898dd38 JBR-5084 Add ability to log additional data to jstack output
The data can be provided via this JBR API call:
JBR.getJstack().includeInfoFrom(Supplier<String>)

(cherry picked from commit 5244ec31f9)
2026-01-20 01:03:15 +01:00
Alexander Lobas
a580d62367 JBR-5546 Iterating open windows with cmd backtick on Mac forces minimized windows to un-minimize
(cherry picked from commit ffb74e32a0)
2026-01-20 01:03:15 +01:00
Alexander Lobas
d121bdb7ca JBR-5478 IDEA window doesn't fit the screen properly on turning off/on an external monitor
(cherry picked from commit 24930c2624)
2026-01-20 01:03:15 +01:00
Alexander Lobas
7091c9cc58 JBR-5384 New UI: window header is hard to resize on the top edge, top/right corner
(cherry picked from commit c4dd01c027)
2026-01-20 01:03:15 +01:00
Alexander Lobas
08befee449 JBR-5174 Opening project as tabs in Mac OS (version2)
JBR-5023 Configure TabbingIdentifier during create native window
JBR-5256 IDEA window resizes to zero height when exit full-screen mode with new window controls enabled
JBR-5197 Window control buttons are not visible in full-screen mode in dark themes when IDE window is focused
JBR-5175 jb/java/awt/Window/FullScreenTwoFrames.java: -[AWTWindow resetWindowFullScreeControls]: unrecognized selector sent to instance 0x60000232d5f0
JBR-5499 Window control buttons bugfix
JBR-4462 BigSur: project tab does not gain focus when click it after focusing another app

(cherry picked from commit 4aa2061ab6)
2026-01-20 01:03:15 +01:00
Dmitry Batrak
c89f24d962 JBR-5300 Change source code and test files to use GPL license
fix copyright profile in generated IDE project

(cherry picked from commit 43ebbe3cd1)
(cherry picked from commit 39d49c5abe)
2026-01-20 01:03:15 +01:00
Nikita Gubarkov
1411b1f8ef JBR-5124 Rewrite custom decorations support
JBR API v0.0.8
Added new WindowDecorations API, deprecated old CustomWindowDecoration.

JBR-4641 JBR-4630 Fix client area calculation with custom decorations on Windows.

- Window insets are rounded up, which causes visible & unusable border in fullscreen on some scales, round down instead.

- Clipping in Swing components sometimes cuts what it shouldn't, fixed.

(cherry picked from commit 03d850e722)
2026-01-20 01:03:15 +01:00
Vitaly Provodin
671f2ccc3e update exclude list on results of 21.0.1_b293.1 test runs
(cherry picked from commit a247590ca0)
2026-01-20 01:03:15 +01:00
Nikita Provotorov
62900348a7 JBR-6282: java/awt/TextArea/TextAreaEditing/TextAreaEditing.java intermittently fails due to deadlock.
Makes the test invoke any UI-operation on EDT only (since AWT doesn't guarantee thread-safety of UI operations, see more at https://mail.openjdk.org/pipermail/client-libs-dev/2023-November/016172.html).

(cherry picked from commit 8dbb889509)
(cherry picked from commit 559ec0c370)
2026-01-20 01:03:15 +01:00
Maxim Kartashev
2e51e810fa JBR-6291 runtime/cds/appcds/dynamicArchive/TestDynamicDumpAtOom.java: Attempting to acquire lock OOMEStacks_lock/safepoint out of order
(cherry picked from commit c8c8881be4)
2026-01-20 01:03:14 +01:00
Alexander Lobas
ac51b698ca JBR-5409 "No Print Service Found" Error when saving to PDF
(cherry picked from commit 9c9859ba1a)
2026-01-20 01:03:14 +01:00
Alexey Ushakov
b991e4ee70 JBR-6281 Remove MTLEvent sync from Metal rendering code
Removed sync code

(cherry picked from commit 660d97005c)
2026-01-20 01:03:14 +01:00
Nikita Provotorov
994d609a7d JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
This patch makes the fix of JBR-1573 (which caused JBR-4394) disabled by default, because it's incompatible with the native below-the-spot mode (a.k.a. over-the-spot in the X11's terminology).

(cherry picked from commit 3fe2a97aa0)
(cherry picked from commit fc3ce96788)
2026-01-20 01:03:14 +01:00
Nikita Provotorov
0220a805ee JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
- introduces and integrates jbNewXimClient: a new implementation of XIC creation routine (it's mostly refactoring and generalizing of AWT's existed code). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false ;
- introduces support of the X11's native over-the-spot input method style (it's almost the same as AWT's below-the-spot mode, but the input method's windows are drawn externally, not by AWT). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false. Doesn't work if -Djb.awt.newXimClient.enabled=false is set ;
- introduces sun.awt.X11.XInputMethod.ClientComponentCaretPositionTracker class that tracks all kind of events for the current client component that can lead to the caret position changing ;
- makes the XInputMethod class to update the input window's position (whenever the ClientComponentCaretPositionTracker discovers that's necessary) by setting the X11's XNSpotLocation property .

Check out the branch nprovotorov/backups/JBR-2460_wrong-position-of-input-window-and-no-input-preview for more granular patches.

(cherry picked from commit c57030a2ef)
(cherry picked from commit 56d9759667)
2026-01-20 01:03:14 +01:00
Maxim Kartashev
43e1d02fb2 JBR-6193 Impossible to resize snapped IDE when native header is turned off
Drop the maximized state right before the resize operation for
undecorated windows.

Also fixes setExtendedState() to work when changing snapped window's state
(MAXIMIZED_HORIZ or MAXIMIZED_VERT) to NORMAL.

(cherry picked from commit a9a227c5ab)
2026-01-20 01:03:14 +01:00
Nikita Provotorov
0911735217 JBR-5980: Pasting from clipboard not working reliably in Windows.
(also contains the fix of JBR-6267 Image retreived from the Clipboard is not the same image that was set to the Clipboard)

- Adds a way to disable caching of the data placed into the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.cache.disabled" (=false by default) ;
- Whenever the app gets focus additionally checks if another app has modified the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.extraOwnershipChecksEnabled" (=true by default) .

(cherry picked from commit e6f4a25b1a)
2026-01-20 01:03:14 +01:00
Nikita Provotorov
34879181e7 JBR-5980: Pasting from clipboard not working reliably in Windows.
Marks the native flag AwtClipboard::isGettingOwnership as volatile and adds memory barriers around it to avoid inconsistencies of CPU caches.

(cherry picked from commit 51d2b31b28)
2026-01-20 01:03:14 +01:00
Vitaly Provodin
9be8af114c JBR-6255 improve calculation JDK_BUILD_NUMBER
(cherry picked from commit 186d1c3229)
2026-01-20 01:03:14 +01:00
Nikita Gubarkov
4448723de1 JBR-5274 recreate CGraphicsDevice if it was changed.
- AWT code heavily relies on reference comparison when updating graphics devices & configurations, so we need to actually re-create CGraphicsDevice if it was changed.

- Also do not rely on graphicsConfig.getDefaultTransform() when firing `graphicsContextScaleTransform` property change, as graphics devices are mutable and returned default transform may change over time, e.g. when device is invalidated.

(cherry picked from commit f9ad92a71c)
2026-01-20 01:03:14 +01:00
Alexey Ushakov
0b8b339444 JBR-5025 Reduce latency during display reconfiguration in Metal
Moved metal load library checks to CGraphicsEnvironment

(cherry picked from commit eeee663bb4)
2026-01-20 01:03:14 +01:00
Alexey Ushakov
23d8bba304 JBR-4666 java.lang.InternalError: Error - unable to initialize Metal after recreation of graphics device.
Reverted fix of the JRE-359 (CGraphicsEnvironment.getDefaultScreenDevice() returns null)
Logged exception after first attempt to create graphics device

(cherry picked from commit 345fd320c7)
2026-01-20 01:03:14 +01:00
Alexey Ushakov
d0d8d6572f JBR-4588 macOS: SIGILL at [libsystem_kernel] __kill in CCE: class sun.java2d.opengl.CGLGraphicsConfig cannot be cast to class sun.java2d.metal.MTLGraphicsConfig
Prevent fall back to OpenGL if Metal has been used before
Added more diagnostics.

(cherry picked from commit 4002007cc2)
2026-01-20 01:03:13 +01:00
Vitaly Provodin
de7b303ab6 Update README.md
(cherry picked from commit 74f354be28)
2026-01-20 01:03:13 +01:00
Vladimir Kharitonov
51c3ddced9 JBR-6239 sign frameworks in cef_server.app
(cherry picked from commit 8f6ae7a89c)
2026-01-20 01:03:13 +01:00
Maxim Kartashev
b65e9e5880 JBR-4020 Test ObsoleteFlagErrorMessage fails after +IgnoreUnrecognizedVMOptions has become the default
(cherry picked from commit ae5963a094)
(cherry picked from commit 5b27cdbd14)
2026-01-20 01:03:13 +01:00
Maxim Kartashev
9a64093144 JBR-5722 vmTestbase/vm/gc/compact/Compact_TwoFields_InternedStrings: SIGSEGV at Symbol::as_klass_external_name(char*, int)
Do not use print_native_stack() when recording OOME stacks as it is
designed to be used only in the context of a fatal error reporting where
induced crashes are tolerated.

(cherry picked from commit 6a87945cc5)
2026-01-20 01:03:13 +01:00
Alexey Ushakov
eeb2688b23 JBR-5741 broken build in main because of hotspot changes (JDK-8309613)
Added missing parameter

(cherry picked from commit c4c6d022f8)
2026-01-20 01:03:13 +01:00
Maxim Kartashev
b5c25f8033 JBR-5466 jb/hotspot/JNIRefsInCrashLog.java: 'hs_err_42.txt' missing from stdout/stderr
(cherry picked from commit e511c26794)
2026-01-20 01:03:13 +01:00
Maxim Kartashev
a3aada76c3 JBR-5431 Include memory used by JNI references into crash reports
(cherry picked from commit 9a6eb0b730)
2026-01-20 01:03:13 +01:00
Vitaly Provodin
de96d57a6a Update README.md
(cherry picked from commit 66c66543bb)
2026-01-20 01:03:13 +01:00
bourgesl
f91893626a JBR-5638: improved renderer performance for simple rectangular area (see BBoxAATileGenerator), added new statistics in Renderer
(cherry picked from commit dd4f818488)
2026-01-20 01:03:13 +01:00
Nikita Tsarev
66a6499063 JBR-6215: Override XToolkit's default nonintuitive behavior when translating F13-F24 keys
(cherry picked from commit 413b679eda)
2026-01-20 01:03:13 +01:00
Konstantin Bulenkov
25aea47436 JBR-6214 [fwp jbr21] IDEA-299292 Use Inter semibold instead of Inter bold
Replaced Inter bold with semi-bold fonts

(cherry picked from commit 1ca726da46)
2026-01-20 01:03:12 +01:00
Nikita Gubarkov
6e56b3f4d9 JBR-6208 Extended glyph cache for Metal
(cherry picked from commit 6878613df0)
2026-01-20 01:03:12 +01:00
Vitaly Provodin
010423abe4 JBR-6181 add Linux executables with bundled FreeType
(cherry picked from commit 12449b3de5)
2026-01-20 01:03:12 +01:00
Vitaly Provodin
404536858b Update README.md
(cherry picked from commit cff858e253)
2026-01-20 01:03:12 +01:00
Alexey Ushakov
970bb949c2 JBR-4983 MacOS Ventura - External monitor lagging
Restored REDRAW_INC to 2. Enabled the fix by default only for M2 and spans displays property enabled (Displays have separate spaces OFF)

(cherry picked from commit 19728e911b)
2026-01-20 01:03:12 +01:00
Dmitrii Morskii
2f137cf12c JBR-6135 removed dependence on process reading TTF in fixed size chunks
(cherry picked from commit 7c4721fa68)
2026-01-20 01:03:12 +01:00
Alexey Ushakov
4a093c1227 JBR-6132 Crash in [MTLLayer blitTexture] when MTL_DEBUG_LAYER enabled
Blit operation should not be performed on textures with MTLTextureUsageRenderTarget only, so changing framebufferOnly to NO

(cherry picked from commit 5fb47ffc78)
2026-01-20 01:03:12 +01:00
Vitaly Provodin
36104351c0 Update README.md
(cherry picked from commit 7d1bcef8cd)
2026-01-20 01:03:12 +01:00
Nikita Provotorov
214461eefc JBR-5984: IM's candidate window is placed under popup windows.
- Implements the optional method [NSTextInputClient windowLevel] to tell the macOS IM subsystem correct level of the window;
- Adds a regression test ImWindowIsPlacedUnderPopup5984.java.

(cherry picked from commit 5a91aae9c2)
(cherry picked from commit 2f310561ba)
2026-01-20 01:03:12 +01:00
Vitaly Provodin
496271f16e JBR-6130 add VK_TAB release action
(cherry picked from commit e16990eb93)
2026-01-20 01:03:12 +01:00
Alexey Ushakov
11f84bc4a7 JBR-4983 MacOS Ventura - External monitor lagging
Added extra redraw request

(cherry picked from commit bd436709f5)
2026-01-20 01:03:12 +01:00
ghostflyby
e1767851f4 JBR-6124 Fix macOS services writing text back to textfield
(cherry picked from commit 51bde60b42)
2026-01-20 01:03:12 +01:00
Sergey Shelomentsev
f209f8fb3c exclude FocusTraversalOrderTest
(cherry picked from commit f7004afdb1)
2026-01-20 01:03:11 +01:00
Sergey Shelomentsev
103c6fd251 JBR-6060 add focus traversal order test
(cherry picked from commit 40dec50c3a)
2026-01-20 01:03:11 +01:00
Nikita Gubarkov
31b92a1cbf JBR-6016 doPrivileged for JBR API internal services.
(cherry picked from commit 06290bfd1e)
2026-01-20 01:03:11 +01:00
Vitaly Provodin
9fe6c2af91 JBR-6008 Update JetBrains Mono fonts to v2.304
(cherry picked from commit 676a270ac1)
2026-01-20 01:03:11 +01:00
Vitaly Provodin
e7d3a1149a Update README.md
(cherry picked from commit 0400cd7f9b)
2026-01-20 01:03:11 +01:00
Dmitry Batrak
fbeaeaa879 JBR-3353 Sibling popup window is shown below dialog on macOS
(cherry picked from commit 4c6f3e4510)
(cherry picked from commit 73678a99d5)
2026-01-20 01:03:11 +01:00
Dmitry Batrak
50c3857854 JBR-5953 If hieroglyph typing isn't finalised, focusing another component inserts the composed text there
(cherry picked from commit 5dedf0e367)
2026-01-20 01:03:11 +01:00
Dmitry Batrak
c48d118920 JBR-5946 Allow to disable painting of composed text in Swing text components using TextLayout.draw
(cherry picked from commit 3ac357417b)
2026-01-20 01:03:11 +01:00
Dmitry Batrak
e99680a70a JBR-5823 IDEA crashes when '-Dmain.thread.as.edt=true' vmoption is set and VoiceOver is enabled
done as part of JBR-4993 Support using 'main' thread as EDT on macOS

(cherry picked from commit 55598693c3)
(cherry picked from commit c7b9f1aa68)
2026-01-20 01:03:11 +01:00
ngubarkov
17c6a8563e JBR-5240 Fix XToolkit#getScreenInsets in Xinerama mode.
(cherry picked from commit 5df3fc666d)
2026-01-20 01:03:11 +01:00
ngubarkov
2fbbf1d116 JBR-5316 Fix fractional scaling HIDPI.
(cherry picked from commit acb62617d7)
2026-01-20 01:03:11 +01:00
Nikita Gubarkov
20b0bd65ae JBR-5186 Make MouseInfo.getPointerInfo more robust
Do not search for the containing monitor in MouseInfo.getPointerInfo, this must be handled by peers (yes, this goes against the spec of MouseInfoPeer.fillPointWithCoords).

JBR-5268 Fix coordinates conversion in XMouseInfoPeer.fillPointWithCoords

(cherry picked from commit ae135f2126)
2026-01-20 01:03:10 +01:00
Nikita Gubarkov
fcaf079204 IDEA-141456 Multimonitor HIDPI support for Linux
(cherry picked from commit 980c18ae92)
2026-01-20 01:03:10 +01:00
Dmitrii Morskii
a68d3f362c JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit e3da733724)
2026-01-20 01:03:10 +01:00
Dmitrii Morskii
87cd10ed27 JBR-5259: fixed Canvas mispositioning after dragging JFrame to a monitor with different scale
(cherry picked from commit de62b80ef2)
2026-01-20 01:03:10 +01:00
Vitaly Provodin
b8eb1a6ab5 Update README.md
(cherry picked from commit b438d74f39)
2026-01-20 01:03:10 +01:00
Maxim Kartashev
299b5238fd JBR-5815 javax/swing/AbstractButton/6711682/bug6711682.java: Row #2 checkbox is not selected
Fixed the test to use proper cell coordinates when clicking.

(cherry picked from commit ed01142e8b)
2026-01-20 01:03:10 +01:00
Alexey Ushakov
f7b9ca7283 JBR-5807 java/awt/Frame/FrameVisible/FrameContentAppearanceTest.java: Failed: OpenGL 26 image rendering failure(s)
Added synchronisation for rendering and appearance

(cherry picked from commit d02635f65b)
2026-01-20 01:03:10 +01:00
bourgesl
56596dcb22 JBR-5625: disable color-matching (colorspace = nil) in MTLLayer by default (see new system property 'sun.java2d.metal.colorMatching=true/false') + added new MetalLayerColorTest
Use CGColorSpaceCopyName() available since macOS 10.6 in MTLLayer

Use sun.java2d.metal.colorMatching=true by default (current metal behaviour)

(cherry picked from commit ec5c99bfb6)
2026-01-20 01:03:10 +01:00
Nikita Provotorov
1ac62c8ae3 JBR-5762 Sometimes naturally generated MOUSE_DRAGGED events don't contain the pressed button's modifier.
Enforce keeping the pressed button in the modifiers for MOUSE_DRAGGED events. This is under a (default enabled) system property "awt.mac.enforceMouseModifiersForMouseDragged".

(cherry picked from commit fb12990a98)
(cherry picked from commit 6a972e8ca7)
2026-01-20 01:03:10 +01:00
Dmitrii Morskii
17388a0ee3 JBR-5548 fix BadSerializationTest
(cherry picked from commit 90d867d08b)
2026-01-20 01:03:10 +01:00
Vitaly Provodin
ca407a08b5 Update README.md
(cherry picked from commit 8efb8ded38)
2026-01-20 01:03:10 +01:00
Sergey Shelomentsev
083f7937f7 JBR-5746 wait for menu visibility of fail the test
add mouse events logging

(cherry picked from commit 5a05bd2046)
2026-01-20 01:03:10 +01:00
Dmitry Batrak
d35a6fb4a0 JBR-5720 Wrong modifiers are reported for mouse middle and right buttons' release/clicked events
(cherry picked from commit afa0283f16)
2026-01-20 01:03:09 +01:00
Dmitry Batrak
61433a594a JBR-5684 Focus state is broken after closing of modal dialog in an inactive application
(cherry picked from commit 2f2fe7a11c)
2026-01-20 01:03:09 +01:00
Vitaly Provodin
e9bf263044 update exclude list
(cherry picked from commit 36f380d4b4)
2026-01-20 01:03:09 +01:00
Vitaly Provodin
c3328279aa Update README.md
(cherry picked from commit b4071ba08d)
2026-01-20 01:03:09 +01:00
Alexey Ushakov
bf40bd74a6 JBR-5151 Test failures caused by -Dsun.java2d.metal.displaySync=false
Removed display sync from window layer, provide layer content updates only when necessary

(cherry picked from commit 77cb9bcec0)
2026-01-20 01:03:09 +01:00
Dmitrii Morskii
59114b63fb JBR-1775: improved logic for choosing newer font between system and bundled ones
(cherry picked from commit 41cbdf720c)
2026-01-20 01:03:09 +01:00
Sergey Shelomentsev
bc4620de01 JBR-2870 add resression test for JPopupMenu
- verify that the popup menu is usable if overlaps WM's dock panel of the bottom of screen

(cherry picked from commit 962eb42ed2)
2026-01-20 01:03:09 +01:00
Vitaly Provodin
d805c3c870 Update README.md
(cherry picked from commit 15fdca4193)
2026-01-20 01:03:09 +01:00
Alexey Ushakov
ed6f288056 JBR-5693 Debug build failure in main branch
Corrected printf format and muted unused-function option for keycode_cache.c

(cherry picked from commit 87a01c930d)
2026-01-20 01:03:09 +01:00
Alexey Ushakov
6f7e0ffaa3 JBR-5704 displaySyncOFF: javax/swing/JDialog/Transparency/TransparencyTest.java: JDialog transparency lost upon iconify/deiconify sequence
Corrected startRedraw method to call setNeedsDisplay in displaySync=false mode

(cherry picked from commit 0ddd7e8301)
2026-01-20 01:03:09 +01:00
Sergey Shelomentsev
285b1d715a JBR-5670 restore initial display mode after test execution
restore original display mode

(cherry picked from commit d098ad1f77)
2026-01-20 01:03:09 +01:00
Sergey Shelomentsev
aff731fe12 JBR-4880 Fix DeadKeySystemAssertionDialog to avoid receiving key event out of the window
(cherry picked from commit 5467dea09b)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
c95869bf67 JBR-5600 Reduce noise in signing scripts output
(cherry picked from commit bc145d39be)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
30e2722db9 JBR-5600 Sign frameworks as whole, verify framework signature before full app sign
(cherry picked from commit 2fecc58be2)
2026-01-20 01:03:08 +01:00
Nikita Provotorov
9780497c57 JBR-5668: The implementation of a11y announcing for macOS crashes with -Xcheck:jni.
- Create a global reference of the passed to EDT accessible object (the local reference) to use it in the AppKit thread ;
- Enable -Xcheck:jni in the tests ;
- Make the tests handle the problematic case .

(cherry picked from commit cba981df4b)
(cherry picked from commit f3a038c849)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
55928cb195 tools/mac/scripts: minor improvements
* don't move into itself
* use `PKG_NAME` variable instead of `${APP_NAME}.pkg`
* cleanup sign.sh
* add `SCRIPT_VERBOSE` env variable to control `set -x`

(cherry picked from commit 28514c3d00)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
ccb894507a JBR-5600 Staple .pkg with signature
(cherry picked from commit 6555023fd3)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
ab25a22a88 JBR-5600 Notarize macOS binaries using notarytool
(cherry picked from commit 7916ed31b7)
2026-01-20 01:03:08 +01:00
Vladislav Rassokhin
cea014c16f JBR-5600 Sign macOS binaries using jet-sign
(cherry picked from commit 95ef69df13)
2026-01-20 01:03:08 +01:00
Sergey Shelomentsev
d2d59413c0 JBR-5579 Update mouse location checks, set window always on top for ActionListenerTest
(cherry picked from commit b867b1c395)
2026-01-20 01:03:08 +01:00
Sergey Shelomentsev
99058fa03f JBR-5551 update hit tests on custom title bar
- set windows always on top
- verify mouse location before clicking

(cherry picked from commit 005de74127)
2026-01-20 01:03:08 +01:00
Sergey Shelomentsev
8243537965 JBR-5577 fix MouseEventsOnClientArea test
- add Swing/AWT specific Task runners
- split MouseEventsOnClientArea to separate AWT/Swing tests
- use CountDownLatch for tracking mouse events

(cherry picked from commit c6a43fe84f)
2026-01-20 01:03:08 +01:00
Sergey Shelomentsev
f71d9487db remove jb/java/awt/Window/ZOrderOnModalDialogActivation.java
(cherry picked from commit 9b6037dee3)
2026-01-20 01:03:08 +01:00
Sergey Shelomentsev
447642234d JBR-4494 pass ui scale options for child process
(cherry picked from commit e32e657c55)
2026-01-20 01:03:07 +01:00
Maxim Kartashev
172e28dd07 JBR-5656 Builds of JDK 21 are reproducible by default
(cherry picked from commit 0d663a139acf3d5cdb19b33494ab9f6273c4ebfa)
(cherry picked from commit f086917fa7)
2026-01-20 01:03:07 +01:00
bourgesl
dc6255a51f JBR-5651: Improved MTLVertexCache to merge consecutive full-tiles ie use 1 larger quad instead of many quads per row, full-tile is only using 1x1 pixel (full), applied to color, gradient & texture paints + fixed clang warnings
(cherry picked from commit 6de22f0db9)
2026-01-20 01:03:07 +01:00
Alexey Ushakov
be500b1a90 JBR-5649 Flickering in multi-monitor configuration
Provided corrected initial value for currentDisplayID

(cherry picked from commit c0f779b7e6)
2026-01-20 01:03:07 +01:00
Vitaly Provodin
de0c97c5e7 JBR-5627 add regression test AsyncProfilerRunnerTest
(cherry picked from commit ce37138a4a)
2026-01-20 01:03:07 +01:00
Maxim Kartashev
cea6972e0f JBR-5631 Refactor Dockerfile for x64 builds
(cherry picked from commit 3bb93255e9)
2026-01-20 01:03:07 +01:00
Vitaly Provodin
e88e89724c JBR-5603 build aarch64 Linux from arm64v8/centos:7 and check glibc to be not higher 2.17
(cherry picked from commit f6be01d68c)
2026-01-20 01:03:07 +01:00
Alexey Ushakov
d82a1a8a7e JBR-5580 J2DBench: ~15% drop performance  because of non optimal synchronization in metal (MBP 16'' x64)
Replaced NSMutableArray with NSMutableSet, removed unnecessary __block modifier.

(cherry picked from commit fd940831a2)
2026-01-20 01:03:07 +01:00
Sergey Shelomentsev
039b14c8b1 update a11y exclude list
(cherry picked from commit 5641f7141f)
2026-01-20 01:03:07 +01:00
Alexey Ushakov
ae0c0e9bc9 JBR-5580 J2DBench: ~15% drop performance because of non optimal synchronization in metal (MBP 16'' x64)
Removed NSLock and moved all operations to the AppKit thread

(cherry picked from commit e2fcfaf249)
2026-01-20 01:03:07 +01:00
bourgesl
75ea02786c JBR-5170: improved color maskFill performance: using a new MaskColorBuffer and a specific shader (vert_txt_col)
fix crash in J2DDemo with advanced paints + artefacts with texture background

(cherry picked from commit 2fc32d6082)
2026-01-20 01:03:07 +01:00
Alexey Ushakov
d248fd4dc0 JBR-5559 SwingMark performance drop after removing additional command queue
Added command queue and provided synchronization between the command queues

(cherry picked from commit 6b76f79eee)
2026-01-20 01:03:07 +01:00
Nikita Provotorov
a10f6a0c78 JBR-5536: Crash on macOS bad JNI lookup in Java_sun_swing_AccessibleAnnouncer_nativeAnnounce
Stop using the JNIEnv instance bound to EDT in the AppKit thread.

(cherry picked from commit 0f49341f4d)
(cherry picked from commit cdca8e74b7)
2026-01-20 01:03:06 +01:00
Alexey Ushakov
0af60e4f3a JBR-4883 macOS: SIGSEGV at MTLVertexCache_FlushGlyphVertexCache
Use separate glyph cache for each MTLContext instance. Refactored MTLGlyphCache

(cherry picked from commit 845a30560e)
2026-01-20 01:03:06 +01:00
Alexey Ushakov
4e2b683262 JBR-5193 Do not use extra commandQueue in metal pipeline
Removed extra command queue

(cherry picked from commit a235903851)
2026-01-20 01:03:06 +01:00
Alexey Ushakov
369ec7657c JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
This includes displaySync changes as well as fixes for JBR-5157 and JBR-5321.

(cherry picked from commit e7df6f3745)
2026-01-20 01:03:06 +01:00
Vitaly Provodin
d264e6679c Update README.md
(cherry picked from commit aa1d64ca93)
2026-01-20 01:03:06 +01:00
Maxim Kartashev
4b24f15ca6 jb/branchdiff.py is a lot faster
(cherry picked from commit 5c3726555d)
2026-01-20 01:03:06 +01:00
Sergey Shelomentsev
d0261f616d JBR-5505 update exclude list for a11y testing on Windows
(cherry picked from commit 12330ba916)
2026-01-20 01:03:06 +01:00
Sergey Shelomentsev
5340fdb18e JBR-5397 update exclude list for a11y testing on MacOS
(cherry picked from commit 688b16a796)
2026-01-20 01:03:06 +01:00
Sergey Shelomentsev
1c3f6d4eb9 JBR-5441 fix wait for idle
(cherry picked from commit 8b5945f834)
2026-01-20 01:03:06 +01:00
Maxim Kartashev
0c1ba98b9e jb/branchdiff.py to warn if it can't differentiate between commits
(cherry picked from commit 3504702f9c)
2026-01-20 01:03:06 +01:00
Sergey Shelomentsev
9754086911 JBR-5440 fix calculations for double click location
(cherry picked from commit e468d39869)
2026-01-20 01:03:06 +01:00
Artem Bochkarev
63a040fc2e JBR-5426 write JCEF version info inside release file
(cherry picked from commit 59701eefa3)
2026-01-20 01:03:06 +01:00
Maxim Kartashev
933508e1cd JBR-5445 JBRApiTest test fails on development builds
(cherry picked from commit d9d941f9c5)
2026-01-20 01:03:05 +01:00
Sergey Shelomentsev
30ed26c07a JBR-5433 add typing latency text for JTextArea
(cherry picked from commit c6706f1794)
2026-01-20 01:03:05 +01:00
Vitaly Provodin
56b36197e1 JBR-5432 increase setAutoDelay for Robot
(cherry picked from commit 17b10df182)
2026-01-20 01:03:05 +01:00
Maxim Kartashev
fbdfbdc90d JBR-5230 Wanted: an ability to use Unix Domain sockets with overridden default NIO file system
(cherry picked from commit 946a7ca9ec)
2026-01-20 01:03:05 +01:00
Sergey Shelomentsev
e943119e2c fixup! JBR-4875 set proper OS to run ComboBoxTransparentTittleBarTest
(cherry picked from commit 611dcc6475)
2026-01-20 01:03:05 +01:00
Sergey Shelomentsev
b9438f7102 fix controls width calculation
(cherry picked from commit b88d26c9dd)
2026-01-20 01:03:05 +01:00
Sergey Shelomentsev
7f5b9ee528 split ActionListenerTest
(cherry picked from commit 36f13b0158)
2026-01-20 01:03:05 +01:00
Sergey Shelomentsev
a1a302bbb4 JBR-5345 native controls detection and scale fixes
(cherry picked from commit e191789794)
2026-01-20 01:03:05 +01:00
Maxim Kartashev
38f576abcf README.md: spelled out JBR distinctive features
(cherry picked from commit 51e9900c8b)
2026-01-20 01:03:05 +01:00
Vitaly Provodin
b1a6c4ca6d update exclude list on results of 21_b28.1 test runs
(cherry picked from commit 4619c5ed7f)
2026-01-20 01:03:05 +01:00
Alexey Ushakov
5c0523e482 JBR-5330 Blank Welcome screen after moving to another display
Initialize currentDisplayID on AWTWindow creation

(cherry picked from commit c5ea4e48ac)
2026-01-20 01:03:05 +01:00
Nikita Tsarev
de1d2ebe20 JBR-5369: Update failing tests list in response to macOS keyboard support rewrite
(cherry picked from commit a9313e2d06)
2026-01-20 01:03:05 +01:00
Vitaly Provodin
361b0929f6 Update README.md
(cherry picked from commit ed3d57cf10)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
db4f890ada update exclude list on results of 21_b24.2 test runs
(cherry picked from commit 3276006be9)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
7d883481e1 Update README.md
(cherry picked from commit 552fa7c32e)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
93c14fadd0 JBR-5350 Separate test for Mac OS
(cherry picked from commit dc4a094f03)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
b0988e85b9 JBR-5346 run MaximizedCustomDecorationsTest on windows/mac only
(cherry picked from commit c47b6f4880)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
24c294fdd0 JBR-5350 fix FrameNativeControlTest checks on MacOS
(cherry picked from commit f8f1c8625e)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
3f8ca45dd9 JBR-5344 fix incorrectly specified VM options
(cherry picked from commit 2f101dbf8a)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
69ad89f3fc Update README.md
(cherry picked from commit 952295b14d)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
21fd86de7a update exclude list on results of 17.0.6_b855.1 test runs
(cherry picked from commit b018988c02)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
c77d624dea JBR-5313 fix broken custom decoration tests on Windows
(cherry picked from commit c6e21bdbad)
2026-01-20 01:03:04 +01:00
Sergey Shelomentsev
4120961f6c JBR-5253 Use new JBR API for custom decorations
(cherry picked from commit fdead3d90a)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
27bcc63133 JBR-5300 move jbr-api.jar into test artefact
(cherry picked from commit f199d6c98a)
2026-01-20 01:03:04 +01:00
Vitaly Provodin
128e372c5f update exclude list on results of 17.0.6_b837.3 test runs
(cherry picked from commit 415267181c)
2026-01-20 01:03:03 +01:00
Maxim Kartashev
0c6c3803f5 JBR-4544 Enable OpenGL pipeline by default for Wayland sessions
The OpenGL pipeline is enabled only if all of the following is true:
- WAYLAND is detected,
- VMWare virtualization is detected,
- rendering pipeline is not a software one (llvmpipe).
As a side effect, a system property 'jbr.virtualization.information'
is set to the value of detected virtualization type. The value is the
same as provided by JFR.

(cherry picked from commit f6acd65d32)
2026-01-20 01:03:03 +01:00
Sergey Shelomentsev
55f4d81479 set version for building jbr-api
(cherry picked from commit 6a0113fd07)
2026-01-20 01:03:03 +01:00
Sergey Shelomentsev
6306731907 get rid of build-jbr-api scripts
(cherry picked from commit 1c8496e757)
2026-01-20 01:03:03 +01:00
Vitaly Provodin
5478f87fbd clean up exclude lists
(cherry picked from commit de6d9f328f)
2026-01-20 01:03:03 +01:00
Sergey Shelomentsev
fd7d0de10e JBR-5194 add regressions tests for custom decorations support
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5fc82006c4)
2026-01-20 01:03:03 +01:00
Sergey Shelomentsev
1e7020ce2e build jbr-api as a part of bundle build
(cherry picked from commit 45efe7fdd5)
2026-01-20 01:03:03 +01:00
Vitaly Provodin
50488dfa5d Update README.md
(cherry picked from commit dd24017389)
2026-01-20 01:03:03 +01:00
Vitaly Provodin
19af0978be Update README.md
(cherry picked from commit 45d7501c9f)
2026-01-20 01:03:03 +01:00
Artem Semenov
dc874466ba JBR-5289 If the label has the role of a hyperlink, VO still pronounces it as plain text (#215)
(cherry picked from commit 675ca2f02e)
2026-01-20 01:03:03 +01:00
Alexey Ushakov
285e68d8f7 JBR-5279 restore saving jbr native symbols bin/server/jvm.pdb
(cherry picked from commit 887b9dbcac)
2026-01-20 01:03:03 +01:00
Sergey Shelomentsev
742aee1542 JBR-4875 update test to use new JBR API window custom decorations
(cherry picked from commit df92d71389)
2026-01-20 01:03:03 +01:00
Vitaly Provodin
ce5ad305e3 Update README.md
(cherry picked from commit 373482ffc4)
2026-01-20 01:03:02 +01:00
Artem Semenov
a8960e420b JBR-5269 Announcement priorities not set correctly (#214)
(cherry picked from commit c34aa6fc6f)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
705982a6b0 Update README.md
(cherry picked from commit 3631c19265)
2026-01-20 01:03:02 +01:00
Artem Semenov
ccf669dd6c JBR-5248 exception in accessible announcing
(cherry picked from commit a4e0f6018f)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
6f57f45f6c update exclude list on results of 21_b9 test runs
(cherry picked from commit 9f04c32c10)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
1222351030 JBR-5217 enable NVDA support in Windows builds
(cherry picked from commit afc5710f21)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
bf09307155 Update README.md
(cherry picked from commit df4fd03fba)
2026-01-20 01:03:02 +01:00
AMPivovarov
ed6098b78b JBR-5213 JBR API v0.0.9 - add GraphicsUtils (#208)
* relax type constraints in BltBufferStrategy.getDrawGraphics

(cherry picked from commit 715b615d88)
2026-01-20 01:03:02 +01:00
Artem Semenov
7cf7bec4da JBR-5221 Add announcing to JBRAPI
(cherry picked from commit 7189d50b76)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
13ffc9bcda update exclude list on results of 21_b8 test runs
(cherry picked from commit 17d5e3895b)
2026-01-20 01:03:02 +01:00
Artem Semenov
de73b0ebd4 JBR-4170 Implement API for announcing
(cherry picked from commit d7f14bf793)
2026-01-20 01:03:02 +01:00
Vitaly Provodin
65418bfad3 update exclude list on results of 21_b7 test runs
(cherry picked from commit e40cdc800e)
2026-01-20 01:03:01 +01:00
Vitaly Provodin
9d600f3f1a update exclude list on results of stability checking runs due to 8253184
(cherry picked from commit 166924f5ed)
2026-01-20 01:03:01 +01:00
Artem Bochkarev
b3dd57cce9 JBR-3575 use flag processEvents in LWCToolkit.invokeAndWait
(cherry picked from commit dcf9ff3315)
2026-01-20 01:03:01 +01:00
Vitaly Provodin
6f6c040b6e exclude several tests from runs on machines with enabled VoiceOver
(cherry picked from commit 8040e574e4)
2026-01-20 01:03:01 +01:00
Anton Tarasov
58e6724487 JBR-4355 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java: # C [libobjc.A.dylib+0x90ff] objc_release+0x1f
(cherry picked from commit c0b2b59d4a)
(cherry picked from commit 0691a5230c)
2026-01-20 01:03:01 +01:00
Anton Tarasov
3779ff9caf JBR-4362 [mac] system menu opens with duplicated items
(cherry picked from commit e32defe49d)
(cherry picked from commit 2d1e14f01d)
2026-01-20 01:03:01 +01:00
Anton Tarasov
5e877a34c5 JBR-4328 remove LWCToolkit.unsafeNonblockingExecute
(cherry picked from commit 9a3f31a6c4)
(cherry picked from commit f9a02266a0)
2026-01-20 01:03:01 +01:00
Anton Tarasov
b8cdb34e42 JBR-4134 PyCharm is slow and unusable on MacBook Pro with M1
(cherry picked from commit 36190505f5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cebc6ed818)
2026-01-20 01:03:01 +01:00
Anton Tarasov
1a9869a94c JBR-4284 Sub items of main menu options are not displayed
A regression of JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss

(cherry picked from commit c464e4748e)
(cherry picked from commit 42d07c4f0c)
2026-01-20 01:03:01 +01:00
Anton Tarasov
e636db134a JBR-4119 UI freezes at sun.lwawt.macosx.CAccessibility.getChildrenAndRoles
(cherry picked from commit 6ba79774d8)
(cherry picked from commit e1623dc301)
2026-01-20 01:03:01 +01:00
Anton Tarasov
1db9f8e1af JBR-4106 PyCharm hangs with 100% CPU usage on one core
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9deef18d46)
2026-01-20 01:03:01 +01:00
Anton Tarasov
13a813df66 JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss
including JBR-4543 (NPE: IdeEventQueue.lambda$getNextEvent$0)

(cherry picked from commit b16d847947)
2026-01-20 01:03:01 +01:00
Anton Tarasov
a955116e6a JBR-3413 use timeout in CAccessibility.invokeAndWait
(cherry picked from commit e7009db076)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit bd9d4cf182)
2026-01-20 01:03:00 +01:00
Vitaly Provodin
8d0ef551d3 update exclude list on results of 21_b1447 test runs
(cherry picked from commit 3502c53a16)
2026-01-20 01:03:00 +01:00
Vitaly Provodin
0e2f11ee20 Update README.md
(cherry picked from commit fcbfb32b13)
2026-01-20 01:03:00 +01:00
Vitaly Provodin
39189806e1 update exclude list on results of main.1441 test runs
(cherry picked from commit 7194b34979)
2026-01-20 01:03:00 +01:00
Alexey Ushakov
36187b1ad6 JBR-5112 Large bold square whitespaces after waking up the laptop / connecting display
Clear primary surface data of VolatileSurfaceManager on display change event

(cherry picked from commit de708896a6)
2026-01-20 01:03:00 +01:00
Artem Semenov
ae59a8400c JBR-5118 VoiceOver does not speak the label associated with the combobox (#194)
JBR-5118 VoiceOver does not speak the label associated with the combobox

(cherry picked from commit b6fc471cd0)
2026-01-20 01:03:00 +01:00
Artem Semenov
35a6096e24 JBR-4235 Context menu not readable after opening on Mac OS
(cherry picked from commit 83d6b20711)
2026-01-20 01:03:00 +01:00
Artem Semenov
44bd1c92a6 JBR-4012 On Idea Vo often speeks selected element of tables, lists, and trees.
(cherry picked from commit 47783c1c85)
2026-01-20 01:03:00 +01:00
Artem Semenov
39d61de791 JBR-3868 Combobox list is not voiced of VoiceOver
(cherry picked from commit 1f777d72ea)
2026-01-20 01:03:00 +01:00
Alexey Ushakov
f7b2269429 JBR-5041 macOS: SIGSEGV at [libawt_lwawt] getRenderEncoder:(dstOps == NULL)
Protected code from using NULL dstOps

(cherry picked from commit 44c76b8b99)
2026-01-20 01:03:00 +01:00
Alexey Ushakov
ef7fc6cea5 JBR-4856 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Clear glyph caches after switching contexts. Keep encoders in sync with graphics devices. Minor refactoring

(cherry picked from commit e2ed6bf8dd)
2026-01-20 01:03:00 +01:00
Dmitry Batrak
57e07e6185 JBR-5109 New frame doesn't get focused sometimes if it's shown right after popup is closed
(cherry picked from commit 693d317c0c)
(cherry picked from commit 6a153c09a8)
2026-01-20 01:03:00 +01:00
Vitaly Provodin
4050e8bc44 Update README.md
(cherry picked from commit 0a469f5069)
2026-01-20 01:02:59 +01:00
Alexey Ushakov
3bdd538d0f JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
Replace multiple CHANGE_SCREEN notifications fired around the same time with just one

Also, fix of JBR-5073 [Double-Monitor] java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java: Wrong location

Added check for nil displayID of the window

(cherry picked from commit cd6ca71ea8)

(cherry picked from commit 3f5ad0610a)

(cherry picked from commit 6a834fb5e7)

JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen

Do not fire deliverChangeBackingProperties notification for the view if there is no change between layer and window scales. Also, do not fire displayChanged for display profile only changes.

(cherry picked from commit 87c092d4ec)
2026-01-20 01:02:59 +01:00
Nikita Provotorov
0181f6e049 JBR-5075: macOS: KEY_PRESSED event for "Cmd N" is not emitted if used as a JMenuItem accelerator and apple.laf.useScreenMenuBar=true.
- Improves the fix of JBR-3544 to allow "Cmd N" and "Ctrl N" to reach AWT if they're actually the ones which were pressed.
- Adds a regression test.

(cherry picked from commit 61a1b70d73)
(cherry picked from commit c3f068760d)
2026-01-20 01:02:59 +01:00
Victor Kropp
8746774097 Update README.md
Mention Toolbox App in the list of applications built on JetBrains Runtime.

(cherry picked from commit cfa9789515)
(cherry picked from commit acc1a29a25)
2026-01-20 01:02:59 +01:00
Nikita Provotorov
bea0abf08f Update README.md
Replaced jbr-dev to main and other minor fixes.

(cherry picked from commit 91bea99984)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
512114a0eb update exclude list on results of 17.0.5_b721.3 test runs
(cherry picked from commit 652e397e29)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
50a5519960 update exclude list on results of 17.0.5_b712.2 test runs
(cherry picked from commit ef68a82141)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
bb0be6c590 JBR-4956 reduce width of screenshot by one pixel to exclude caret
(cherry picked from commit dd36d60415)
2026-01-20 01:02:59 +01:00
ngubarkov
5329c34fd7 JBR-4840 cache screen resolution in XToolkit
(cherry picked from commit b0c0a6ff75)
2026-01-20 01:02:59 +01:00
Dmitry Batrak
8cc82394f0 JBR-5045 Invisible component can break focus cycle
(cherry picked from commit 0f57a27879)
(cherry picked from commit 8309d820fd)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
114fc35bb9 Update README.md
(cherry picked from commit 1fb0b4f098)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
ee8ff35452 Update README.md
(cherry picked from commit a8862ab989)
2026-01-20 01:02:59 +01:00
Vitaly Provodin
39c921c14c update exclude list on results of 17.0.5_b691.6 test runs
(cherry picked from commit 668a433320)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
9771dc5fab Update README.md
(cherry picked from commit 2cdd0386c3)
2026-01-20 01:02:58 +01:00
Dmitry Batrak
29fc9a5b46 JBR-4988 Transient Z-order violations on macOS
(cherry picked from commit bcba97511c)
(cherry picked from commit 3ff06e954d)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
119b9343e2 JBR-4947 update alpine x64 image up to 3.14
(cherry picked from commit 88f2d7010f)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
70ad0e420d update exclude list on results of 17.0.5_b469.67 test runs
(cherry picked from commit 5ab3a9bf5f)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
0e9b288d57 Update README.md
(cherry picked from commit 61d47b2fd3)
2026-01-20 01:02:58 +01:00
Alexey Ushakov
54eccd1242 JBR-4950 src\java.desktop\windows\native\libawt\windows\awt_FileDialog.cpp: warning C4267: '+=': conversion from 'size_t' to 'UINT', possible loss of data
Added casts to resolve warnings

(cherry picked from commit f5c1a03bf5)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
0618d9be70 update Commit and Full testing exclude list on results of jbr17.668 test runs
(cherry picked from commit e7e823a0a3)
2026-01-20 01:02:58 +01:00
Maxim Kartashev
a3428f8c4d JBR-4951 In function 'convert_to_java_array': error: comparison of integer expressions of different signedness
(cherry picked from commit 4293e2832c)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
18ce5483fa JBR-4089 add modules sun.awt sun.awt.image sun.java2d
(cherry picked from commit 2cae8fb09c)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
1cfc80a101 update exclude list for Commit testing
(cherry picked from commit c037eec3ac)
2026-01-20 01:02:58 +01:00
Vitaly Provodin
e2e005ea9e exclude tests failing because of JBR-4933, JBR-4934
(cherry picked from commit 6f78d1b02c)
2026-01-20 01:02:58 +01:00
Alexey Ushakov
a8557d9565 JBR-4731 SIGILL caused by NPE Cannot invoke "java.awt.GraphicsConfiguration.getDevice()" because "config" is null
Handled null device in platform window

(cherry picked from commit 9e52c15ec7)
2026-01-20 01:02:57 +01:00
Maxim Kartashev
c44a08897d Move JBR README.md to .github/
(cherry picked from commit b69b12f489)
2026-01-20 01:02:57 +01:00
Svyatoslav Vlasov
db5c97f8ed Add ProjectorUtils to jbr-api (#181)
* Add ProjectorUtils to jbr-api

Co-authored-by: Sviatoslav Vlasov <Sviatoslav.Vlasov@jetbrains.com>
(cherry picked from commit c8ccc83a6e)
2026-01-20 01:02:57 +01:00
Nikita Tsarev
afe63fb816 JBR-3941 Make apple.awt.captureNextAppWinKey default to false
(cherry picked from commit ea29fc8942)
2026-01-20 01:02:57 +01:00
Vitaly Provodin
aaecf1c395 JBR-4912 jb/java/api/frontend/CustomTitleBarDoubleClick.java intermittently throws java.awt.AWTError
(cherry picked from commit ff7ca451fe)
2026-01-20 01:02:57 +01:00
Maxim Kartashev
d2900c62b4 exclude java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java due to JBR-4880 on windows
(cherry picked from commit 2d98733ab5)
2026-01-20 01:02:57 +01:00
Alexey Ushakov
8a2195ea60 JBR-4710 macOS: SIGSEGV at sun.java2d.metal.MTLLayer.blitTexture
Added check for disposed texture in the MTLLayer

(cherry picked from commit c27d8a7c5e)
2026-01-20 01:02:57 +01:00
Nikita Gubarkov
34cfd730d2 JBR-4890 Fix variation selectors font fallback on macOS
If font for a given variation selector not found, try without variation selector

(cherry picked from commit 7505b502d7)
2026-01-20 01:02:57 +01:00
Artem Bochkarev
25b7845a67 JBR-4907 remove custom view for osx system menu items
Just revert "JBR-3131: support custom view for system menu items"

(cherry picked from commit 548345c202)
2026-01-20 01:02:57 +01:00
Vitaly Provodin
bf027e8db5 exclude java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java due to JBR-4905 on windows&linux
(cherry picked from commit 8150b0e5e7)
2026-01-20 01:02:57 +01:00
Alexey Ushakov
8b83c52a38 JBR-4897 Reconnecting multiscreen monitor displays blank IDE
Handled NSWindowDidChangeScreenNotification, resolved race condition in window peer displayChanged listener

(cherry picked from commit 1e697c8623)
2026-01-20 01:02:57 +01:00
Vitaly Provodin
b90b347dcb exclude jb/java/jcef/HandleJSQueryTest3314.sh due to JBR-4866 on linux
(cherry picked from commit d619e3320a)
2026-01-20 01:02:57 +01:00
Vitaly Provodin
c32aee66ba exclude some tests due to JBR-4880 on windows
(cherry picked from commit 1a9fb2cfa2)
2026-01-20 01:02:56 +01:00
Vitaly Provodin
b4cd95e0c7 exclude javax/swing/JInternalFrame/8020708/bug8020708.java due to JBR-4879 on windows
(cherry picked from commit 85ba459fae)
2026-01-20 01:02:56 +01:00
Vitaly Provodin
5b0d12c891 exclude java/awt tests which do not close child processes/windows
(cherry picked from commit 3cf2b36323)
2026-01-20 01:02:56 +01:00
Vitaly Provodin
64081300c0 exclude java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java and java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 7188711 on linux-all
j

(cherry picked from commit 0b3f6caedd)
2026-01-20 01:02:56 +01:00
Maxim Kartashev
7378341a56 JBR-4877 WARNING: JNI local refs: 33, exceeds capacity: 32
(cherry picked from commit a10770c49d)
2026-01-20 01:02:56 +01:00
Artem Bochkarev
e0b0849cb7 JBR-4876 remove test duplicates
Since next jcef tests were moved into junit suite (inside jcef repository):
 HandleJSQueryTest
 JCEFStartupTest
 LoadPageWithoutUI
 MouseEventAfterHideAndShowBrowserTest
 MouseEventScenario
 MouseEventTest

(cherry picked from commit bd1d06d0bc)
2026-01-20 01:02:56 +01:00
Vitaly Provodin
2758a0d433 JBR-4875 jb/javax/swing/JComboBox/ComboBoxTransparentTittleBarTest.java checks dragging JFrame with Combobox
(cherry picked from commit 8d5472c900)
2026-01-20 01:02:56 +01:00
Dmitry Batrak
083056e22f JBR-4871 Closed project leaked via KeyboardFocusManager#newFocusOwner
(cherry picked from commit 50c0ce58d3)
(cherry picked from commit 46a0f0d75b)
2026-01-20 01:02:56 +01:00
Maxim Kartashev
de36e4526c JBR-4839 Report if wrong shared library is detected at run time
(cherry picked from commit e8c1913562)
2026-01-20 01:02:56 +01:00
Maxim Kartashev
6da7d93656 JBR-4848 Cannot invoke "javax.swing.JTextField.getCaret()" because the return value of "java.lang.ref.WeakReference.get()" is null
(cherry picked from commit 7fae4cd2d1)
2026-01-20 01:02:56 +01:00
Alexey Ushakov
44a39df555 JBR-4590 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Invalidate glyph cache cell info after switching MTLContext

(cherry picked from commit 664528713e)
2026-01-20 01:02:56 +01:00
Nikita Gubarkov
cb1647e244 JBR-4815 force hinting for non-antialiased text
(cherry picked from commit 6c3517ae9d)
2026-01-20 01:02:56 +01:00
Maxim Kartashev
6256e0a014 jb/branchdiff.py script to help with release branches
(cherry picked from commit a03f10e9b7)
2026-01-20 01:02:55 +01:00
Nikita Gubarkov
4aadf604ab JBR-3677 check AppleActionOnDoubleClick property for custom window decorations on macOS
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit d71c4b3950)
2026-01-20 01:02:55 +01:00
Alexander Lobas
20f5300d1d JBR-4787 Rounded corners for native windows
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b4dd9e1ce)
2026-01-20 01:02:55 +01:00
Vitaly Provodin
6a507101a8 updated JTreg exclude list
(cherry picked from commit 03fba5ebf2)
2026-01-20 01:02:55 +01:00
Alexey Ushakov
afc1fd1287 JBR-4696 macOS: NPE in -[AWTView viewDidChangeBackingProperties]
Added null pointer checks

(cherry picked from commit b0374bdccf)
2026-01-20 01:02:55 +01:00
MonoBot
306cc375ba JBR-4809 Update the bundled JetBrains Mono font version
Fonts release 2.242

(cherry picked from commit 641424a3e3)
(cherry picked from commit ab5066f90f)
2026-01-20 01:02:55 +01:00
Alexey Ushakov
7d1adb349a JBR-4680 idea window flickers while changing the screen brightness
Update insets in separate notification

(cherry picked from commit e7936d9958)
2026-01-20 01:02:55 +01:00
Maxim Kartashev
331214beab JBR-4562 JBR-4610 Generate hs_err file on SIGABRT
Supported on Linux and MacOS only.
Controlled by -Djbr.catch.SIGABRT=true option; off by default.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 987ce225b9)
2026-01-20 01:02:55 +01:00
Maxim Kartashev
cdb9897d8b JBR-4626 MacOS aarch64: SIGSEGV at RenderCache.get / ScaledBlit.getFromCache
Avoid C2-compiled loop crashes by replacing the handcrafted MRU cache
with a more modern LinkedHashMap-based one.

(cherry picked from commit 2f63acf3eb)
2026-01-20 01:02:55 +01:00
Nikita Gubarkov
136a27d5c6 Allow registering multiple implementations for JBR API services
This greatly reduces boilerplate when dealing with platform-specific code, one can specify multiple target implementation classes, one per platform. First found will be used.

Also added JBRApi.ServiceNotAvailableException to give services ability to validate any custom condition they want.

(cherry picked from commit 02cf2548d5)
2026-01-20 01:02:55 +01:00
Denis Fokin
c9b1697b04 JBR-4788 "Activate window by mouse hover" Windows option isn't supported by JBR 17
backport JBR-1991 (Focus problems in Windows with X-Mouse style focus) from JBR 11

(cherry picked from commit c8ad353f45)
(cherry picked from commit a52ed88377)
(cherry picked from commit 37c6d0b417)
2026-01-20 01:02:55 +01:00
Alexey Ushakov
bbe36ce727 JBR-4784 Extra allocations of MTLRenderPipelineDescriptor affects performance in metal pipeline
Remove extra allocations

(cherry picked from commit e1fe3a3807)
2026-01-20 01:02:54 +01:00
Alexey Ushakov
92d2483a14 JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Guarded against multiple displayChanged() notifications

(cherry picked from commit 165c9aa3aa)
2026-01-20 01:02:54 +01:00
Dmitry Batrak
bd7002dab1 JBR-4782 Synergy keyboard/mouse input: window disabled after bringing IntelliJ into focus
(cherry picked from commit f863a14b19)
(cherry picked from commit 34ec3053ab)
2026-01-20 01:02:54 +01:00
Alexey Ushakov
8cf808ad29 JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Do not use hinting for generating outlines

(cherry picked from commit 7bb3a76942)
2026-01-20 01:02:54 +01:00
Alexey Ushakov
619cfeb0e3 JBR-3100 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.LWComponentPeer.windowToLocal
Added null check

(cherry picked from commit 0c23ef45ba)
2026-01-20 01:02:54 +01:00
Alexey Ushakov
f652a4a03f JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Added null check

(cherry picked from commit 73f025e9e5)
2026-01-20 01:02:54 +01:00
Alexey Ushakov
da685b4d58 JBR-3102 Exception in NSApplicationAWT: Invalid parameter not satisfying: !isnan(newOrigin.y)
Handled NAN values with some defaults

(cherry picked from commit f1aed3db71)
2026-01-20 01:02:54 +01:00
Vladislav Rassokhin
125d5d6cef JBR-4263 Improve check_jbr_size.sh
* Fix shellcheck inspections
* Don't silently fail if TOKEN is incorrect

(cherry picked from commit e0ab03ce52)
2026-01-20 01:02:54 +01:00
Maxim Kartashev
9d37d3ad99 JBR API v0.0.4
JBR-4746 Added jetbrains.api.verifyBytecode VM option for generated bytecode verification

JBR-4753 Added JBR API for custom desktop actions

Added jetbrains.api.verbose system property for easier JBR API troubleshooting

Also fixed dependency scanning optimization by allowing search in known proxy interfaces outside com.jetbrains

JBR-3511 Way to customize implementation of java.awt.Desktop.browse()

Provided Desktop.setDesktopActionsHandler() and DesktopActionsHandler
interface, which methods will be invoked instead of the standard actions
provided that DesktopActionsHandler.isSupported() is true for the
corresponding action.

(cherry picked from commit 92b84906df)
2026-01-20 01:02:54 +01:00
Maxim Kartashev
690427bcac JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
After CPlatformComponent.setBounds() was changed to allow for platformWindow.getPeer() == null, a few exceptions appeared that suggest platformWindow can also be null. This commit safeguards against this situation as well.

It seems that this can only be the case if the instance is created from outside of JDK, so Objects.requireNonNull() may help to catch the perpetrator.

(cherry picked from commit 5da08dcd3a)
2026-01-20 01:02:54 +01:00
Dmitry Batrak
9967b98391 JBR-4720 Focus state is broken after certain operations when VoiceOver is enabled
(cherry picked from commit dc1b49b5a6)
(cherry picked from commit 51df5fbf67)
2026-01-20 01:02:54 +01:00
Dmitry Batrak
e1d4db6686 JBR-4673 Focus moves to another application on file dialog closing
(cherry picked from commit 7468974488)
(cherry picked from commit 72a74312b7)
2026-01-20 01:02:54 +01:00
Nikita Gubarkov
24e6694ad8 JBR-2523 JBR-2917 Fix emoji, ZWJ and font fallback
Implement rendering of colored outlines and bitmap glyphs in OutlineTextRenderer
Add Segoe UI Emoji to font fallback on Windows
Require layout for some emoji-related unicodes
Fix variation selectors and ZWJ

(cherry picked from commit 53059331b1)
2026-01-20 01:02:53 +01:00
Alexey Ushakov
cba74b4368 JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Returning devanagari subset back for ja.UTF-8 to get non-null font name from WFontConfiguration.getTextComponentFontName(). It is a regression from JDK-8208179.

(cherry picked from commit b51254a975)
(cherry picked from commit 0588b3a885)
2026-01-20 01:02:53 +01:00
Dmitry Batrak
2b65f4ad71 JBR-1987 Korean/Thai characters not printed properly in annotation tooltip (e.g. spellchecker)
This changes the fonts JDK uses for font fallback on Windows. These used to be DokChampa (for Thai) and Batang/Gulim/Gulim (for Korean).
Those fonts are not available by default on Windows 10, user needs to install supplementary font language packs to get them.
Now the following fonts will be used - Tahoma (for Thai) and Malgun Gothic (for Korean). They are available by default
on Windows 7, 8 and 10.

port from JBR 11 to JBR 15 (cherry picked from commit 850653192b)

cherry picked from commit 2bf43a57ab

Kept only Thai-related changes - Korean-related issues are now fixed in OpenJDK as per JDK-8190907

(cherry picked from commit 56139b5800)
2026-01-20 01:02:53 +01:00
artem.bochkarev
f3729e929f JBR-4581 JCEF tests fail due to compilation errors
The problem was in commit "JBR-4512 windows: include pdb-files into jbrsdk": rsync can replace file lib/modules.
rsync is replaced with cp

(cherry picked from commit 6cd310aaa8)
2026-01-20 01:02:53 +01:00
Vitaly Provodin
da010d7831 exclude sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java on linux-all due to 8252812
(cherry picked from commit 336230c628)
2026-01-20 01:02:53 +01:00
Vitaly Provodin
a35132409c exclude sanity/client/SwingSet/src/ColorChooserDemoTest.java on windows-all due to 8278582
(cherry picked from commit 07e8b19419)
2026-01-20 01:02:53 +01:00
Alexey Ushakov
f910e7593b JBR-4636 Some JWindow tests failed due to wrong scaling
Take into account custom scale via sun.java2d.uiScale

(cherry picked from commit 5a91de055f)
2026-01-20 01:02:53 +01:00
Nikita Gubarkov
d3c628c4f6 8289189: Fix ./configure on WSL1
(cherry picked from commit 617ed45c5c)
2026-01-20 01:02:53 +01:00
Alexey Ushakov
02f0d0a448 JBR-4619 Window content scale wrong after disconnecting external display / waking OS from sleep
Use viewDidChangeBackingProperties notification to adjust a window layer scale

(cherry picked from commit abb34d2295)
2026-01-20 01:02:53 +01:00
Vitaly Provodin
763039f8c9 exclude vmTestbase/vm/jit/LongTransitions due to 8271615 on macOS
(cherry picked from commit 66e8a68de9)
2026-01-20 01:02:53 +01:00
Maxim Kartashev
1ef98f5477 JBR-4602 Unexpected NoSuchFileException running Rider test
This reverts commits for JBR-3680, JBR-4118, and JBR-4485.

(cherry picked from commit 5a165aa533)
2026-01-20 01:02:53 +01:00
Nikita Gubarkov
edd855a6a2 JBR-4373 Add mapping for .NewYork-* and .SFArabic-* system fonts
(cherry picked from commit e34f1abedc)
2026-01-20 01:02:52 +01:00
Alexander Lobas
38143c40b9 JBR-4563 Rounded corners for native Window on Mac OS (#156)
* JBR-4563 Rounded corners for native Window on Mac OS

(cherry picked from commit 740a086a00)
2026-01-20 01:02:52 +01:00
Alexander Lobas
bfc752a003 JBR-4563 Rounded corners for native Window on Mac OS
(cherry picked from commit 4aecaafa7c)
2026-01-20 01:02:52 +01:00
Alexander Lobas
5c0e46cb98 JBR-4305 (#119)
* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

(cherry picked from commit e91239081a)
2026-01-20 01:02:52 +01:00
Alexey Ushakov
09c3eeeecd JBR-4591 macOS: SIGILL at [libsystem_kernel] __kill in -[__NSMallocBlock__ removeFromSuperview]: unrecognized selector sent to instance
Verified if windowDragView is present

(cherry picked from commit c45d897c4b)
2026-01-20 01:02:52 +01:00
Artem Bochkarev
5b63730507 JBR-4475: fixed browsers numeration in test
theoretically it can cause 2 requests with the same query_id: "cef_query_2" (when first browser finishes loading after the creation of second one)

(cherry picked from commit e95de19533)
2026-01-20 01:02:52 +01:00
Artem Bochkarev
bf3133ab3c JBR-4456: fixed HandleJSQueryTest
first invocation of dispatch(WindowEvent.WINDOW_CLOSING) calls System.exit() internally (because of setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE))

(cherry picked from commit 0f9afa7fbc)
2026-01-20 01:02:52 +01:00
Vitaly Provodin
361ad14427 exclude javax/swing/JToolBar/4529206/bug4529206.java due to 8288707 on linux
(cherry picked from commit 8bc1905696)
2026-01-20 01:02:52 +01:00
Maxim Kartashev
4ea00c3200 JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
CWarningWindow doesn't have a peer, so accomodated for that in
CPlatformComponent.setBounds().

(cherry picked from commit f098902457)
2026-01-20 01:02:52 +01:00
Maxim Kartashev
ae72f5d00a JBR-4485 Windows: EXCEPTION_ACCESS_VIOLATION at sun.nio.fs.WindowsDirectoryStream$WindowsDirectoryIterator.readNextEntry
As a precaution, range-check the offset returned by WinAPI before
using it to read raw memory with Unsafe.

(cherry picked from commit cfc743741a)
2026-01-20 01:02:52 +01:00
Vitaly Provodin
8c6f5841f3 JBR-4570 improve synchronization and increase waiting time
(cherry picked from commit d7b11a1925)
2026-01-20 01:02:52 +01:00
Dmitry Batrak
25357b6b9c JBR-4552 Windows revert back after initial move/resize in Cygwin/X
(cherry picked from commit 6dc194e089)
(cherry picked from commit 9c2eccb07c)
2026-01-20 01:02:52 +01:00
Manuel Unterhofer
8f5df18a06 FL-11598 Fix accidental reset of window configuration for custom decoration on macOS
This also aligns the handling of the style mask with how the other settings are applied: It uses a client property now. This property is now also applied directly on peer initialization so that there is no need to re-apply, and the window directly appears in the correct configuration.

(cherry picked from commit 4f254fac9d)
2026-01-20 01:02:51 +01:00
Nikita Provotorov
53d8a4e0f5 JBR-4394, IDEA-246833: refactoring and blocking the fix of JBR-1573 to recreate IMs and ICs during preediting.
(cherry picked from commits 7a36587db8d3d5a63c5691243cd5bf56733c06e6, 321a4a3f83)

(cherry picked from commit be5f54fc99)
2026-01-20 01:02:51 +01:00
Nikita Provotorov
a975870a2f JBR-4394, IDEA-246833: fixup of JBR-2444.
(cherry picked from commit ef262dc8bb)
(cherry picked from commit b026461771)
2026-01-20 01:02:51 +01:00
Dmitry Batrak
9f334b1574 JBR-4537 Popup windows shown for a background window cause app icon to blink in taskbar on KDE
(cherry picked from commit 704ffcc0ee)
2026-01-20 01:02:51 +01:00
Alexey Ushakov
6e7712ad3e JBR-3828 restore details for Java exceptions in crash dumps handled by ObjC
Added exception.toString() to jbr_err_* log

(cherry picked from commit 478bd6cdd7)

Added java stack of the exception to jbr_err_* log

(cherry picked from commit e97f728e93)

Also return the static string "OutOfMemoryError" in case of that
exception has been thrown in order to avoid crashing while reporting an
exception in an out-of-memory situation.

(cherry picked from commit b64f2a86ad)
2026-01-20 01:02:51 +01:00
Vitaly Provodin
cb12959d82 exclude jb/java/awt/Window/ZOrderOnModalDialogActivation.java from S2 runs on Windows and Linux
(cherry picked from commit c1cb686198)
2026-01-20 01:02:51 +01:00
Vitaly Provodin
a54b000635 exclude javax/swing/plaf/nimbus/TestNimbusOverride.java on windows due to 8253184
(cherry picked from commit 5c6f2241db)
2026-01-20 01:02:51 +01:00
Vitaly Provodin
6b981d80b6 exclude java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on linux-aarch64 only due to 8266283
(cherry picked from commit cc5f59a5ed)
2026-01-20 01:02:51 +01:00
Artem Bochkarev
a38482b264 JBR-4473: fixed native part of SystemHotkeyReader
(cherry picked from commit 4d96436851)
2026-01-20 01:02:51 +01:00
Dmitry Batrak
b4675b908b JBR-1740 Menu remains open when application loses focus
(cherry picked from commit f987d22cd2)
(cherry picked from commit 4a7913c9e6)
2026-01-20 01:02:51 +01:00
Vitaly Provodin
01ece95c9b exclude Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java from S2 runs due to 8286840
(cherry picked from commit 811db62fec)
2026-01-20 01:02:51 +01:00
Vitaly Provodin
4fded9d9ff exclude java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java due to 8282232
(cherry picked from commit 17d6d1047e)
2026-01-20 01:02:51 +01:00
Maxim Kartashev
1b547d1d34 JBR-4471 Linux: popup appears on wrong screen after desktop scale change
When screen scale changes, the cached screen bounds must be explicitly
updated. Call resetBoundsCache() whenever X11GraphicsDevice.scale has
changed.

(cherry picked from commit 1bb3b2fa32)
2026-01-20 01:02:50 +01:00
Manuel Unterhofer
6e8947828c Merge fullscreen handlers for transparent title bar into existing ones
(cherry picked from commit a992612585)
2026-01-20 01:02:50 +01:00
Manuel Unterhofer
c565f52258 FL-11420 Fix view hierarchy restoration for full-screen mode on macOS
(cherry picked from commit f708ad2c57)
2026-01-20 01:02:50 +01:00
Nikita Gubarkov
2dd7ca4685 JBR-4364 Port macOS native file dialog patches
IDEA-146669 Enable Mac native file dialogs
IDEA-159507 Mac native dialogs: multiple open dialogs are possible
JBR-1784 File dialogs aren't themed on macOS
JBR-1752 Floating windows overlap modal dialogs
JBR-2005: don't set appearance of file chooser if OSX version < 10.14
JBR-4546 Focus is not returned back to IDE after closing "Open" dialog

(cherry picked from commit e5646125e4)
2026-01-20 01:02:50 +01:00
Dmitry Batrak
bc100c8dec JBR-4463 Activating app-modal dialog brings all app windows to front
(cherry picked from commit 2b05925276)

includes fix for JBR-4642 regression: "focus follows mouse" broken for modals, I need to click into them

(cherry picked from commits c55bf03680, ec748f84fb)

includes fix for JBR-4957 regression: "Modal dialog is hidden by sibling popup on Linux"

(cherry picked from commit ea8da3cbe5)

includes fix for JBR-4968: jb/java/awt/Window/ModalDialogAndPopup.java intermittently fails by TimeoutException

(cherry picked from commit 2e9ab0cb06)
(cherry picked from commit 72b9219964)
2026-01-20 01:02:50 +01:00
Maxim Kartashev
918210e37e JBR-4464 Error building latest jbr-dev after JDK-8285730
(cherry picked from commit 8b0ae02f8d)
2026-01-20 01:02:50 +01:00
Maxim Kartashev
204a2d5982 JBR-4118 NIO methods fail on Google Drive's virtual volume
If NtQueryDirectoryFile() failed with STATUS_INVALID_PARAMETER,
try again asking for less information with the FileDirectoryInformation
option as "information class". This option works on a mounted
Google Drive, but it doesn't provide file ids, which speed
up file listing. So it is used only as a fall-back solution.

(cherry picked from commit 82693aa985)
(cherry picked from commit 732a5c9ad6)
2026-01-20 01:02:50 +01:00
Maxim Kartashev
4773aa9e09 JBR-3680 Cherry-pick Google's NIO patches to get faster file listing
Fix regression introduced by Google's NIO patches:
- do not attempt to get the next entry after the directory stream has
been closed already,
- fix FaultyFileSystem that is used in StreamTest.java to throw
the right exception even when getFileAttributeView() is used instead of
readAttributes(),
- removed unnecessary type cast that caused a compilation warning.

Added a test for walking a directory with a non-latin name.

(cherry picked from commit 152a4e886d)
(cherry picked from commit f5638a96b9)
2026-01-20 01:02:50 +01:00
Renaud Paquay
70f05ee063 JBR-3680 Improve performance of WindowsDirectoryStream
Use `NtQueryDirectoryInformation` instead of `FindFirst/FindNext` to
retrieve the list of entries of a directory.

`NtQueryDirectionInformation` has 2 main benefits over
`FindFist`/`FindNext`:

* Performance is about 40% faster

* Each retrieved entry retrieved contains a 64-bit `FileId` in addition
  to the usual attributes, ensuring that returned `java.nio.Path`
  instances hold onto a `BasicFileAttributes` instance that exposes a
  non-null `java.nio.file.attribute.BasicFileAttributes.fileKey()`.

This change also requires creating a new WindowsFileKey class, similar
to UnixFileKey class, so that
`java.nio.file.attribute.BasicFileAttributes.fileKey()` can return an
Object instance that can be used to compare files for equality.

With this change, the Windows implementation of Files.walkFileTree is
about 40% faster when the FOLLOW_LINKS option is not used, and about
2.5x faster when the FOLLOW_LINKS option is used.

When the FOLLOW_LINKS option is used, most calls to
`Files.isSameFile`, which is expensive as it requires 2 file I/O
operations, are avoided because the Path entries returned by the
new WindowsDirectoryStream implementation now contain a non-null
BasicFileAttributes.fileKey(). The remaining calls to
`Files.isSameFile` are performed when Files.walkFileTree need
to compare the initial directory with other entries.

Change-Id: Id79d89d477a6d5dcf151c63a9d6072c6f7ef43b2

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 7c2d7541ba)
(cherry picked from commit 7a4078bf29)
2026-01-20 01:02:50 +01:00
Dmitry Batrak
346550bfc5 JBR-1518 JBR 11 does not support chain of popups on Linux
(cherry picked from commit 849356ee01)
(cherry picked from commit b85be77543)
2026-01-20 01:02:50 +01:00
Dmitry Batrak
a9d9f4aca6 JBR-4306 Robot doesn't work as expected in some cases on macOS
(cherry picked from commits 7d69734465, 0f33031484, 3b5ded0d02)

(cherry picked from commit 4557795f2e)
2026-01-20 01:02:50 +01:00
Ryan Osial
1016d52e4d Cache results of font-config pattern search for reuse
(cherry picked from commit 432f637904)
(cherry picked from commit 17bc232f6f)
(cherry picked from commit ee3a5cdda9)
2026-01-20 01:02:50 +01:00
Maxim Kartashev
6661684775 JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The crashes begin with the call to getDefaultConfig() in
createStatusWindow() returning garbage. With 8280468 fixed, there aren't
many reasons left for it to do so; it must be that the argument to the
call (the screen number) is out of range.

This change eliminates the possibilities to get an absolutely incorrect
screen number by checking the return values of several Xlib functions,
which, when fail, will leave their outgoing arguments uninitialized.
This, in turn, can lead to reading some random memory resulting in
equally random screen number that is later being fed to
getDefaultConfig().

Although on modern systems with Xinerama there should really be no
screen other than zero, as the last resort, this number is also
range-checked in getDefaultConfig() itself.

(cherry picked from commit dec75d7601)
2026-01-20 01:02:49 +01:00
Anton Tarasov
0d7855a9ba JBR-4389 [update_1] IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 74c977e942)
2026-01-20 01:02:49 +01:00
Anton Tarasov
383cd0e32f JBR-4389 IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 1288c65208)
2026-01-20 01:02:49 +01:00
Dmitry Batrak
2a96ed6cde remove duplicate bundled JetBrains Mono bold italic font
following JBR-4402

(cherry picked from commit b7e5d3cfcf)
(cherry picked from commit ac765d3d2c)
2026-01-20 01:02:49 +01:00
Dmitry Batrak
8f440d9019 JBR-4402 The wrong text is rendered in editor
(cherry picked from commit 8c1de95991)
2026-01-20 01:02:49 +01:00
Vitaly Provodin
d7429ca1d5 JBR-4297 add a regression test
(cherry picked from commit 8e94fff6aa)
(cherry picked from commit 8eb5ce4b34)
2026-01-20 01:02:49 +01:00
Konstantin Bulenkov
fd121e9bd6 Update JetBrains Mono font to 2.225
(cherry picked from commit 84c7519c7e)
2026-01-20 01:02:49 +01:00
Alexey Ushakov
b3ec83c220 JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Resolved merge artifact after applying IDEA-57233 fix

(cherry picked from commit 0e2c16e0f0)
2026-01-20 01:02:49 +01:00
Alexey Ushakov
38518fe02e JBR-3843 IDE text is misaligned vertically when using Consolas font
Use usWinAscent/usWinDescent for metrics on Windows

(cherry picked from commit 4aed6ab51d)
2026-01-20 01:02:49 +01:00
Alexey Ushakov
3c87538d69 JBR-1110 [JDK11] java/awt/font/Outline/OutlineInvarianceTest.java: Failed for font java.awt.Font[family=Dialog,name=MS Gothic,style=bold,size=30]
Replaced FT_LOAD_NO_HINTING mode for non AA rendering with FT_LOAD_TARGET_LIGHT

(cherry picked from commit 3368768244)
(cherry picked from commit 62b8fd828f)
2026-01-20 01:02:49 +01:00
Alexey Ushakov
510f7f1048 JBR-2000 RM 2019.3.1 font rendering regression, normal text is heavier
Added -Djava2d.font.loadFontConfig=bundled to force loading bundled font.conf

(cherry picked from commit 788e078f64)
(cherry picked from commit 052b5d72a2)
2026-01-20 01:02:49 +01:00
Dmitry Batrak
af5ac74f3b JBR-4346 [Xfce] Windows are moved unexpectedly between workspaces when modal dialog is shown
(cherry picked from commits ad299f1e74, 800220af16)

(cherry picked from commit d0a2903730)
2026-01-20 01:02:48 +01:00
Alexey Ushakov
8c5acbe0d0 JBR-3827 SIGILL at [libsystem_kernel] __kill in Java Exception at -[CDragSource convertData:]
Added check for drag source

(cherry picked from commit a2b6100b57)
2026-01-20 01:02:48 +01:00
Alexey Ushakov
e7fb32b788 JBR-3366 SIGILL at [libsystem_kernel] __kill in NSWindowStyleMaskFullScreen cleared on a window outside of a full screen transition
Wrapped the native exception and added logging

JBR-4882 Unable to exit fullscreen mode after Presentation mode was entered (and exited) on macOS

(cherry picked from commit d57e8b631b)
(cherry picked from commit 5bfbdd28f2)
2026-01-20 01:02:48 +01:00
Alexey Ushakov
e61982ed58 JBR-3365 SIGILL at [libsystem_kernel] __kill in java.lang.RuntimeException: Failed to convert, no screen / primaryScreen
Wrapped the native exception and added logging

(cherry picked from commit 6b8308d149)
2026-01-20 01:02:48 +01:00
Dmitry Batrak
52ea0b966b JBR-3751 Window content isn't rendered with some window managers on Linux
(cherry picked from commit 8d22e4dcb0)

includes fix for JBR-5046 Incorrect initial window's location in Xfce

(cherry picked from commits 234e705134, 02bc54f864)

includes fix for JBR-5458 Exception at dialog closing

(cherry picked from commit acde759572)
(cherry picked from commit c138965be0)
2026-01-20 01:02:48 +01:00
Vitaly Provodin
2465ca0376 JBR-4294 split desktop tests to more groups for Commit testing
(cherry picked from commit e2360b07b9)
2026-01-20 01:02:48 +01:00
Dmitry Batrak
847d1c0b24 JBR-4281 Window losing focus isn't detected in some cases on macOS
(cherry picked from commit 363650bbf4)

with JBR-4638 Regression: Unable to enter emoji in editor via Emoji & Symbols on macOS

(cherry picked from commit 8b9a00915d)

with JBR-4652 With multiple projects open non-fullscreen, right-click on Dock icon to select the project from the context menu doesn't switch to that project

(cherry picked from commit e34677587d)

with JBR-5134 Input methods can't be dynamically disabled on a focused JComponent

(cherry picked from commit 0a3f4b206d)
(cherry picked from commit 0307ccab3b)
2026-01-20 01:02:48 +01:00
greg
89f0a0c8ab macOS: add methods to setup transparent titlebar with custom height (#100)
* macOS: add methods to setup transparent titlebar with custom height

* make windowTransparentTitleBarHeight CPlatfromWindow property

* add windowTransparentTitleBarHeight test

* Prevent mouseUp events on the transparent header on macOS when the window is being dragged

Co-authored-by: Manuel Unterhofer <manuel.unterhofer@jetbrains.com>

Custom macOS window decorations via JBR API

JBR-4460 Fix window drag with custom decorations on macOS

JBR-4553 Add logging to setUpTransparentTitleBar and resetTitleBar

(cherry picked from commit f5552eed4d)
2026-01-20 01:02:48 +01:00
Denis Fokin
88619e79fd JBR-4038 [JBR17] Force Touch events are not supported on macOS
Added missing files and handlers from JBR11

(cherry picked from commit 0a82277650)
2026-01-20 01:02:48 +01:00
Alexey Ushakov
a5e572e039 JBR-3901 jbr-dev compile problem
Added transient keyword

(cherry picked from commit 8bd487eca9)
2026-01-20 01:02:48 +01:00
Alexander Lobas
89af2018c5 JBR-2893 Big Sur: Add support of opening project as tabs IDEA-257932 Big Sur: IDEA hangs after closing a project tab after exiting and entering full screen
Converted JNF to JNIUtilites

(cherry picked from commit f02e31a440)
(cherry-picked from commit a84736ebcc)
(cherry picked from commit e33f506e48)
2026-01-20 01:02:48 +01:00
Dmitry Batrak
dd1b9eefb6 JBR-3676 WINDOW_ACTIVATED/DEACTIVATED events sent to a frame when child window closes on macOS
(cherry-picked from commit 824f9ebec3)

(cherry picked from commit 41b9f9cf1c)
2026-01-20 01:02:48 +01:00
Dmitry Batrak
abe9e17725 JBR-3611, JBR-3633, JBR-3666, JBR-3663, JBR-3671, JBR-3673, JBR-4181, JBR-4186, JBR-4893 Interoperability with macOS desktop spaces
(cherry-picked from commits 43fdd6cd26, 75335543f2, a156c6b9bf, 9fdc75969b, 1dcc612a81, 93588d0738, 94a3885bbe, c040e05703, 67b6cd871f, 9040fd56cd, 6349b86b7f)

(cherry picked from commit 4fb4d51b89)
2026-01-20 01:02:47 +01:00
Dmitry Batrak
0f072b21ed refactor nativeCreateNSWindow call wrapping
as part of JBR-3017

(cherry picked from commit eeef67a335)
(cherry picked from commit 1bb0bf3f82)
2026-01-20 01:02:47 +01:00
Dmitry Batrak
eac4a65998 remove excessive wrapping with AccessController (AWTThreading does it internally now)
as part of JBR-3017

(cherry picked from commit f1dd523ba8)
(cherry picked from commit f2449217c1)
2026-01-20 01:02:47 +01:00
Dmitry Batrak
702719e516 JBR-2971 Log more information about window creation and property changes
(cherry picked from commit 9d86b4d235)
(cherry picked from commit e93eeba9c2)
2026-01-20 01:02:47 +01:00
Dmitry Batrak
7a57950c13 JBR-2533 Popup is not focused on click when switching from another application on macOS
(cherry picked from commits d9ff151211, 67b174dc8c, 72b0add80c, 21af1eba85, 2f1d317d87, 6dd334f9f0, cd863bac0d, 010f6fc951, 25e087d269, parts of 7d5ac56b6c, cd6dd5c3cf, e8bbd8ffdd, abfc3e2e79, 50933cd23e)

with fix for JBR-3640 (java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java: window Open button lost focus when it should not) and JBR-3979 (Focus is not transferred to parent window)

with fix for JBR-5300 Change source code and test files to use GPL license

with fix for JBR-2651 jb/java/awt/Focus/PopupIncomingFocusTest.java intermittently fails by java.util.concurrent.TimeoutException

(cherry picked from commit 56795d5d06)
2026-01-20 01:02:47 +01:00
Nikita Provotorov
1e35eeb5cf JBR-4271: JBR17 and dev built without --with-vendor-name parameter have invalid value of the java.vm.vendor property.
Changes the default JBR's vendor from "Oracle Corporation" to "JetBrains s.r.o.".

(cherry picked from commit 0cb7b4565c)
(cherry picked from commit 62b01f9f56)
2026-01-20 01:02:47 +01:00
Nikita Gubarkov
a4d87c7178 JBR API v0.0.3
JBR-4228 report HTMINBUTTON, HTMAXBUTTON, HTCLOSE, HTMENU, HTCAPTION targets via JBR API & handle corresponding non-client mouse events for windows with custom decoration

(cherry picked from commit cacbbdc041)
2026-01-20 01:02:47 +01:00
Alexey Ushakov
e2450f6d21 JBR-4224 java/awt/image/VolatileImage/GradientPaints.java: Number of mismatches (300000) exceeds limit (54000) with tolerance=5
Updated reg test to handle contentLost event

(cherry picked from commit e6dc0c5b8f)
2026-01-20 01:02:47 +01:00
Vitaly Provodin
dec39bf7da exclude javax/swing/border/TestTitledBorderLeak.java on windows due to 8213531
(cherry picked from commit c32cf1fe07)
2026-01-20 01:02:47 +01:00
Ivan Lopatin
fb2b692460 Scale2: exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8279190 on macosx-all
(cherry picked from commit 58854d5467)
2026-01-20 01:02:47 +01:00
Nikita Provotorov
516e3cc7f6 JBR-3299: The test /jb/sun/awt/macos/NationalLayoutTest/Layout_ABC.java fails on MacOS.
Fixes the Layout_*.java tests by giving them to know the <Ctrl + key> combinations can generate KEY_TYPED event.

(cherry picked from commit eae5198b20)
(cherry picked from commit 072ae64f96)
2026-01-20 01:02:47 +01:00
Vitaly Provodin
32a6078168 exclude java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java on Wayland
sun/security/pkcs11/Signature/TestDSAKeyLength.java                                 8279941 linux-all

(cherry picked from commit ddd0a7409d)
2026-01-20 01:02:47 +01:00
Alexey Ushakov
221bd3cc81 JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Reg test update: replace management api with jfr

(cherry picked from commit 5a0d365094)
2026-01-20 01:02:46 +01:00
Nikita Provotorov
ccb2eed3dc JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
This commit reverts the fix of JDK-8041928 and disables its regression tests.

(cherry picked from commit ba5209ec06)
(cherry picked from commit 19b7745ce3)
2026-01-20 01:02:46 +01:00
Nikita Provotorov
ee597e9113 JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
Renames the test AltGrMustGenerateAltGrModifierTest3838.java to AltGrMustGenerateAltGrModifierTest4207.java.

(cherry picked from commit ed60a9c2bd)
(cherry picked from commit cbacbf6d4e)
2026-01-20 01:02:46 +01:00
Vitaly Provodin
2bd582b645 exclude sun/security/pkcs11/Signature/TestDSAKeyLength.java on Ubuntu 21.04 due to 8279941
(cherry picked from commit c3d8e648a6)
2026-01-20 01:02:46 +01:00
Anton Tarasov
0ff6840558 JBR-4204 provide an option to disable a11y support on macOS
(cherry picked from commit ee3c56abdc)
(cherry picked from commit e2419baf87)
2026-01-20 01:02:46 +01:00
Vitaly Provodin
17e71877d6 exclude two swing tests on Windows due to JBR-4197
(cherry picked from commit 3a99f6b99d)
2026-01-20 01:02:46 +01:00
Alexey Ushakov
e99a7ad41a JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Removed double allocation of surface data

(cherry picked from commit 041285b65c)
2026-01-20 01:02:46 +01:00
Alexey Ushakov
3d1f9ebe07 JBR-4187 java/awt/GraphicsDevice/DisplayModes/UnknownRefrshRateTest.java.UnknownRefrshRateTest fails on mac
Constrained display modes count used by the test

(cherry picked from commit d757e23958)
2026-01-20 01:02:46 +01:00
Alexey Ushakov
1f9c5d463a JBR-4177 libc++abi: terminating with uncaught exception of type NSException
Added check for AppContext

(cherry picked from commit 54c83d2ef6)
2026-01-20 01:02:46 +01:00
Alexey Ushakov
7126b61ccc JBR-4174 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java fails on mac aarch64
Hide cursor to fix OGL&Metal Robot issue (it reads cursor image). Added tolerance to fix Metal Robot inaccuracy.

(cherry picked from commit a66693cc92)
2026-01-20 01:02:46 +01:00
Artem Semenov
ba9be126c2 JBR-4167 [JCK] AccassibleJTree tests fail on Ubuntu
(cherry picked from commit 40e8687667)
2026-01-20 01:02:46 +01:00
Alexey Ushakov
fa55ad040b JBR-4164 IDEs cannot be launched via launch configuration
Moved execution of displayChanged() to EDT

(cherry picked from commit b6f91a9c10)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
ca51a9c0da JBR-4169 add jdk.javadoc into JBR
(cherry picked from commit 861742faf1)
2026-01-20 01:02:45 +01:00
Alexey Ushakov
93c3abfea7 JBR-4150 IDE regularly locks up at sun.lwawt.macosx.LWCToolkit.getScreenInsets
Restored caching screen insets. Added handling of dock resize.

(cherry picked from commit e3d7c52e93)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
813068c0d5 exclude java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java on Wayland configs due to 8279256
(cherry picked from commit 9d17b66630)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
2ee50c2c79 exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java on Scale2 configs due to 8279190
(cherry picked from commit 0949bd7a8a)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
30c9e51d69 exclude java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 827361
(cherry picked from commit b98807e58f)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
bb85db47c2 add exclude list for Wayland failures
(cherry picked from commit 2b7bdfe3d5)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
92de310f93 exclude javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation /JComboBoxPopupLocation.java on macOS due to 8194945
(cherry picked from commit 86f21becde)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
58b7a73e3f exclude sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java on windows due to 8144029
(cherry picked from commit f3f6365d05)
2026-01-20 01:02:45 +01:00
Maxim Kartashev
f70f7e155b JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The problem: the crashes occur in createStatusWindow() when calls like
adata->AwtColorMatch() end up going to 0x0 pc or some random inaccessible
memory. The only reason for that seems to be the
getDefaultConfig(screen) returning either NULL or garbage. That, in turn, probably
happens because of the wrong screen number provided. Before JBR-3623 was
fixed, awt_numScreens could've changed between the time the screen
number was chosen and the getDefaultConfig() call. After JBR-3623 was
fixed, this change is protected with the AWT lock, which this code
holds.
The fix: obtain the screen number via the Xlib API rather than the
ad-hoc loop though the root windows and return NULL if
getDefaultConfig() doesn't return useable data.

(cherry picked from commit 3d23e8d6a5)
(cherry picked from commit 924f5bab8a)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
4a445eddfe add exclude list for Scale2 test runs
(cherry picked from commit 45ddfe3353)
2026-01-20 01:02:45 +01:00
Vitaly Provodin
2ef559a643 exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8134231
(cherry picked from commit defd9f66a7)
2026-01-20 01:02:45 +01:00
Alexey Ushakov
d98038faa6 JBR-3773 M1 java/awt/Window/WindowAppearanceTest/WindowAppearanceTest.java: : Incorrect color java.awt.Color[r=75,g=74,b=72]at (140,5)
Added more variants of colors for unfocused and focused titles

(cherry picked from commit 93e508a98f)
2026-01-20 01:02:44 +01:00
Artem Semenov
ab27f3d212 JBR-3775 Optimize the algorithm for obtaining tree elements
(cherry picked from commit 01dbe66b3e)
2026-01-20 01:02:44 +01:00
Nikita Gubarkov
65d99a6511 JBR API v0.0.2
Added file dialog customization via JBR API & fixed bugs in windows common item dialog

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45c562e366)
2026-01-20 01:02:44 +01:00
Vitaly Provodin
aff265cce6 JBR-3931 add the module jdk.unsupported.desktop into jbr
(cherry picked from commit 32def2fd42)
(cherry picked from commit d8fd2c9664)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
1f0b039304 JBR-4111 [JBR17] Make possible to select files and directories independently
Implemented apple.awt.fileDialogForFiles property

(cherry picked from commit 67ea24d06e)
2026-01-20 01:02:44 +01:00
Vitaly Provodin
1e5bdc2cf5 enable fixed tests to regular runs
(cherry picked from commit ae87bdb09a)
2026-01-20 01:02:44 +01:00
Vitaly Provodin
c9cb4bfab0 exclude javax/swing tests on mac-aarch64 due to 8277816
(cherry picked from commit a39f9150c3)
2026-01-20 01:02:44 +01:00
Aleksandr Veselov
3d85800a0a JBR-4107 A11y: macOS - wrong frame position if window is not on primary screen
(cherry picked from commit 6006b52f33)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
f2ae7e678b JBR-4060 [JBR17+Metal] Flickering on button's shadow
Removed unnecessary global flag. Optimized mask cache texture clearing code.

(cherry picked from commit 4496acc610)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
97bf3124c4 JBR-3954 Transparent text color rendering (needed for experimental UI)
Performed conversion from ARGB_PRE to ARGB in the grayscale text shader

(cherry picked from commit 8339ec581f)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
3a77022a78 JBR-3872 [JBR17+Metal] Wrong color for scrollbars and inlay hints
Corrected typo in setTxtUniforms and fixed alpha blending in frag_gmc_text shader

(cherry picked from commit 3276a2f8ea)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
7e78aa2203 JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Implemented gamma correction using the same approach that we did for OGL grayscale text rendering (OGLTextRenderer.c)
Optimized shader performance

(cherry picked from commit 5b290231ac)
2026-01-20 01:02:44 +01:00
Alexey Ushakov
94070f4302 JBR-4104 jbr-dev compilation failure
Corrected suppress warnings

(cherry picked from commit 3ff69f1653)
2026-01-20 01:02:43 +01:00
Dmitry Batrak
a783d6fd07 JBR-4084 Default font '. AppleSystemUIFont' does not have bold weight on Chinese characters
(cherry picked from commit 4fde082d53)
(cherry picked from commit dc1806aa60)
2026-01-20 01:02:43 +01:00
Maxim Kartashev
da56ad4bab JBR-3899 SIGSEGV at [libjvm] _ZN23JfrNetworkInterfaceName11on_rotationEv
Prevent JfrNetworkInterfaceName::on_rotation() to dereference a
potentially NULL pointer.

(cherry picked from commit b2a9372d70)
(cherry picked from commit 23ca382acc)
2026-01-20 01:02:43 +01:00
Dmitry Batrak
21d12f01f1 JBR-4021 Unexpected focus event order on window showing
(cherry picked from commit 2a398ebb24)

includes fix for JBR-4131 Popup doesn't get focus if created from context menu

(cherry picked from commit 685562aafc)
(cherry picked from commit bb25c734db)
2026-01-20 01:02:43 +01:00
Maxim Kartashev
7538facacd JBR-3923 Internal Error in c1_Instruction.cpp
Make C1 hotspot compiler bail out during CFG construction if there's a
cycle in the graph that isn't a natural loop and that has led to an
unexpected state of stack/locals like missing a phi function.

This is a temporary measure that lets hotspot continue working
even after encountering such bytecode patterns. The full solution
will probably involve more sophisticated CFG checks.

(cherry picked from commit aa0b61cb75)
(cherry picked from commit f7a8581991)
2026-01-20 01:02:43 +01:00
Vitaly Provodin
f6c0d1f400 exclude tests spontaneously creating windows during test execution
(cherry picked from commit 0dc17f51ed)
2026-01-20 01:02:43 +01:00
Maxim Kartashev
f7ca907191 JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 99e8557c5b)
2026-01-20 01:02:43 +01:00
Alexey Ushakov
1b1d8053d3 JBR-3924 CMD+Tilda does not switch app windows
Introduced vm property to disable capturing of next app window shortcut

(cherry picked from commit 15c52c44ee)
2026-01-20 01:02:43 +01:00
Nikita Gubarkov
14f907818e JBR-2917 Added emoji support for Windows
JBR-3951 Pass real glyph type from native code instead of guessing it by rowBytes & width

(cherry picked from commit 1a7a1db798)
2026-01-20 01:02:43 +01:00
Pavel
5c46952bd9 JBR-3926 make AwtComponent transparent for hit events by default
* JBR-3926 make AwtComponent transparent for hit events by default

* [WIP] pass hittest event to frame only if custom decoration is enabled and frame ready to handle it
(cherry picked from commit c0e26ff5d5)
(cherry picked from commit e7a31e309e)
2026-01-20 01:02:43 +01:00
Maxim Kartashev
a2cfea63d2 JBR-3896 Abysmally slow input and UI performance since upgrade to IU-213.4928.7 from previous 2021.3 EAP version
The slowness was the result of XWM.getInsetsFromExtents() repeated
attempts to acquire frame extents from a property that under Sway is
simply unavailable. Each attempt added at least 20ms to every re-draw.

Prior to (repeatedly) checking for NET_FRAME_EXTENTS property of a
window, check that the property is supported by the window manager.

(cherry picked from commit b40cc1c791)
(cherry picked from commit dc29a24175)
2026-01-20 01:02:43 +01:00
Dmitry Batrak
67baa2c9a2 log LWCToolkit invokeAndWait requests
as part of JBR-3017, to make investigation of similar issues simpler in the future

(cherry-picked from commit a7fd723e43)

(cherry picked from commit d8ca0763a5)
2026-01-20 01:02:42 +01:00
Alexey Ushakov
0d22529a42 JRE-202 Deadlock in CGLGraphicsConfig.getCGLConfigInfo
Added processing system events while waiting for OGLRenderQueue.lock
Moved getCGLConfigInfo logic execution to AppKit thread so, awt lock is
 taken on one thread

(cherry picked from commit d1c8bf03e1bd41cb075aa73cc39558103af7fe1a)
(cherry picked from commit 6bf9f31986be64acf3755b34568802f9960a66ec)
(cherry picked from commit 4e21d67e0369bffac45662c63699b39946218a7a)
(cherry picked from commit 62b62e33cf)
2026-01-20 01:02:42 +01:00
Alexey Ushakov
ddc682ab2b JRE-193 UI freeze and 12/second thread dumps
Moved CStrikeDisposer dispose code to AppKit

(cherry picked from commit 28774d6878)
(cherry picked from commit 7cfc13be5c)
2026-01-20 01:02:42 +01:00
Alexander Lobas
c37bc21ec4 JBR-3660 PhpStorm 2021.2 crashes on selecting iCloud Drive directory in Open dialog
(cherry picked from commit f5434bcaaf)
(cherry picked from commit 58f6991df8)
2026-01-20 01:02:42 +01:00
Alexander Lobas
268a72cc91 JBR-3629 SIGILL at [libsystem_kernel] __kill NPE at com.intellij.openapi.options.SchemeImportUtil$1.isFileSelectable / -[CFileDialog askFilenameFilter:]
(cherry picked from commit 86c13ecaed)
(cherry picked from commit adf18476b9)
2026-01-20 01:02:42 +01:00
Alexander Lobas
1320189dbc JBR-3443 Native file dialog on OSX enable filename filter by VM option
(cherry-picked from commit f10e324538)

(cherry picked from commit 7ad92e4703)
2026-01-20 01:02:42 +01:00
Alexander Lobas
b435bcb5cd JBR-3442 Native file dialog on OSX (for open file) doesn't allow pasting path
(cherry-picked from commit 7d8cc524ca)

(cherry picked from commit 5aca0df07c)
2026-01-20 01:02:42 +01:00
Maxim Kartashev
187d6efbd9 Revert "JBR-2755 IDE UI became slow via remote X Server connection from Windows"
This reverts commit cd9138844da770ae60806fd7dbc1e85c773882a8.

(cherry picked from commit ec6f644c12)
2026-01-20 01:02:42 +01:00
Konstantin Aleev
85a4ddb5f1 fix memory leaks in AccessibleJTree
(cherry picked from commit 561a7b8def)
(cherry picked from commit 6aa0951e7f)
2026-01-20 01:02:42 +01:00
Maxim Kartashev
8c06451f92 JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, make 3
attempts at getting the insets with a small but increasing pause
in between them.

(cherry picked from commit 8134ec069d)
2026-01-20 01:02:42 +01:00
Maxim Kartashev
adc0d994e3 Revert "JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled"
This reverts commit 8e7aed70976ec0f90c736d86b9cd3e9cf09ff6d4.

(cherry picked from commit 502a08cafb)
2026-01-20 01:02:42 +01:00
Nikita Provotorov
339c1b535f JBR-3838 AltGr on Polish keyboard triggers Ctrl+Alt shortcut.
Add regression test.

(cherry picked from commit 8df43eef4b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0763e18e1b)
2026-01-20 01:02:42 +01:00
Maxim Kartashev
639858b3cc JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, add an
artificial delay if getInsets() is called too soon.

(cherry picked from commit d358fcc774)
2026-01-20 01:02:41 +01:00
Alexey Ushakov
28a1da1461 JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Added regression test to compare OGL and Metal text rendering

(cherry picked from commit 1ef2bce278)
2026-01-20 01:02:41 +01:00
Artem Bochkarev
ba72ae5109 JBR-1762: request focus of immediate parent when dispose popup
because requesting focus for frame-parent causes to close whole popup chain

(cherry picked from commit 7a2ccfc521)

JBR-1762: fixed review comments

(cherry picked from commit 0efbe5d9b9)
(cherry picked from commit 614eea4fd3)
2026-01-20 01:02:41 +01:00
Renaud Paquay
dcc14a5c5b Add BasicWithKeyFileAttributeView interface
This new interface is similar to `BasicFileAttributeView` except it
gives implementations a hint that the fileKey() should be acquired
even at some performance cost.

`FileTreeWalker` uses this new interface to request a file key
in addition to regular file attributes so that file equality can
be efficiently performed when checking for loops during file
tree traversal.

This makes `FileTreeWalker` about 2x faster when traversing non
trivial file system trees with the FOLLOW_LINKS option.

Change-Id: I8de047c8fc241dbab9ad57c5e361118a3a94893d

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 6d1c3f06c4)
(cherry picked from commit c5ac3d69ba)
2026-01-20 01:02:41 +01:00
Ivan Migalev
01516d8872 JBR-3785: don't touch the active keyboard layout on input method activation / deactivation.
origin PR: github.com/JetBrains/JetBrainsRuntime/pull/78.

(cherry picked from commit 2f772fd1a2)
(cherry picked from commit c96000f501)
2026-01-20 01:02:41 +01:00
Dmitry Batrak
59f2fd6da3 JBR-3779 Unexpected Alt+Tab behaviour for Java frames on Cinnamon DE
(cherry picked from commit 0bf13985d5)
(cherry picked from commit 3853438e52)
2026-01-20 01:02:41 +01:00
Maxim Kartashev
5f0a6b3d01 JBR-3772 java/beans/PropertyEditor/TestFontClass.java: access denied ("java.util.PropertyPermission" "sun.awt.x11.trace" "read")
Instead of using System.getProperty() directly, wrap the call into
GetPropertyAction and use AccessController to execute it.

(cherry picked from commit 4fefc6244b)
2026-01-20 01:02:41 +01:00
Dmitry Batrak
548550894c JBR-3504 a11y focus is set on the wrong element when opening popups
(cherry-picked from commit a69e12e0d2)

(cherry picked from commit e06081f5ab)
2026-01-20 01:02:41 +01:00
Maxim Kartashev
b67325bccc JBR-3665 Typing is slow in remote X session
Only call XGetKeyboardMapping() once for all valid codes and cache the
resulting table. Use the cache on the subsequent calls to
keycodeToKeysym().

(cherry picked from commit 0ae3056c25)
2026-01-20 01:02:41 +01:00
Maxim Kartashev
a6901264de JBR-2273 JBR musl port
Detect if we're running on a musl-based system by checking for the presence
of the libgcompat.so glibc compatibility library in the process' map.
If so, java is re-started with LD_LIBRARY_PATH set to point to the right
directory with libjvm.so. This works around the problem with the musl
dynamic library loader.

(based on commit 13a904ddb5)

(cherry picked from commit 51b5fe1b0c)
2026-01-20 01:02:41 +01:00
Alexey Ushakov
404dea3159 Added support for otf into the build scripts. Updated prebuild maps.
Applied code from jbr-dev

(cherry picked from commit 9c23814897)
2026-01-20 01:02:41 +01:00
Konstantin Bulenkov
333b7948c4 bundle Inter font
(cherry picked from commit 9f54e5ce48)
2026-01-20 01:02:40 +01:00
Maxim Kartashev
3732cb7f0e JBR-3664 Logging for communications with X server
Introduced logging controlled with -Dsun.awt.x11.trace.
Currently, only looks at the AWT lock and reports methods holding it
sorted by average hold time.

(based on commit 792a58ea0e)
(based on commit 770b4dc9c1)

(cherry picked from commit 1ec3990980)
2026-01-20 01:02:40 +01:00
Dmitry Batrak
a3c419ac32 JBR-3726 Modal windows 'disappear' on minimize in KDE
(cherry picked from commits d9baf2d9db, 9c2841028f, 5c4fd9ceaf, f0ed32fca4)

(cherry picked from commit 21a64a69e4)
2026-01-20 01:02:40 +01:00
Maxim Kartashev
a28fa0ab8b JBR-3542 Fix -Xcheck:jni warnings
Fixes warnings coming from JBR-specific code in addition to those fixed
by 8269223.

(cherry picked from commit b2aa21b742)
2026-01-20 01:02:40 +01:00
Dmitry Batrak
b3231242c4 JBR-3706 Toggling full screen mode for two frames doesn't work on macOS if invoked without delay
(cherry picked from commit 28cfc4815f)
(cherry picked from commit ec4f29297e)
2026-01-20 01:02:40 +01:00
Dmitry Batrak
4424ef8a26 JBR-3686 Background window steals focus when converted to full screen on macOS
(cherry-picked from commit 07a5b9672e)

with fix for JBR-6436 crash in jb/java/awt/Focus/FullScreenFocusStealing.java and jb/java/awt/Window/FullScreenTwoFrames.java

(cherry picked from commit 98b3ac5221)

with fix for JBR-6569 macOS: SIGILL at [libsystem_kernel] __kill in This decoder will only decode classes that adopt NSSecureCoding. Class 'AWTView' does not adopt it.

(cherry picked from commit 7af653070f)
(cherry picked from commit db11bf6776)
2026-01-20 01:02:40 +01:00
Dmitry Batrak
05c66a9625 JBR-3662, JBR-3672 Focus jumps to another project tab after closing modal dialog
(cherry picked from commit bfd01081c3, 2a71dc5981)
(cherry picked from commit 3fc47af69e)
2026-01-20 01:02:40 +01:00
Nikita Gubarkov
d1a34ed5b0 JBR-3648 Replace CacheCellInfo usages with MTLCacheCellInfo in metal rendering code
(cherry picked from commit 7a94f7ea07)
2026-01-20 01:02:40 +01:00
Dmitry Batrak
c727d88d95 JBR-3642 java/awt/Window/8159168/SetShapeTest.java fails on macOS-x64 & macOS-aarch64
make sure jb/java/awt/Focus/Typeahead* tests still pass

includes fixes for JBR-3786 javax/swing/plaf/aqua/CustomComboBoxFocusTest.java fails on MacOS by timeout
(cherry picked from commit f5c5388fb5)

and JBR-4113 java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java fails by time out on macOS

(cherry picked from commit d8d4c55a61)
(cherry picked from commit 9f6fa55673)
2026-01-20 01:02:40 +01:00
Anton Tarasov
d658258ce3 JBR-1834 [linux] runtime hidpi switch is broken
(cherry picked from commit eaa04303a7)
(cherry picked from commit 2df217d6fe)
2026-01-20 01:02:40 +01:00
Anton Tarasov
6eeb25592b JBR-1429 Scale is huge due to GDK_SCALE
(cherry-picked from commit 1c3477df2e)

(cherry picked from commit 3ac8aeea3d)
2026-01-20 01:02:40 +01:00
Anton Tarasov
4475c3bad7 JBR-1365 force IDE-managed HiDPI on Linux for fractional scales
(cherry picked from commit f092ff3962)
(cherry picked from commit ae72b9e01d)
2026-01-20 01:02:40 +01:00
Anton Tarasov
ea3ab93abd Allow HiDPI mode on Linux
(cherry picked from commit e192da4f83)
2026-01-20 01:02:39 +01:00
Anton Tarasov
9856f3b45c JRE-489 -Dswing.bufferPerWindow is fractional scale unfriendly
(cherry picked from commit 67fb7a274c)
2026-01-20 01:02:39 +01:00
Anton Tarasov
b0cb839017 JRE-310 check for Windows8.1 when enabling ui scale
Was "don't fallback on fractional scale" in JBSDK9.

(cherry picked from commit 28dfae88e6)
2026-01-20 01:02:39 +01:00
Vitaly.Provodin
9b12e400d2 add 32-sizes for native data types
(cherry picked from commit 3a79870da8)
(cherry picked from commit 15f6d3290b)
2026-01-20 01:02:39 +01:00
Nikita Gubarkov
8300ea227b Added JBR-specific .idea project files
(cherry picked from commit 6b34834621)
2026-01-20 01:02:39 +01:00
Alexey Ushakov
0beb060f7c JBR-3344 "Exit Full Screen" action doesn't work, the only way is mouse click on window's native "green" button.
Restored JBR-1931 fix partially reverted by JBR-1718

(cherry picked from commit c0be778e20)
(cherry picked from commit dbe6f4490f)
2026-01-20 01:02:39 +01:00
Anton Tarasov
83646a48de JBR-3337 jb/java/jcef/HandleJSQueryTest3314.sh: fails on macOS-aarch64 with "JS Query was not handled in 2nd opened browser"
(cherry picked from commit 8678f41971)
(cherry picked from commit d2260dd67c)
2026-01-20 01:02:39 +01:00
Anton Tarasov
be4d39af65 JBR-3545 Window.setMinimumSize does not respect DPI scaling
(cherry picked from commit 9b4f72ad18)
(cherry picked from commit f3f87f5f27)
2026-01-20 01:02:39 +01:00
Denis Fokin
94a3fe11e6 JRE-408 JBR-3515 fix NullPointerException in MetalRootPaneUI.installWindowListeners
(cherry picked from commit 584d554af529cff445b0f09bc2d57be55e138b7a)
(cherry picked from commit 6a42bb54bd)
(cherry picked from commit 1bf4975a43)
2026-01-20 01:02:39 +01:00
Elena Sayapina
a654a64eb6 JBR-2657 [TESTBUG] ChainOfPopupsFocusTest misbehaving on Windows
- changed open popup shortcut from Ctrl+N to Ctrl+M, so no new explorer windows appear if desktop gets focused by error
- added a click on the main test frame, so it gets focus when running from background cygwin process on Windows, otherwise it just flashes on the taskbar

(cherry picked from commit eda8e4d50e)
(cherry picked from commit 1c729008ce)
2026-01-20 01:02:39 +01:00
Denis Konoplev
ae8c8e54e9 EA-252361: Check window for null
(cherry picked from commit 23a7dbd486)
(cherry picked from commit aa4d6f14dc)
2026-01-20 01:02:39 +01:00
Artem Bochkarev
5cf4a6ee30 JBR-3131: support custom view for system menu items
(cherry picked from commit 78d509ac0f)
(cherry picked from commit ca05fefb28)
2026-01-20 01:02:39 +01:00
Artem Bochkarev
338d693ac7 JBR-3127: set NSWindowAllowsImplicitFullScreen=NO
fixed JBR-3127 Modal dialogs invoked from modal or floating dialogs are opened in full screen

(cherry picked from commit 0b8ff1a7e6)

JBR-3127: add possibility to load NSJavaVirtualMachine

JavaVM framework is deprecated but this class is still checked by AppKit, see https://youtrack.jetbrains.com/issue/JBR-3127#focus=Comments-27-4684465.0-0

(cherry picked from commit be6a2c4f0c)
(cherry picked from commit d690d68315)
2026-01-20 01:02:38 +01:00
Nikita Gubarkov
981f724f83 JBR-3376 Added check for -1 glyph info pointer in OGLTextRenderer.c
(cherry picked from commit 40ea728335)
2026-01-20 01:02:38 +01:00
Dmitry Batrak
c2368d222a JBR-3024 Popups are shown with 1x1 size sometimes
test case only

(cherry picked part of commit ee298f5287)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b7d165e486)
2026-01-20 01:02:38 +01:00
Vitaly Provodin
d4cc0f36aa JBR-3314 add regression test
(cherry picked from commit c81adfed61)
(cherry picked from commit e4c3db3a2c)
2026-01-20 01:02:38 +01:00
Ivan Migalev
8f410e9d48 JBR-3227 Reload type of required native file dialogs each time a file dialog is requested
(cherry picked from commit 26dd87ab7c)
(cherry picked from commit 847d757a76)
2026-01-20 01:02:38 +01:00
Ivan Migalev
aeb7b8a054 JBR-3068 Update path selector behavior when sun.awt.windows.useCommonItemDialog is enabled
(cherry picked from commit 442bb7eecc)
(cherry picked from commit 6177142c3a)
2026-01-20 01:02:38 +01:00
Alexey Ushakov
77dcc0590c JBR-2996 M1 warnings: CoreText note: Client requested name “.SFCompact-Black”, it will get Times-Roman rather than the intended font
Cached system fonts family names

(cherry picked from commit 56629e4c90)
(cherry picked from commit 998e7b685a)
2026-01-20 01:02:38 +01:00
Alexey Ushakov
f3be53e681 JBR-3023 Gray idea frame after project open with ide.mac.transparentTitleBarAppearance.
Initiate move/resize event on first appearance of window having FULL_WINDOW_CONTENT property set

(cherry picked from commit a6ea081ba2)
(cherry picked from commit dd6877af04)
2026-01-20 01:02:38 +01:00
Dmitry Batrak
c3ff1bf996 JBR-3017 Focus issue in presence of third-party accessibility tool
use the new invocation approach for 'makeKeyAndOrderFront' as well, as it can also cause synchronous back-calls to accessibility subsystem, and change the global call order unexpectedly

this commit fixes TypeaheadSetVisibleTest and TypeaheadToFrontTest, when they are run with AltTab active

Guard against possible deadlocks, if UI-related methods are invoked not on EDT.
Sample deadlock scenario:
* Application thread attempts to show the window, this involves calling CWrapper.NSWindow.makeKeyAndOrderFront under AWT tree lock, which blocks till 'makeKeyAndOrderFront' completes on AppKit thread
* AppKit thread, while executing 'makeKeyAndOrderFront' performs 'back-call' to CAccessibility.getFocusOwner, which waits for execution on EDT
* EDT performs some activity requiring AWT tree lock (e.g. processing of PaintEvent)

(cherry picked from commits e3aaff5db4, 09941119e1)

(cherry picked from commit 513767dce6)
2026-01-20 01:02:38 +01:00
Dmitry Batrak
a78de6b61d JBR-3072 Deadlock on nested dialog hiding
(cherry picked from commits 99242748ee, ad1595b5c2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9eacb21298)
2026-01-20 01:02:38 +01:00
Dmitry Batrak
e83cad8a8b fix occasional freezes of JBR-3017 reproducer after the fix
(cherry picked from commit 7e6db54f77)
(cherry picked from commit 2b7f78f50e)
2026-01-20 01:02:38 +01:00
Dmitry Batrak
a0e22ad1e1 JBR-2819 Create API to determine typographic family/subfamily for available fonts
(cherry picked from commit 89e519a4ef)
(cherry picked from commit 21129ca270)
2026-01-20 01:02:38 +01:00
Nikita Gubarkov
5867044abd JBR-2924 Do not try to create native italic font when we're going to make it fake italic
(cherry picked from commit cf05cb1a19)
2026-01-20 01:02:37 +01:00
Nikita Gubarkov
c31f233864 JBR-3982 Fixed non-antialiased text rendering on macOS
JBR-3269 Disabled subpixel antialiasing for macOS Mojave and newer

(cherry picked from commit e10f69072e)
2026-01-20 01:02:37 +01:00
Dmitry Batrak
f23de3ef0d JBR-3017 Focus issue in presence of third-party accessibility tool
(cherry picked from commit 88ead5d9e3)
(cherry picked from commit 97753f15b6)
2026-01-20 01:02:37 +01:00
Vitaly Provodin
4a8270a263 JBR-1718 add a regression test
(cherry picked from commit 84ff4eab21)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6b02027600)
2026-01-20 01:02:37 +01:00
Elena Sayapina
1f2e66fd9d JBR-2890 [TESTUPDATE] Enable jcef tests on macOS aarch64 platform
(cherry picked from commit 1714d7b627)
(cherry picked from commit 54e74d75d0)
2026-01-20 01:02:37 +01:00
Nikita Gubarkov
f0590ea979 Added JBR API
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 2ce0a876c5)
2026-01-20 01:02:37 +01:00
Artem Bochkarev
2febed4c7e JBR-2562: fixed invokation of parent method
(cherry picked from commit 93cbab2f2d)

JBR-2562: suppress exceptions from [NSWindow _changeJustMain]

temporary workaround to prevent crashes

(cherry picked from commit dd055b5970)
(cherry picked from commit 55eba1d802)
2026-01-20 01:02:37 +01:00
Mikhail Grishchenko
e52d1e4e22 JBR-2890 Disable jcef tests on 32-bit and aarch64 platforms
(cherry picked from commit d34d6528fe)
(cherry picked from commit 793add3ff1)
2026-01-20 01:02:37 +01:00
Alexey Ushakov
f5f31ea09e JBR-2879 Big Sur: Opening project in new window results in opening project in another tab
Disabled Tabbing mode for all NSWindows

(cherry picked from commit 8cb0377a31)
(cherry picked from commit 545eddda9f)
2026-01-20 01:02:37 +01:00
Nikita Gubarkov
5954d4827b JBR-2910 Implemented extended glyph cache for macOS
JBR-3976 Fixed text spacing & emoji scaling on macOS

JBR-3638 Adjust subpixel glyph positions for correct rounding in CStrike#getGlyphImageBounds

(cherry picked from commit 4590e49b61)
2026-01-20 01:02:37 +01:00
Alexey Ushakov
387d19cde0 JBR-2617 Text with opacity renders black
Implemented alpha blending in grayscale text rendering (UX-1320)
Corrected bright text thickness (smooth on), bright and dark text thickness (smooth off)
Added JVM properties for fine tuning

(cherry picked from commit c30306f779)
(cherry picked from commit c95adeb8f2)
(cherry picked from commit 269c9580fb)
(cherry picked from commit 55c7be5fe9)
(cherry picked from commit e28ff71e97)
(cherry picked from commit 6fb9aaf291)
2026-01-20 01:02:37 +01:00
Alexey Ushakov
fe215dabd6 JBR-2521 Ugly font in all 2020.2 EAPs on macOS
Provide gamma correction for both light and dark text

(cherry picked from commit 5953202a7e)
(cherry picked from commit 1b426cc66c)
2026-01-20 01:02:37 +01:00
Alexey Ushakov
e19522068c JBR-2591 Repainting is broken (was: Icons in tree list widgets became dark)
Save current blend mode before cached grayscale rendering

(cherry picked from commit 7beb75ccec)
(cherry picked from commit ed52fde57d)
(cherry picked from commit 1a46cd70af)
2026-01-20 01:02:36 +01:00
Alexey Ushakov
b551b06ab4 JBR-1986 Enabling fractional metrics causes visual artifacts in font rendering on macOS 10.14+
Disable subpixel positioning for macOS 10.13+ if legacy LCD rendering is disabled

(cherry picked from commit dbd24232e4)
(cherry picked from commit 9fbf990e83)
2026-01-20 01:02:36 +01:00
Vitaly Provodin
78ce017461 exclude bug7154030 on macosx-aarch64 due to 8268284
(cherry picked from commit 253f1246e5)
2026-01-20 01:02:36 +01:00
Vitaly Provodin
26feaf3e19 exclude SharedMemoryPixmapsTest on macosx-all due to 8221451
(cherry picked from commit d929111f7a)
2026-01-20 01:02:36 +01:00
Vyacheslav Moklev
d29a5f33b3 JBR-2442 fix memory leak of fileBuffer
fix was suggested by Nikita Gubarkov

(cherry picked from commit a166fb65e1)
2026-01-20 01:02:36 +01:00
Sergey Malenkov
2b916ff861 EA-235126 - CME: HighlightableComponent.getPreferredSize
(cherry picked from commit 523d80cafd)
(cherry picked from commit 31c4452397)
2026-01-20 01:02:36 +01:00
Kirill Kirichenko
0570c26ef0 JBR-2667 Post review: rename win.darkTheme.on to win.lightTheme.on and reversed the logic
(cherry picked from commit eeab5252e6)
(cherry picked from commit b539e1d0de)
2026-01-20 01:02:36 +01:00
Kirill Kirichenko
f1d03344a6 JBR-2667 Add new AWT desktop property for light/dark theme detection on Windows 10
(cherry picked from commit 0e4ad056dd)
(cherry picked from commit e5dfcc4417)
2026-01-20 01:02:36 +01:00
Alexey Ushakov
64c19787ec JBR-2593 Wide ligatures not rendered in Grayscale mode
Added missing flush of cached vertices

(cherry picked from commit ad409b4370)
(cherry picked from commit bf011ac521)
2026-01-20 01:02:36 +01:00
Nikita Gubarkov
a56595a95c JBR-2910 Implemented extended glyph cache for Linux
(cherry picked from commit d488f716e7)
2026-01-20 01:02:36 +01:00
Nikita Gubarkov
39aec58f1e JBR-2910 Implemented extended glyph cache for Windows
(cherry picked from commit 7f75d75933)
2026-01-20 01:02:36 +01:00
Nikita Gubarkov
c4b198e9af JBR-2614 Fixed LCD glyph width to include both left & right padding, so that rowBytes = width * 3
(cherry picked from commit afb52a160d)
2026-01-20 01:02:36 +01:00
Alexey Ushakov
291ab57fe7 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit bd6dae9ddf)
2026-01-20 01:02:35 +01:00
Denis Konoplev
6ea11d5836 JBR-3544: Generate popup invoked instead of New in this directory.
- A fix
- A regression test (cherry picked from commit 7995574c09)

(cherry picked from commit 01915e4224)
2026-01-20 01:02:35 +01:00
Vitaly Provodin
1555024de0 JBR-2545 Clean up the list of ignored Render tests
(cherry picked from commit f7b4c42e1d)
(cherry picked from commit 32b8d67527)
2026-01-20 01:02:35 +01:00
Jayathirth D V
40823a9031 8241490: Add large text performance tests in RenderPerfTest
(cherry picked from commit 803ee2f2b5)
(cherry picked from commit bbe57208d2)
2026-01-20 01:02:35 +01:00
Alexey Ushakov
72de35f92c 8230657: Create fine grained render perf test for metal pipeline
Converted gradle JUnit test to plain java for ant and gnumake

To run the tests:
cd src/demo/share/java2d/RenderPerfTest

ant run
or
java -jar dist/RenderPerfTest.jar
or
java -jar dist/RenderPerfTest.jar testWhiteTextBubblesGray

(cherry picked from commit 356121b18f)
(cherry picked from commit 8bd8d2d132)
(cherry picked from commit 448aad87bc)
2026-01-20 01:02:35 +01:00
Konstantin Bulenkov
21e909c314 Update FiraCode to 5.2
(cherry picked from commit 71e2a8d8ad)
(cherry picked from commit 0582e90d58)
2026-01-20 01:02:35 +01:00
Alexey Ushakov
4e49e95884 JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Reverting gamma correction because of rendering artifacts in the light theme

This reverts commit 5016db51

(cherry picked from commit c1d644a004)
(cherry picked from commit ade5b22a83)
2026-01-20 01:02:35 +01:00
Alexey Ushakov
4c423ab6b4 JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Added gamma correction to match grayscale rendering with subpixel one

(cherry picked from commit 5016db518a)
(cherry picked from commit b15896e838)
2026-01-20 01:02:35 +01:00
Alexey Ushakov
9e500cb919 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit df670fc276)
2026-01-20 01:02:35 +01:00
Anton Tarasov
08dbe473c0 revert: JBR-1434 "New file dialog" popup remains above all windows on switching application
java.awt.peer.WindowPeer.isLightweightDialog() method does not exist.

(cherry picked from commit 7d8aeaf7de)
(cherry picked from commit e233ff9b94)
2026-01-20 01:02:35 +01:00
Anton Tarasov
34de38d18d JBR-2872 improve: JBR-2866 JCEF: Markdown editor steals focus from a different frame
(cherry picked from commit bad748e3d0)
(cherry picked from commit ef2a05eac1)
2026-01-20 01:02:35 +01:00
Anton Tarasov
275a3b555a JBR-2866 JCEF: Markdown editor steals focus from a different frame
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6d852e3252)
2026-01-20 01:02:34 +01:00
Anton Tarasov
67af5780eb JBR-2645 enable CefBrowser.close(true) in jcef reg tests
(cherry picked from commit 492c217125)
(cherry picked from commit 8975bde92c)
2026-01-20 01:02:34 +01:00
Anton Tarasov
eea4c7c84f JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
(cherry picked from commit 57bbddf071)
(cherry picked from commit 94b56fdeb5)
2026-01-20 01:02:34 +01:00
Anton Tarasov
00864ec344 JBR-2557 use com.jetbrains.cef.JCefAppConfig in JCEF tests
(cherry picked from commit e30a309f92)
(cherry picked from commit 441ee96ec5)
2026-01-20 01:02:34 +01:00
Anton Tarasov
4a6ec2053e JBR-2489 Git branch operations (switch to another branch, rebase) sometimes crash WebStorm 202.5428.27
(cherry picked from commit 81d2156fb1)
(cherry picked from commit 01299cb102)
2026-01-20 01:02:34 +01:00
Anton Tarasov
1769e677ff JBR-2282 [jcef] update to JCEF/80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit a5adc725df)
(cherry picked from commit fcf31daa22)
2026-01-20 01:02:34 +01:00
Anton Tarasov
91bdbba2fd JBR-2305 jcef: jb/java/jcef/JCEFStartupTest.java throws java.lang.ExceptionInInitializerError
(cherry picked from commit f0385f01ec)
(cherry picked from commit c7d407e0a6)
2026-01-20 01:02:34 +01:00
Anton Tarasov
ef51f47f32 JBR-2306 jcef: jb/java/jcef/JCEFStartupTest.java unexpectedly exits with the exit code: 0
(cherry picked from commit ff7d7bd43c)
(cherry picked from commit d72901625f)
2026-01-20 01:02:34 +01:00
Anton Tarasov
4607ef09b8 JBR-2299 [mac] jcef requests for "chromium safe storage" keychain access
(cherry picked from commit dd1334a352)
(cherry picked from commit 2ebe5709c0)
2026-01-20 01:02:34 +01:00
Anton Tarasov
91164d2346 JBR-2222 Crash during closing IDE
(cherry picked from commit d0c367b31f)
(cherry picked from commit bf36d7873b)
2026-01-20 01:02:34 +01:00
Anton Tarasov
c8dd19e263 JBR-2287 [jcef] add CefBrowser wrapper to jtreg tests
(cherry picked from commit fa961d1769)
(cherry picked from commit 74ccb86095)
2026-01-20 01:02:34 +01:00
Anton Tarasov
e9aae9dd59 JBR-2169 AWTThreading: remove tracked invocation event from completion listener
(cherry picked from commit a855f3b835)
(cherry picked from commit c54371231c)
2026-01-20 01:02:34 +01:00
Anton Tarasov
38104c682f JBR-2159 Native crash in thread AWT-EventQueue-0 when trying to push commit
(cherry picked from commit bba297b4a4)
(cherry picked from commit 38b9cf19c0)
2026-01-20 01:02:33 +01:00
Anton Tarasov
5c7f1e839c JBR-2148 JCEF: JBR bundle has invalid app structure
(cherry picked from commit f45f84d7ed)
(cherry picked from commit b610a7c4f9)
2026-01-20 01:02:33 +01:00
Anton Tarasov
c5acf94f61 JBR-2146 improve InvokeOnToolkitHelper to cover more generic case
(cherry picked from commit 37db252ad7)
2026-01-20 01:02:33 +01:00
Anton Tarasov
fa2021efae JBR-2139 Idea freeze on dynamic plugin unloading
(cherry picked from commit e57bae4f66)
(cherry picked from commit 647f198b17)
2026-01-20 01:02:33 +01:00
Anton Tarasov
31dfe4918a JBR-2099 jb/java/jcef/JCEFStartupTest.java fails on Windows, Linux
(cherry picked from commit 3dfb0aa16a)
(cherry picked from commit 3750608e62)
2026-01-20 01:02:33 +01:00
Anton Tarasov
8114d18fb7 JBR-2093 create reg test for JCEF startup
(cherry picked from commit e8c2761f5b)
(cherry picked from commit 17cfb8e0d8)
2026-01-20 01:02:33 +01:00
Anton Tarasov
588b4d6765 JBR-2082 Revealing taskbar does not work when "Automatically hide the taskbar"
(cherry picked from commit b31a41fb2f)
(cherry picked from commit d2d4e58c13)
2026-01-20 01:02:33 +01:00
Mikhail Grishchenko
6d1040627f JBR-2639, JBR-2412 [jcef] Tests that checks mouse events
JBR-2412 [windows] mouse listener does not work for jcef

(cherry picked from commit 66ad6472ae)
(cherry picked from commit 04246aac57)
(cherry picked from commit b7cde4fd05)
(cherry picked from commit d325b98b54)
2026-01-20 01:02:33 +01:00
Mikhail Grishchenko
c7ab85ff18 JBR-2639 [win] jcef does not recognize vertical mouse wheel events
added regression test

(cherry picked from commit e8e4741bb0)
(cherry picked from commit 8428d1c853)
2026-01-20 01:02:33 +01:00
Mikhail Grishchenko
db63098536 JBR-2412 [windows] mouse listener does not work for jcef
added regression test

(cherry picked from commit d1479872f2)
(cherry picked from commit 9e5032e328)
2026-01-20 01:02:33 +01:00
Elena Sayapina
f8879cb0e2 JBR-2630 Typing speed in IDE editor was dropped after switching to 11.0.8
Introduced sun.awt.osx.RobotSafeDelayMillis property to control macOS specific safe delay for Robot methods.
50 ms safe delay was initially hardcoded in 3862142d (JDK-8242174: [macos] The NestedModelessDialogTest test make the macOS unstable) which affected performance tests execution.

(cherry picked from commit 5f691bb788)
(cherry picked from commit cfc90ce2c5)
2026-01-20 01:02:33 +01:00
Mikhail Grishchenko
b4fc616645 JBR-2430 [jcef] Added Regression test
Checks that JS Query is handled in 2nd opened browser

(cherry picked from commit 404ff84565)

Refactoring + changed EDT awaiting method

(cherry picked from commit dc24658b31)
(cherry picked from commit f191726147)
2026-01-20 01:02:33 +01:00
Vitaly Provodin
59b94c7de2 exclude the new printer test 8262731
(cherry picked from commit c5ff1e3025)
2026-01-20 01:02:32 +01:00
Alexey Ushakov
c867949e85 JBR-2419 Improve performance of CStrike.getNativeGlyphOutlineBounds
Do not pass the result via java object. Use more straight api.

(cherry picked from commit 9f91fe91f5)
(cherry picked from commit c0fd2daf5c)
(cherry picked from commit 1bfd5ad21c)
2026-01-20 01:02:32 +01:00
Alexey Ushakov
3c0e854ab2 JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions
Used user home dir for jbr_err files. Removed logging with reportException method

(cherry picked from commit 2c8cdb221b)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Used process workdir for jbr_err files. Added one more logging to reportException method

(cherry picked from commit 95a47810d5)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Generate jbr_err_pidXX.log file with detailed stack trace of the exception

(cherry picked from commit 4c42f75021)
(cherry picked from commit 9ed5cac63d)
2026-01-20 01:02:32 +01:00
Artem Bochkarev
5a5cfd628e JBR-2253: unset LD_PRELOAD just after VM loaded
workaround for JBR-2253 Preload libjsig.so to fix JNA crashes

(cherry picked from commit 127a2deddf)
(cherry picked from commit 915f700d26)
2026-01-20 01:02:32 +01:00
Kirill Kirichenko
414c813f32 JBR-1874 Cursor not changing from 'default' to 'text'. Additional fix after reopening.
(cherry picked from commit 5a29d4ade9)
(cherry picked from commit da44860f22)
2026-01-20 01:02:32 +01:00
Elena Sayapina
2b6d7e25ce JBR-2585 [TESTBUG] TouchScreenEvent tests affect tests simulating mouse actions
- added workaround for JBR-2585
- added README.md about manual test run
- made an update to close LinuxTouchScreenDevice properly
- added an error exit from linux shell script if sudo password is empty or chown fails

(cherry picked from commit 4deb3bbe61)
(cherry picked from commit a13b014719)
2026-01-20 01:02:32 +01:00
Elena Sayapina
df0822e6b6 IDEA-165950 [TESTUPDATE] National keyboard layouts support
Update regression test after the following commits:

02fad83c: Remove public constants from KeyEvent
f4227faf: Impossible to assign cmd+ß shortcuts
(cherry picked from commit 264802cf4b)
(cherry picked from commit 679b5d8cd3)
2026-01-20 01:02:32 +01:00
Elena Sayapina
9d2f111215 JBR-2328 [TESTBUG] Regression test java/awt/keyboard/AllKeyCode/AllKeyCode.java is not correct
(cherry picked from commit 861f73c393)
(cherry picked from commit bfab6a9364)
(cherry picked from commit e9fa7a0882)
(cherry picked from commit a199826fae)
2026-01-20 01:02:32 +01:00
Mikhail Grishchenko
f671d6ad8f JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
Added reproducer

(cherry picked from commit e875bf72c9)
(cherry picked from commit 9aa75b7679)
2026-01-20 01:02:32 +01:00
Denis Konoplev
580842c3f2 JBR-2490 Add option to work with Surface Pen
(cherry picked from commit 5acc7680a1)
(cherry picked from commit b604023cef)
2026-01-20 01:02:32 +01:00
Denis Konoplev
d4f33689cc JBR-2669: set unicode for both keyCode and extendedKeyCode
(cherry picked from commit ba3f14c83a)
(cherry picked from commit 544176fbce)
2026-01-20 01:02:32 +01:00
Denis Konoplev
a86888765e JBR-2554: Proper unicode values in KeyEvent.keyCode
(cherry picked from commit 703d77a927)
(cherry picked from commit 63bdac9bbf)
2026-01-20 01:02:32 +01:00
Denis Konoplev
72f4dea902 JBR-215: Remove SystemInfo
(cherry picked from commit 9adf77a512)
(cherry picked from commit 6a6761d365)
2026-01-20 01:02:31 +01:00
Denis Konoplev
6ba871a390 JBR-215: Separate LatinNonAlphaNumKeycodes option
(cherry picked from commit caf366f6f3)
(cherry picked from commit ed143f6d73)
2026-01-20 01:02:31 +01:00
Denis Konoplev
a17a8bba8e JBR-215: Windows non-alphanumeric shortcuts
(cherry picked from commit 4f60efebe2)
(cherry picked from commit b5fd23e498)
2026-01-20 01:02:31 +01:00
Denis Konoplev
775d8c23f3 JBR-2280: Fix regression. Mode compatible with old option.
(cherry picked from commit a3e3c23cb1)
(cherry picked from commit 8c15ab819c)
2026-01-20 01:02:31 +01:00
Denis Fokin
ec2fdd19d1 macOS national keyboard support
(cherry picked from commit 83356eb0bb)
(cherry picked from commit c8a36e1804)
2026-01-20 01:02:31 +01:00
Nikita Gubarkov
c78282554b JBR-6387 Revert "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts"
(cherry picked from commit efd4acd419)
2026-01-20 01:02:31 +01:00
Sergey Malenkov
64838c5f79 JBR-1929 FractionalMetricsSupport
(cherry picked from commit bbdc159762)
(cherry picked from commit 9fad8b07f1)
2026-01-20 01:02:31 +01:00
Mikhail Grishchenko
bcefe4bf18 JBR-2256 JEditorPane with test/html type and zero margins is not shown
Updated reproducer

(cherry picked from commit 529a188b8b)

JBR-2256 JEditorPane with test/html type and zero margins is not shown

Added reproducer

(cherry picked from commit 41578a40b5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 775801a875)
2026-01-20 01:02:31 +01:00
Mikhail Grishchenko
40848939ac JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Added regression test

(cherry picked from commit 4e1f5a43b3)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f7cf514da2)
2026-01-20 01:02:31 +01:00
Mikhail Grishchenko
33a972e987 JBR-1414 [Test] downscale frames to run on low-dpi screens
(cherry picked from commit b46e74fe6f)
(cherry picked from commit 844b3e1d5f)
2026-01-20 01:02:31 +01:00
Elena Sayapina
b82401fe86 JBR-1905 [TESBUG] java/awt/TextArea/DisposeTest/TestDispose.java: frame is not disposed
- java/awt/TextArea/DisposeTest/TestDispose.java, java/awt/TextField/DisposeTest/TestDispose.java: fixed test frame disposal
- java/awt/Frame/DisposeStressTest/DisposeStressTest.java: decreased test timeout from 2h to 10 min, added minor diagnostic logging

(cherry picked from commit 7f025f4e16)
(cherry picked from commit dda7f3d871)
(cherry picked from commit bc09aadadb)
(cherry picked from commit 0905abecf5)
2026-01-20 01:02:31 +01:00
Alexey Ushakov
61f4bdf9b1 JBR-2135 Use CoreText api to select the font with the most recent version
Added a property to force loading bundled fonts: -Djava2d.font.noVersionCheck=true

(cherry picked from commit cbb148dff4)
(cherry picked from commit db7e53e67d)
2026-01-20 01:02:31 +01:00
Alexey Ushakov
eead00e1a5 JBR-2137 JetBrainsMono fonts update to v1.0.3
(cherry picked from commit a6e441828a)
(cherry picked from commit b25c90ba53)
2026-01-20 01:02:30 +01:00
Mikhail Grishchenko
b7d439055c JBR-1414: Added regression test for dnd with HiDPI scaling
(cherry picked from commit 1f4ab12fbb)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ba00bacb9f)
2026-01-20 01:02:30 +01:00
Elena Sayapina
b4addda784 JBR-2041 [TEST] Added new regression test (Touchscreen devices support)
(cherry picked from commit 2d587b3728)
(cherry picked from commit 92606f2c7f)
(cherry picked from commit 05af375909)
(cherry picked from commit 0f895bf1b2)
(cherry picked from commit 08aa0852b7)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9bd62fade9)
2026-01-20 01:02:30 +01:00
Konstantin Bulenkov
17164740c3 Update JetBrains Mono to 1.0.2
(cherry picked from commit 6f4a13e46f)
(cherry picked from commit b14bfd3ac9)
2026-01-20 01:02:30 +01:00
Ivan Migalev
da4b3174c3 Extract the DWM colorization parameters from registry (JBR-2070)
(cherry picked from commit 0330cab60b)
(cherry picked from commit 6525a8b70d)
2026-01-20 01:02:30 +01:00
Ivan Migalev
8cf9f2f8cf Refresh desktop properties on WM_DWMCOLORIZATIONCOLORCHANGED (JBR-2070)
(cherry picked from commit 06086f4a7e)
(cherry picked from commit afd04d7c5b)
2026-01-20 01:02:30 +01:00
Ivan Migalev
7beb33a909 Fix a possible resource leak in ColorizationColorAffectsBorders
(cherry picked from commit 0c911b6ffe)
(cherry picked from commit ffbaf5e1d1)
2026-01-20 01:02:30 +01:00
Elena Sayapina
fea920a2b2 JBR-2086 JetBrainsMono fonts update to v1.0.1
(cherry picked from commit a4b373e631)
(cherry picked from commit 462fef3916)
2026-01-20 01:02:30 +01:00
Konstantin Bulenkov
3c4774f437 JetBrains Mono 1.0
(cherry picked from commit d514f7a982)
(cherry picked from commit 56ee3ef459)
2026-01-20 01:02:30 +01:00
Denis Konoplev
fe28c20cb1 JBR-3444: Return NullSurfaceData when gc == null
(cherry picked from commit 01ad15e61c)
(cherry picked from commit 2a7a828ec8)
2026-01-20 01:02:30 +01:00
Denis Konoplev
4ad6179051 JBR-1995: Last character issue with korean
Fix for JTextComponent

(cherry picked from commit a7c8b0b535)
(cherry picked from commit 48410e5865)
2026-01-20 01:02:30 +01:00
Denis Konoplev
3f90618fce JBR-2891: Post PhaseEvents in the begin and end of Magnify and Rotate
(cherry picked from commit c811c295c2)
(cherry picked from commit fe18b612dc)
2026-01-20 01:02:30 +01:00
Denis Konoplev
7288fa0fb6 JBR-2444: Turn on IM workaround by default
(cherry picked from commit 15c4ce1d3e)
(cherry picked from commit fe0c4e5b9e)
2026-01-20 01:02:29 +01:00
Denis Konoplev
59cf600f04 Fix build: add import & fix jwhen
(cherry picked from commit 3551c2a4c0)
2026-01-20 01:02:29 +01:00
Denis Konoplev
68a79c01cd JBR-2795: Add explicit conversion
(cherry picked from commit bf3e1c0c31)
(cherry picked from commit 5f07df3034)
2026-01-20 01:02:29 +01:00
Denis Konoplev
d6a2e2003b IDEA-237231: Correct signarute mask
(cherry picked from commit 6974131eec)
(cherry picked from commit af2154f8b1)
2026-01-20 01:02:29 +01:00
Denis Konoplev
2a784ea995 IDEA-237231: Possible fix for pen interraction
(cherry picked from commit 33a8c95d39)
(cherry picked from commit 58fbc3f800)
2026-01-20 01:02:29 +01:00
Denis Konoplev
1d8313af31 JBR-2041: Project view tap fix, recovery? constants & logging
(cherry picked from commit 1e904db3b0)
(cherry picked from commit 5c62dbdbca)
2026-01-20 01:02:29 +01:00
Denis Konoplev
54e34b1d32 IDEA-229135: Fling animation stop on tap
(cherry picked from commit 7ce0f79561)
(cherry picked from commit 01f0f774b4)
2026-01-20 01:02:29 +01:00
Denis Konoplev
c6f0c25177 Windows touch screen support
(cherry picked from commit cab3f28907)
(cherry picked from commit ce0e4aff62)
2026-01-20 01:02:29 +01:00
Denis Konoplev
403dde9b30 Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 41eaa75d27)
2026-01-20 01:02:29 +01:00
Denis Konoplev
3140c648ac Check XInput extension && touch inertia
(cherry picked from commit cca7fb97f4)
(cherry picked from commit edcb7310d3)
2026-01-20 01:02:29 +01:00
Denis Konoplev
0a42c95980 Touch scroll handling
(cherry picked from commit 6dcec3dc31)
(cherry picked from commit c585901afe)
2026-01-20 01:02:29 +01:00
Denis Konoplev
cf14b5c058 XI2 Constants
(cherry picked from commit 588cd6ee73)
(cherry picked from commit 2e4a8ba10b)
2026-01-20 01:02:29 +01:00
Denis Konoplev
5914864d3d XLibWrapper XI2 functions
(cherry picked from commit d6bd1bfa2b)
(cherry picked from commit 7edf395b3b)
2026-01-20 01:02:28 +01:00
Denis Konoplev
c4b4049fc5 X11 native get put double
(cherry picked from commit f101bc1108)
(cherry picked from commit 344fe36ceb)
2026-01-20 01:02:28 +01:00
Denis Konoplev
07583ceca6 Native data types
(cherry picked from commit 9504574dbb)
(cherry picked from commit 5967b3f41b)
2026-01-20 01:02:28 +01:00
Denis Konoplev
83ba273e37 XI2 headers in xlib wrapper generator
(cherry picked from commit ef108067a1)
(cherry picked from commit 1397389026)
2026-01-20 01:02:28 +01:00
Denis Konoplev
01bad810f1 Revert "Turn off multitouch"
This reverts commit 90ea3bf57e4c687e9d9bf0a37f2f64c82a81f4eb.

(cherry picked from commit b154b46eb0)
2026-01-20 01:02:28 +01:00
Denis Konoplev
e503887e77 Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 960e154377)
2026-01-20 01:02:28 +01:00
Alexey Ushakov
05dce81681 JBR-1962 Allow to change font config
Replaced several privileged blocks with just one

(cherry picked from commit faa8d3d258)
(cherry picked from commit 2ffadb5f9a)
2026-01-20 01:02:28 +01:00
Vitaly Provodin
d6f58f336d JBR-572: Regression test on the crash caused by the fix
(cherry picked from commit 6cc380ffb5)
(cherry picked from commit 958e25ed21)
(cherry picked from commit a7de601d5f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 32a3948437)
2026-01-20 01:02:28 +01:00
Dennis Ushakov
156941e0a6 JBR-1863, JBR-1868 correct advances on Catalina
(cherry picked from commit bff05a1a97)
2026-01-20 01:02:28 +01:00
Dennis Ushakov
2913bf7e9b JBR-1850: on macOS fonts should be sorted by weight to ensure proper population of the families
(cherry picked from commit 59974ca04c)
2026-01-20 01:02:28 +01:00
Dennis Ushakov
e447782a63 faster font family loading & lazy font family population
1. NSFont.familyName is faster than loading allFamilyNames
2. Prebuilt list of system fonts
3. Cleanup San Francisco family loading
4. Avoid calling expensive native getWidth on font when creating font family, load styles only when they would be used.

(cherry picked from commit db44a8c70e)
2026-01-20 01:02:28 +01:00
Dennis Ushakov
9e5f98ada7 JBR-1756 use CoreText for all font rendering on Catalina
(cherry picked from commit a4f42cd091)
2026-01-20 01:02:28 +01:00
Nikita Gubarkov
f391939759 JBR-410 Added emoji support for Linux
(cherry picked from commit a98fac2c53)
2026-01-20 01:02:27 +01:00
Alexey Ushakov
6e676faab2 JBR-1997 JetBrainsMono fonts update to v0.22
(cherry picked from commit 41f4fddd34)
(cherry picked from commit f5302a02f4)
(cherry picked from commit 5d7fd2e1e5)
(cherry picked from commit 6d27bc749b)
2026-01-20 01:02:27 +01:00
Anton Tarasov
a419c49202 JRE-729 [windows] unreasonable IME activity consumes CPU
(cherry picked from commit caf8462e09)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
ff974fd86a JBR-3119 Application's panel in KDE taskbar blinks when popup window is shown
this re-fixes JBR-2934 in a different way

(cherry picked from commit 63134e091b)
(cherry picked from commit d805bf045f)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
f7bd3a8386 JBR-3038 Unexpected windows z-order change on workspace switch
(cherry picked from commit ddda860f42)
(cherry picked from commit f4b23f8be1)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
d710c373fe JBR-3035 The Confirm Exit pop-up window remains hidden behind a window of another application
(cherry picked from commit 470c3bd1b5)
(cherry picked from commit 64e4203555)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
565c93b8a3 JBR-2934 Serious usability issue with GoLand 2020.3 caused by JBR
(cherry picked from commit 95be4351d4)
(cherry picked from commit 79d0b926b2)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
83e5a4a891 JBR-2977 Opening a recent project in a new window doesn't bring this window to the front
(cherry picked from commit 2d9fb9e7b8)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 27f390cf9a)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
88f562c3a1 JBR-2698 setAutoRequestFocus(false) breaks focus logic under i3 window manager on Linux
(cherry picked from commit ebcdeb7d80)
(cherry picked from commit 6d26292983)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
3f287e8504 JBR-2696 Log focus API invocations with stack traces
(cherry picked from commits 0f038754e5, a507cab6d3)

(cherry picked from commit a494c76a27)
2026-01-20 01:02:27 +01:00
Dmitry Batrak
551f1347e3 JBR-2496 Prevent JVM stealing focus from other applications on Linux (JBR-2497, JBR-2499, JBR-2503, JBR-2652)
(cherry picked from commits 87525d1d2a, 66381f0dec, 8a789e04e9, 665ebc5d47, 98a9219c23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 42aad68ab4)
2026-01-20 01:02:27 +01:00
Alexey Ushakov
0132a21256 JBR-3509 Extend JDK-8267521 (Post JEP 411 refactoring: maximum covering > 50K) to JBR specific changes
Marked all the usages of SecurityManager related api

(cherry picked from commit a783b841ac)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
7a768fc1cb JBR-1851: check NSArray length
and make more exception-safe
and minor optimization for logging (cache jobjects)

(cherry picked from commit 5839539379)
(cherry picked from commit 23a3321d6d)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
d9facbad41 JBR-1841: allow deferred disabling of InputMethods-support
(cherry picked from commit 969255904b)
(cherry picked from commit f8513bcad9)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
2c59aa01d1 JBR-1668: add hardcoded default values for preferences node NSServicesStatus
(cherry picked from commit 8445f53d85)
(cherry picked from commit 2e3a5fe508)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
8aa9b3687a JBR-1515: obtain shortcut from OS to check inside AWTView.performKeyEquivalent
(cherry picked from commit 30d479fbd4)

JBR-4899 Activate Previous Window doesn't work sometimes

(cherry picked from commit 63cb726f3c)
(cherry picked from commit ddeeb4c813)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
c16a43959d JBR-1668: add hardcoded descriptions of system actions
and minor fixes

fix memory management

(cherry picked from commit 15f7368309)
(cherry picked from commit 5aec21a5cd)
2026-01-20 01:02:26 +01:00
Elena Sayapina
30fc6449ae JBR-1417 [TEST] Added new regression test (JBR 11 does not support chain of popups)
(cherry picked from commit 41e89505be)
(cherry picked from commit 9fe5c778d9)
(cherry picked from commit 6ea9530d9f)
(cherry picked from commit d757108517)
(cherry picked from commit b99c1e7b5c)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9745d7d7dc)
2026-01-20 01:02:26 +01:00
Alexey Ushakov
0cad9b82b3 JBR-1690 Bundle new fonts
Test correction
Restored RenderUtil.java
Removed obsolete golden images
(cherry picked from commits:
aa13c8b4ea
943b1472c7
cab6dd5087
7997c7a5ee
cab6dd5087
7997c7a5ee
d3731df79d)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a9a049709c)
2026-01-20 01:02:26 +01:00
Dmitry Batrak
f76a57fb96 IDEA-257525 Unable to show Chinese when using IDEA mac ARM version
The proposed solution is to use a 'normal' font as a base for 'San Francisco' font fallback.
Most of its fallback components/candidates (provided by the OS) are expected to be normal
fonts as well, and so the resulting coverage of Unicode character repertoire should be much better.

(cherry picked from commits 9b7113a6cf, 92b00d50b5, 53489fab27)

(cherry picked from commit 7b14db7f6b)
2026-01-20 01:02:26 +01:00
Dmitry Batrak
cd9c8ba6f9 JRE-469 Console with emoji output becomes slow
The fix consists of two parts:
* Making CCharToGlyphMapper remember that a particular character cannot be displayed (isn't mapped to glyph with given font). Checking this repeatedly in native code is very slow.
* Make CCompositeGlyphMapper remember the results of char-to-glyph mapping, this was missing in previous implementation. This reuses caching code in CompositeGlyphMapper, extending the range of characters for which the results are cached to include Supplementary Multilingual Plane (most emoji characters belong to it).

port commit 4e0ccde2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 394e055ae6)

cherry picked from commit 0db7e948af

(cherry picked from commit 7721393e5b)
2026-01-20 01:02:26 +01:00
Dmitry Batrak
c36bf3ef41 reimplement JDK-7162125 to fix JDK-8147002
port commit ba38e5c4 from JBR 9

port from JBR 11 to JBR 15(cherry picked from commit a949f9d220)

cherry-picked from commit f309844f75

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f9942d50a8)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
6ccdf538a5 JBR-1771: fixed compilation errors (macosx-x86_64-normal-server-fastdebug)
(cherry picked from commit 1acada7cac)
(cherry picked from commit c1751ca98d)
2026-01-20 01:02:26 +01:00
Artem Bochkarev
10d97fc1de JBR-1668: minor fixes
fixed review comments

(cherry picked from commit 9dbcf194c9)
(cherry picked from commit 8276f81a13)
2026-01-20 01:02:25 +01:00
Vitaly Provodin
4e6456c673 JBR-1618: fixed misprint, added saving screenshots in case of failure
(cherry picked from commit e4a3889cf0)
(cherry picked from commit 3959ac1680)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
47bf9785d5 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Corrected lookup for bold fonts

(cherry picked from commit 114b8af38f)
(cherry picked from commit fa0816c404)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
0a677892cc JBR-1399 Improve font discovery and loading by introducing font cache
Added unit test

(cherry picked from commit b4f5bf8bd3)
(cherry picked from commit a0eb49776a)
2026-01-20 01:02:25 +01:00
Elena Sayapina
924948a24a IDEA-165950 [TEST] Added new regression test (National keyboard layouts support)
(cherry picked from commit 0900a705bc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0981cb572a)
2026-01-20 01:02:25 +01:00
Artem Bochkarev
bb57d0504b JBR-1668: read system keyboard shortcuts
initial support for OS X

(cherry picked from commit 6bbe7102e2)
(cherry picked from commit ccd8116bf3)
2026-01-20 01:02:25 +01:00
Artem Bochkarev
1cf212b5c4 JBR-1573: restore current input context after cleanup
(cherry picked from commit b7acd7f6f6)
(cherry picked from commit 9dbdd24cc3)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
7947f8c2d1 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Restored old behaviour of registerFontsInDir as it does not affect idea bundled fonts

(cherry picked from commit cef29e8100)
(cherry picked from commit e3a1cdae23)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
248f30847f JBR-1874 Cursor not changing from 'default' to 'text'
Prevent OS from changing cursor

(cherry picked from commit 94a4eb7002)
(cherry picked from commit c640e06d25)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
0954ab1353 JBR-1778 Font in editor incorrect (always italics)
Added -it pattern into italic detection code
Added some more patterns to bold and italic detection code
'Anka/Coder' font support

(cherry picked from commit 5119eeee12)
(cherry picked from commit ec241e4a0a)
(cherry picked from commit 251068294e)
(cherry picked from commit 08ae9ff034)
(cherry picked from commit b472b89fba)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
f72684f62c JBR-1699 Use platform font rendering for bundled fonts on MacOS
Use different family for specific font faces. Refactoring

JBR-3071 Remove naming workaround for Fira Code

(cherry picked from commits c423003bd4, aee4b48d20)

(cherry picked from commit 8838b708be)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
5ff5380fef JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 181c757ebe)
2026-01-20 01:02:25 +01:00
Alexey Ushakov
2b0d19112f JBR-1885 JetBrainsMono fonts update to v0.19
Updated the fonts to v0.19. Bundled italic fonts

(cherry picked from commit 7f032e3fe7)
(cherry picked from commit a7b4c9449a)
(cherry picked from commit 9c9cea0871)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
aaa07c8df1 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 517bd6d449)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
67efcb3d51 JBR-1699 Use platform font rendering for bundled fonts on MacOS
Used CFont instead of TrueTypeFont for bundled fonts on mac
Use different family for specific font faces. Refactoring

(cherry picked from commit 8c86ad3e96)
(cherry picked from commit c423003bd4)
(cherry picked from commit bcae402dc8)
(cherry picked from commit e53374aab3)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
10ba414f77 JBR-1690 Bundle new fonts
Update family name for JetBrainsMono-Thin

(cherry picked from commit 0d2326ff34)
(cherry picked from commit 83843f9124)
(cherry picked from commit 2a2e1cfb36)
(cherry picked from commit 76abb69262)
(cherry picked from commit 1350ceb04b)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
c955621faa JBR-1645 javax/swing/JTextArea/TestTabSize.java: Tab width calculation wrong
Corrected idea font filter

(cherry picked from commit 62f9d1f46a)
(cherry picked from commit 3dab43f987)
2026-01-20 01:02:24 +01:00
Artem Bochkarev
9c3931d1d9 JBR-1573: workaround for 'Sudden keyboard death on Ubuntu 18'
recreate instance of system InputMethod when starts filter all events

(cherry picked from commit 3ad94911af)

(cherry picked from commit c8533a1219)
(cherry picked from commit 42c5f07276)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
afadd306c5 JBR-1399 Improve font discovery and loading by introducing font cache
Bundle IDEA fonts to improve startup performance

(cherry picked from commit 350a3fdef3)
(cherry picked from commit 4ad45a0c84)
2026-01-20 01:02:24 +01:00
Artem Bochkarev
19992cfc06 JBR-1541: activate menu in completion handler of modal dialog
(cherry picked from commit e57384c1d6)
(cherry picked from commit b38f01f5e4)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
445e311354 JBR-1314 Font difference in pycharm 2019.1 on Ubuntu
Removed disabling hints on MAX_FCSIZE_LTL_DISABLED font size

(cherry picked from commit 2b99dfed40)
(cherry picked from commit 4cf33c4d27)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
38746608fb JBR-1412 [fwp to JBR11] JBR-1393 RubyMine is hanging after log in (macOS)
Modified version of JBR8 fix

(cherry picked from commit 434166fe63)
(cherry picked from commit db7cdf1d90)
2026-01-20 01:02:24 +01:00
Alexey Ushakov
b4a4bcb3ad JBR-1394 JBR11 does not support LCD text on Mac
Enable LCD rendering for transparent destinations

(cherry picked from commit 207c6b92ff)
(cherry picked from commit 2254451953)
2026-01-20 01:02:24 +01:00
Elena Sayapina
2591ae7fa2 JBR-1372: [TESTBUG] JDialog1054.java, MoveFocusShortcutTest.java regression tests need update
(cherry picked from commit a5948894bf)
(cherry picked from commit dcc2be2a53)
2026-01-20 01:02:23 +01:00
Maxim Kartashev
6c03dd8ca9 JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 76decaa4ef)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
914599386a Fix const pointer after JDK-8225032 fix
(cherry picked from commit dc3ae1cafa)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
9a07a3041a Fix compilation on windows platform: awt_ole.h must be included before awt.h
(cherry picked from commit 6fdcfedd0e)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
be848fc03d JBR-1269 Common Item Dialog does not appear on Alt+Tab or click in windows toolbar
JBR-1270 Common Item Dialog does not have an icon

Select a proper window handle

(cherry picked from commit 92fb89e3e3)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
7cab2703ae JBR-1271 Wrong parent of native windows dialogs
Set a proper parent to a dialog window

(cherry picked from commit 803ba97361)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
4e7380ecdd JBR-1273 Common Item Dialog does not open when wrong path to directory is passed
Handle set directory / set file properly

(cherry picked from commit b96492f7de)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
da278d293a JBR-1274 Common Item Dialog sometimes crash the process
Prevent from freeing memory with CoTaskMemFree twice

(cherry picked from commit 8e5e04a798)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
325bad3daf JBR-1257 CommonItemDialog modal window has no owner
Fix modality for Common Item Dialog

squash! JBR-1257 CommonItemDialog modal window has no owner

JBR-2478 java/awt/Modal/FileDialog/FileDialogNonModal7Test.java: DummyButton on Dialog did not gain focus when clicked

revert part of JBR-1271, that's related to 'old' file dialogs

(cherry picked from commit 8bc4787c11)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
3131859986 JBR-1258 CommonItemDialog ignores directory to open
Fix parsing of directory path / file path

(cherry picked from commit b09a8aace1)
2026-01-20 01:02:23 +01:00
Vyacheslav Moklev
3c48a574a4 JRE-1216 Implement Windows native file dialogs with the new Common Item Dialog API
Add implementation of file dialogs with the new Common Items Dialog API

(cherry picked from commit e2fb4ced09)
2026-01-20 01:02:23 +01:00
Alexey Ushakov
8cbfdc2497 JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled both Delete and ForwardDelete keys

(cherry picked from commit e3ba0bd651)
(cherry picked from commit 64cabb0dc7)
2026-01-20 01:02:23 +01:00
Alexey Ushakov
93cf670614 JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled backspace separately

(cherry picked from commit 81916a92af)
(cherry picked from commit 60ae63de08)
2026-01-20 01:02:22 +01:00
Elena Sayapina
63e5cbe044 JBR-1102: [TESTBUG] java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java: 'paint' method of 60 components was not called
(cherry picked from commit dc7abebe17)
(cherry picked from commit c8d631a142)
(cherry picked from commit a133cd791e)
2026-01-20 01:02:22 +01:00
Elena Sayapina
6c819362f0 JBR-998: [TEST] Added new regression test (Input freezes after MacOS key-selector on Mojave)
(cherry picked from commit 3d898a8024)
(cherry picked from commit f368f0f101)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 362b7d402d)
2026-01-20 01:02:22 +01:00
Elena Sayapina
0538702ed2 JBR-318: [TEST] Added new regression test (Cmd+` doesn't work after update to JDK 152_*)
(cherry picked from commit 0be0a018b5)
(cherry picked from commit 5bb4c2a1d6)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7fa8aa1568)
2026-01-20 01:02:22 +01:00
Elena Sayapina
48ffdf813c JBR-1054: [TEST] Added new regression test (Weird non-modal dialog above modal dialog behaviour)
(cherry picked from commit b808be6a6a)
(cherry picked from commit 48b7dd874f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a39264214b)
2026-01-20 01:02:22 +01:00
Vitaly Provodin
62f8a7f09b JRE-1117 J2DBench: introduced result reader for TC's charts (follow up)
separated printing values fo TC charts and values for comparisons

(cherry picked from commit bbdbe17e2a)
(cherry picked from commit 3e5dcf6aeb)
2026-01-20 01:02:22 +01:00
Vitaly Provodin
2b84aa83aa JRE-1117 J2DBench: introduced result reader for TC's charts
(cherry picked from commit 422fa59643)
(cherry picked from commit 43b5f7f8b0)
2026-01-20 01:02:22 +01:00
Alexey Ushakov
b74ceb17f1 JRE-60 Editor font is distorted on Kubuntu Linux 16.04 with HiDPI
Override FC_HINT_SLIGHT only for small font sizes

(cherry picked from commit 0e1d23c807)
(cherry picked from commit 56e10e7d27)
2026-01-20 01:02:22 +01:00
Alexey Ushakov
3f78b3a695 JRE-471 Crash on macOS Sierra after Sleep
Replaced [NSScreen screens] 'objectAtIndex' with 'firstObject' to get nil instead of NSRangeException. Added nil checks

(cherry picked from commit d6b98511262055c01522d9ec8024253af7e91564)
(cherry picked from commit cef970e1ba)
(cherry picked from commit 9f34bb4ee4)
2026-01-20 01:02:22 +01:00
Alexey Ushakov
64461bc9fc JRE-608 J2DBench metrics: up to 20x degradation
Increased rendering queue buffer up to 6.4 MB

(cherry picked from commit 9ef00f00a7fb6e14835393f8d3944157c6800727)
(cherry picked from commit 2a61e9e997a880a60c5acb361849205170501b91)
(cherry picked from commit 68ca9f00ded004c970b94bd047a04b9f09237047)
(cherry picked from commit 2fe5289178)
(cherry picked from commit 560a65654e)
2026-01-20 01:02:22 +01:00
Alexey Ushakov
729f0ae4bd JRE-1028 fwport(9): JRE-1008 Do not use LCD shader on macOS 10.14+ in font rendering
Disable LCD text shader on macOS 10.14+ if LCD rendering is not explicitly specified

(cherry picked from commit dffea9d701)
(cherry picked from commit 1628d6120e)
2026-01-20 01:02:22 +01:00
Konstantin Bulenkov
993ce29918 update icons
(cherry picked from commit dfe387ff5037deda29d8d522cba6cc5370796ff4)
(cherry picked from commit de1e4a9d71)
(cherry picked from commit 0b33efa7d1)
2026-01-20 01:02:22 +01:00
Vitaly Provodin
e844fceebd Update README.md
(cherry picked from commit eacef38934)
2026-01-20 01:02:22 +01:00
Vitaly Provodin
47f969bb53 Regression test on https://bugs.openjdk.java.net/browse/JDK-8139176
JBR-5008 remove extra file jb/java/awt/font/DrawTest.java from colliding group

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)

add regression test on https://bugs.openjdk.java.net/browse/JDK-8139176

(cherry picked from commit 380c17456c)

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)
(cherry picked from commit 33bbc7d54d)
2026-01-20 01:02:21 +01:00
Vitaly Provodin
e044a8d445 not for upstream: added disposing frames in order to provide the test with the chance on the second run
(cherry picked from commit 8170635)
(cherry picked from commit 7fc924f065)
(cherry picked from commit a2f9387697)
2026-01-20 01:02:21 +01:00
Vitaly Provodin
652c9e931e JRE-9: added regression test
(cherry picked from commit 4ffb665)
(cherry picked from commit 00a29ad129)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 05ad949ded)
2026-01-20 01:02:21 +01:00
Sergey Malenkov
a25b7e285e JRE-100 Scroll with inertia (Mac os) should only work in the initial component
(cherry picked from commit e79502c708)
(cherry picked from commit 223a74bfeb)
2026-01-20 01:02:21 +01:00
Sergey Malenkov
6fd4f0b8ff IDEA-161965 ignore dragged event that does not change mouse location Sierra is more sensit
(cherry picked from commit ef490fa465)
(cherry picked from commit 3722edc9f2)
2026-01-20 01:02:21 +01:00
Dmitry Batrak
b4707fd7b3 JBR-3339 Window requests focus on horizontal scroll (on Linux)
(cherry picked from commit 8d74e8e30b)
(cherry picked from commit 88edabdd60)
2026-01-20 01:02:21 +01:00
Anton Tarasov
96cd063c7e JRE-166 [macOS] deadlock with JFXPanel
(cherry picked from commit a9dbb6990fac0c659297487a261ba9170e5fb3ad)

(cherry picked from commit 8a44e1bb37)
(cherry picked from commit 9a280dc79e)
2026-01-20 01:02:21 +01:00
Alexey Ushakov
59d39bc67d 8265445: Introduce the new client property for mac: apple.awt.windowAppearance
Implemented apple.awt.windowAppearance client property

(cherry picked from commit ba60f7bd8f)
2026-01-20 01:02:21 +01:00
Anton Tarasov
063abd32f4 JBR-3306 jbr-dev warnings: incompatible pointer to integer conversion returning 'void *' from a function with result type 'jlong'
(cherry picked from commit 046409cd7f)
2026-01-20 01:02:21 +01:00
Dmitry Batrak
04788889cf JBR-2498 Fix unexpected window raising under Mutter WM
re-implement the fix, so that ChildAlwaysOnTopTest isn't failing

(cherry picked from commit bf826251fa)
2026-01-20 01:02:21 +01:00
Alexey Ushakov
be87fe95e8 JBR-3327 [jbr-dev] Adjust mac window appearance according to AppleInterfaceStyle property
Set window appearance according to AppleInterfaceStyle default

(cherry picked from commit ffe5b5a504)
2026-01-20 01:02:21 +01:00
Alexey Ushakov
367ab4ca77 JRE-238 [736] java.awt.AWTError: access denied ("java.lang.RuntimePermission" "canInvokeInSystemThreadGroup")
Moved task execution on AppKit to the privileged block. Minor refactoring

(cherry picked from commit 5dbb88471115c9e4a536ae37d0e6794de9e5ac9c)
(cherry picked from commit fd2f9a1166)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
27ff18f24c JRE-359 CGraphicsEnvironment.getDefaultScreenDevice() returns null
Moved CG api calls to AppKit thread

(cherry picked from commit fd0210f035199e8612097a2c1d42b90cfd2111f8)
(cherry picked from commit 5e99e376d9dfe477401121878704630c3c13f9f7)

(cherry picked from commit 6d73b25130)
(cherry picked from commit 9519ac1e6e)
2026-01-20 01:02:20 +01:00
Dmitry Batrak
e7af9dcded JBR-2973 Copy/Move dialog not in the focus on drag-n-drop to Project Tool window from external application
(cherry picked from commit 20fe78b650)
(cherry picked from commit 9f6b9baaa8)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
255c7ad5be JRE-444 CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse is slow
Replaced number of CGWindowListCopyWindowInfo for each window layer with [NSWindow windowNumberAtPoint: belowWindowWithWindowNumber:]

(cherry picked from commit 2a143af4d62340acdfd9c94d876f684385febbc8)
(cherry picked from commit 6fc369e8bf)
(cherry picked from commit 91b0084667)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
51c1faadca JRE-482 Java_sun_font_CStrike_getNativeGlyphOutline takes too much time in scrolling
Replaced glyph outlines with bounding boxes for glyph boundaries calculation for most common usages. Also, skipped unnecessary OGL flushes in OGL rendering queue

(cherry picked from commit c58dc052af48887338a38beb0c721eddca3af481)
(cherry picked from commit 7f6be7cfb907bbf1c3572b911df5690fa3039fde)
(cherry picked from commit c68913d82c0ba4b4c509179123f0a4bf7971f857)
(cherry picked from commit 9cfa04c93ad416a8177d9e7ca410850bd3ff880f)
(cherry picked from commit 0e930841704e4e98ecc0c888b144245e74218799)
(cherry picked from commit 8ffc190fbdb059d5a24842115c0bc3ade8b351b9)
(cherry picked from commit 0f7c26186a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e20819c77b)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
df957b9e43 JBR-3316 Reimplement CThreading functionality on top of OpenJDK17 sourcebase
Adopted CThreading related code to OpenJDK17 source base

(cherry picked from commit 5dfb30ae68b2c54d58c98a9195709c031f823581)
(cherry picked from commit 94163bd69f64616836523e81567aa1141480d841)
(cherry picked from commit baca50b430)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
f1245c104d JBR-3304 jbr-dev warnings: 'getPhysFontName' defined but not used [-Werror=unused-function]
Removed unused code

(cherry picked from commit 6781f2646f)
2026-01-20 01:02:20 +01:00
Vitaly Provodin
dd4ba284e5 exclude javax/swing/JTabbedPane/4624207/bug4624207.java failing on windows due to 8197552
(cherry picked from commit 3f8f2e8928)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
31e971f827 JRE-366 Add support for Awesome WM
Added detection of Awesome WM and handled similar to Sawfish WM

(cherry picked from commit 6742077ed198975949af567e8ef543f853397351)
(cherry picked from commit 2847be73c6)
(cherry picked from commit 916a2ab66f)
2026-01-20 01:02:20 +01:00
Alexey Ushakov
7797e4dfe1 JRE-353 Fedora 25 + XMonad rendering issues
Added support for Xmonad WM

(cherry picked from commit c690c3c7fdf1390e6b1a8d388ff752a09391ae3c)
(cherry picked from commit 6851dc3441)
(cherry picked from commit e290bf8a0c)
2026-01-20 01:02:20 +01:00
Denis Konoplev
889a51e64a 8264143: Change uint8_t to unsigned char
(cherry picked from commit 9d01b82f64)
2026-01-20 01:02:20 +01:00
Dmitry Batrak
8b88f47669 JBR-3255 Applying 'incline' transform might change character's advance
(cherry picked from commit b37f7cfdb1)
(cherry picked from commit 2bd6c80390)
2026-01-20 01:02:20 +01:00
Dmitry Batrak
98e4386649 JBR-3215 'deriveFont(float)' can return a different font (not just change the size)
(cherry picked from commit 8eafcaab24)
(cherry picked from commit 3f4065786d)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
e963838054 JBR-3157 Maximized window with custom decorations isn't focused on showing
(cherry picked from commit 62b04983f2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e4f68d461c)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
4a4edc7aae JBR-1752 Floating windows overlap modal dialogs
(cherry picked from commit 0161050077)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8b2f0315d1)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
491e0d2e47 JBR-3054 Focus is not returned to frame after closing of second-level popup on Windows
(cherry picked from commit 0c2b6e1c04)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8c6ecf33f1)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
9f283bb4fe JBR-2702 Tooltips display through other applications on hover
(cherry picked from commits 11732c2469, 0ed7deabaa)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cc952f4053)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
6cb80ab18e added RobotSmokeTest
this test failing in jtreg launch most probably indicates either some problem with the environment (e.g. some windows left open from previously launched processes) or with java.awt.Robot implementation

(cherry picked from commit 1d525a2d2f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9c3043a557)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
0d3639330a JBR-2847 Always dispatch KEY_TYPED event to the same component as KEY_PRESSED event
also fixes JBR-2834, IDEA-254466, IDEA-254466
squashed with fixes for JBR-3291, JBR-3307, JBR-3598

(cherry picked from commits e94f6057a4, ba6b9c085e, 2ccf6b65a7, 3b0708af7d, 3674766d65)

(cherry picked from commit d7383ededb)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
df04106c7a JBR-2712 Typeahead mechanism doesn't work on Windows
(cherry picked from commits 1a9838082e, f5b6222835, acd7e3b2da, cd6dd5c3cf8556f97f3113cb7d615a92393b57bf(partially), e8bbd8ffdd90f57cd12d7d7e89188be97ee4be0b(partially), 37901295e1, cafb374afc, 12034dcf61)

includes fix for JBR-4974 jb/java/awt/Focus/ModalDialogFromMenuTest.java intermittently clicks at tittle bar

Pause before getting the coordinates of the component to be clicked on,
not right before the click itself.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7855e07658)
2026-01-20 01:02:19 +01:00
Denis Konoplev
c891f6dd66 8264143: Lanai: RenderPerfTest.BgrSwBlitImage has artefacts on apple M1
Add stdint include to fix x64 build

(cherry picked from commit 0dc04385a3)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
1d17f7cfc1 JBR-2498 Fix unexpected window raising under Mutter WM
(cherry picked from commit 73b45fb899)
(cherry picked from commit bc8dec8fc1)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
7ac3f121bf JBR-2248 Support text wrapping in a <pre> tag in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commit ff2e915371)

cherry picked from commit 6a30c56138

(cherry picked from commit add6c7e2c9)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
a0be7b40b9 JBR-2234 Support CSS setting overflow-wrap:anywhere in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commits b6583d0a71, 6003abc15f)

cherry picked from commit 93ad4f06dd

also includes JBR-4006 [JCK] javax.swing.text.html.CSS$Attribute.OVERFLOW_WRAP field breaks public API
(cherry picked from commit f20a3d8679)
and JBR-4007 [JCK] javax.swing.text.GlyphView.calcBreakSpots method breaks public API
(cherry picked from commit 1002eff4f3)
(cherry picked from commit f603f9e837)
2026-01-20 01:02:19 +01:00
Dmitry Batrak
cc9695015b JBR-2050 Issue with keycap emojis
port from JBR 11 to JBR 15 (cherry picked from commit ae91e1d7f1)

cherry picked from commit d3018a1837

(cherry picked from commit 17afbc7882)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
6214a7bc82 JBR-1714 Italic text is displayed using incorrect glyphs on Windows
port from JBR 11 to JBR 15 (cherry picked from commits 46e4cdfcbd, 9cc5cbc99b)

cherry picked from commit 6769b27e53

(cherry picked from commit eccee72823)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
3105000805 JBR-1689 Incorrect painting of long strings on linux
port from JBR 11 to JBR 15 (cherry picked from commits e12c1d6f0d, 0429e74e9d)

cherry picked from commit e43cfd198f

(cherry picked from commit 0b3c19d1c4)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
99d9511447 JBR-1248 Exception caused by broken font
port from JBR 11 to JBR 15 (cherry picked from commit 4efa7eab3e)

cherry picked from commit 6e1c514c6c

(cherry picked from commit 452fbf01a5)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
e99ce5db28 JBR-1245 [JDK 11] There are different letter spacings in some controls
port from JBR 11 to JBR 15 (cherry picked from commit a26b70568a)

cherry picked from commit e2637199e9

(cherry picked from commit ca316d6bc0)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
29fcb10e4b JRE-927 Unexpected wrapping of bidirectional text in JEditorPane on HiDPI screens
port commit 11a5a4a2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 65a5e450d5)

cherry picked from commit 47ff31ae82

(cherry picked from commit c4426e7ff2)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
c4c7a97cc1 JRE-774 Don't paste BOM from clipboard on Mac
port commit ea9b75b3 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit c6fed2cf58)

cherry picked from commit a5e25d1ef9

(cherry picked from commit a105a6e802)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
cae6929d1f JRE-847 Box drawing characters have different widths with Monospaced font on Windows
port commit 778cef18 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 9caaac4a5a)

cherry picked from commit eea293f4a4

(cherry picked from commit 7b9b29493d)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
cff4d99342 JRE-748 Strange dots with fractional metrics turned on
port commit 82e7c82d from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit e9bd5f5dad)

cherry picked from commit e0475e9ba2

(cherry picked from commit 714ba79a84)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
077952b689 JRE-593 Wrong italic font rendering for Source Code Pro
port commit 1f6bd200 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 32ce109355)

cherry picked from commit 087ff34c2e

(cherry picked from commit 86fa2a9c9b)
2026-01-20 01:02:18 +01:00
Dmitry Batrak
3bce21a4fe JRE-430 Font fallback sometimes doesn't work in Swing text components
port commit fc8003ad from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 5b814d6b34)

cherry picked from commits b871188f44, 0a9f16dc90, 9cc82c39d9

(cherry picked from commit df8821d745)
2026-01-20 01:02:18 +01:00
Alexey Ushakov
78e7b0987d JRE-303 2017.1.1 update breaks linux fonts
Corrected rendering hints for Non-AA text rendering

(cherry picked from commit b923aa7a0729a10ea47d3438622d659fbead44c9)
(cherry picked from commit b6bdd04e41)
(cherry picked from commit 8b12cf08ee)
2026-01-20 01:02:18 +01:00
Alexey Ushakov
10dd6cef24 JRE-205 Font is wrong and without anti aliasing in 2017.1 EAP
Added property to disable bundled font config:
  java2d.font.loadFontConf=false
Do not load custom font.conf by default

Moved hints adjusting logic from code to bundled font.conf file
Applied correction only for regular fonts with platform sizes less than 12
Some fonts are not corrected at all: Consolas, Noto Sans Mono
Used family name instead of physical one in requests to Fontconfig
Removed redundant call to FcConfigBuildFonts
Added privileged access to the properties (JRE-235,JRE-235)

(cherry picked from commit 4d4c915047077ebd966b0e3be056566d56ba11a4)
(cherry picked from commit 9d6f325f72482405264852f3ee2636f5fedaeaf0)
(cherry picked from commit e7e3372bf8db539c0f6bc85db9f1093f8fa4c380)
(cherry picked from commit 3e724caed2f199be50d25d1ecb20b7819c86be2e)
(cherry picked from commit d372b35963c096a32331b05b257e26841ace5d94)
(cherry picked from commit 18a5f5de03eb107f89dca138a44b9aab2151235c)
(cherry picked from commit 9ba320efef0539f75aa93fd1b5dd80266c954d0a)
(cherry picked from commit b8c38f419972af61291953f7f452c1698f7a1624)
(cherry picked from commit debba0128e200be60adc9a339d5985590ef4e230)
(cherry picked from commit 2fa17b1bd7d6524e4b5fa4d0b3ce2bf02a8fcc78)
(cherry picked from commit 09b4f61db0d4f5beea0e16ce9136c99e2185c10b)
(cherry picked from commit 3b6782dd742f9c74a9535145db2f9f7ffaccf7c8)
(cherry picked from commit f1b68149528c13a22fa64468c130b1405bf3d081)
(cherry picked from commit db5cf5a2b9cb454630fb86783c2d58cd5446cba6)
(cherry picked from commit 32140948578bc3c2a0c5f8adb537660421efe5e7)
(cherry picked from commit b978e3d0b131ed642774c5a14a649e13f764c20b)

(cherry picked from commit c75c1ef8b2)

(cherry picked from commit a29f19e6a2)
(cherry picked from commit c38c46744f)
2026-01-20 01:02:17 +01:00
Dmitry Batrak
e785e47805 an option to disable native rendering for rotated text (following JRE-19)
port commit ccc1ded6 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 72fb9ff7c4)

cherry picked from commit a5bd092449

(cherry picked from commit 52ebd26933)
2026-01-20 01:02:17 +01:00
Dmitry Batrak
cd567edfc4 JRE-11 Support text rendering via DirectWrite API on Windows
(cherry picked from commit 6605d4a525)
2026-01-20 01:02:17 +01:00
Dmitry Batrak
dc6c748ab6 IDEA-150876 OpenJDK fonts for toolwindow names look worse than Oracles's
don't apply FreeType-returned glyph advance for rotated glyphs rendered by GDI

This seems to produce a better looking text (more evenly spaced). Fractional metrics won't be respected by this code, but we can address this later if needed.

port commits c9debd5e, ed78cd00, 4c7e1619, 7aa0429c, 7bd6c17c from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commits d6b588bdab, dbc15fb84e)

cherry picked from commit 2c0d6150d0

(cherry picked from commit 12f2233f94)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
d01d989ced JRE-186 added regression test (Modal dialogs (Messages) shouldn't popup IDEA when another application is active)
(cherry picked from commit 236bd38d1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45b52492a9)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
1a3606062b JRE-269 added regression (JLabel doesn't scale <code>text</code> HTML fragments.)
(cherry picked from commit 1f4ad38d23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b2f584b10a)
2026-01-20 01:02:17 +01:00
Alexey Ushakov
27ce10289b JRE-307 Wrong dpi reported on Wayland
(cherry picked from commit 15693661cc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ae4c4c017d)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
0ddd7b43fe JRE-392 added regression (Tip of the day is not hidden while another modal window is shown)
(cherry picked from commit c7b0ac686f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e8e81b7509)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
bb1b92a752 JRE-394 added regression test (System getenv doesn't return env var set in JNI code)
(cherry picked from commit 3a7b3c67b0)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7439fd115a)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
cfb0e882fe JRE-401 added regression test (AppCode freezes during autocomplete and other operations)
(cherry picked from commit cb4453b1d1)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit dde86b1e6c)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
4b4599b665 JRE-422 added new regression test (AWTView deliverJavaMouseEvent leaks jEvent)
(cherry picked from commit 37dc13c603)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a5e094dd07)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
c8ca3c3b2a JRE-430 added new regression test (Font fallback sometimes doesn't work in Swing text components)
(cherry picked from commit d04debc847)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5a47f2a66c)
2026-01-20 01:02:17 +01:00
Vitaly Provodin
64ebcfdd06 JRE-457 added new regression test (OGLTR_DisableGlyphModeState is slow)
(cherry picked from commit 3a43f4557f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f534b029e2)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
cbbb0fba5e JRE-458 added new regression test (Insufficient and inconsistent permissions on some files in Linux build)
(cherry picked from commit 82adbe9c25)
(cherry picked from commit 15998f29c1)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
9b55de4622 JRE-467 added new regression test (Wrong rendering of variation sequences)
(cherry picked from commit 0026095202)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 1d0be02755)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
1bd7acca25 JRE-468 added new regression test (Idea freezes on project loading)
(cherry picked from commit 1ce8c3ce82)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0200338c3c)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
364da1a2dc JRE-501 added new regression test (Live resize is jerky for heavy java applications on Mac)
(cherry picked from commit c4a1277c1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 39bd5023d4)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
2e252a3ad7 JRE-638 added new regression test (enable unlimited cryptographic policy by default)
(cherry picked from commit 4a14c6f15a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 4643b6a354)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
3f8562547f JRE-705 added new regression test (Z-order of child windows is broken on Mac OS)
(cherry picked from commit 82cd480619)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 84c0444389)
2026-01-20 01:02:16 +01:00
Vitaly Provodin
50155085cb JRE-624 CThreading isAppKit() fails to detect main app thread if it was renamed
(cherry picked from commit c8f248a936)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9aa93e5907)
2026-01-20 01:02:16 +01:00
Alexey Ushakov
48de7baea5 IDEA-166173 IntelliJ freezes when returning from sleep
Fixed deadlock by removing unnecessary getScreenResolution call

(cherry picked from commit cec93cf1fd)
(cherry picked from commit 0d37ce45c8)
2026-01-20 01:02:16 +01:00
Alexey Ushakov
cbb48bf5f5 Added missing fontconfig defines
(cherry picked from commit 2ac273a456)
(cherry picked from commit d922d7dfaf)
2026-01-20 01:02:16 +01:00
Alexey Ushakov
e4b6965490 JRE-43 Font.getFamily() does not work in headless mode
Removed unused code

(cherry picked from commit 5b523f049e)
(cherry picked from commit 3535055ecd)
2026-01-20 01:02:16 +01:00
Alexey Ushakov
bbb8e26c68 JRE-43 Font.getFamily() does not work in headless mode
Bundled Droid fonts to fallback in headless mode

(cherry picked from commit 5b523f049e)
(cherry picked from commit b65e0d7cb7)
2026-01-20 01:02:16 +01:00
Alexey Ushakov
7dca0657b6 JRE-15 Greyscale text is too dark comparing with subpixel AA
Adjusted default value for greyscale text rendering in freetype

(cherry picked from commit f80497c4f0)
(cherry picked from commit 67e3b05916)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
1cb63aa9c1 IDEA-155347 On Ubuntu with High DPI tooltip font is too thick when the tooltip is fading in and out
Handled missing FC_RGBA_NONE value

(cherry picked from commit 44fcbdabf8)
(cherry picked from commit a9ca78b413)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
158ea76f0a IDEA-149882 Issue with fonts in Ubuntu 12.04
Provided fallback to default font rendering settings if libfontconfig unable to
match font pattern

(cherry picked from commit d93a5f1598)
(cherry picked from commit ebaea7e146)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
a07e85756c IDEA-151619 CLion EAP fails to start with missing symbol: FT_Library_setLcdFilter
Skip FT_Library_setLcdFilter call if the symbol is not there
Cache negative FT_Library_setLcdFilter symbol lookup result
Used RTLD_DEFAULT handler for process symbols lookup

(cherry picked from commit e6f0055704)
(cherry picked from commit dfbc7d7cc2)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
285e65f031 JRE-29 fontconfig lib crashes CLion on OSX
Disabled fontconfig usage on OSX

(cherry picked from commit 431e14429c)
(cherry picked from commit 534d184416)
2026-01-20 01:02:15 +01:00
Vitaly Provodin
dd533f266a exclude tests spontaneously creating windows during test execution
(cherry picked from commit bd278194b9)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
ef395e0cdc JRE-48 built-in jre renders fonts abnormally heavier (normal text looks bold) than the oracle jre
Disable FT_LOAD_TARGET_LIGHT for fonts with FC_AUTOHINT=false (this target implicitly enables  FC_AUTOHINT)
Reused setupLoadRenderFlags for all rendering cases

(cherry picked from commit f3f2667a4c)
(cherry picked from commit e5a81a300f)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
097b8a481b Added logging for freetypeScaler via env variable OPENJDK_LOG_FFS=yes
and for screen resolution in freetypeScaler

(cherry picked from commit 091d74a791)
(cherry picked from commit 7243173610)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
4f355e9474 JRE-34 IDE Crashes During Startup
Added validation of dpi settings coming from xserver

(cherry picked from commit b1c49c3b27)
(cherry picked from commit 3e57837094)
2026-01-20 01:02:15 +01:00
Anton Tarasov
1ae3087d54 JBR-2031 [mac] jcef deadlocks with a11y on start
(cherry picked from commit 4f44b37f08)
(cherry picked from commit 8a4a781393)
2026-01-20 01:02:15 +01:00
Alexey Ushakov
88b0176cda JRE-1083 [JDK11] Test com/sun/java/accessibility/util/8051626/Bug8051626.java fails on macOS on JB JDK11b
Wrapped SelectorPerformer invocation into privileged action

(cherry picked from commit 48e7b547ae)
(cherry picked from commit e420b10a4a)
2026-01-20 01:02:15 +01:00
Anton Tarasov
24b8146dba JBR-2019 provide getWindowHandle method for jcef
(cherry picked from commit 7ae706b629)
(cherry picked from commit d0b855df14)
2026-01-20 01:02:15 +01:00
Anton Tarasov
33ff06e6c8 JBR-1976 [jcef] need mouse-transparent window on Windows
(cherry picked from commit b60fac96b4)
(cherry picked from commit e68503823b)
2026-01-20 01:02:14 +01:00
Anton Tarasov
39db3e06c3 JBR-1824 export NSWindow::setIgnoresMouseEvents to java internal API
(cherry picked from commit 4399dc382c)
(cherry picked from commit 99d8964d90)
2026-01-20 01:02:14 +01:00
Anton Tarasov
acb68d5442 JBR-1802 com/sun/java/accessibility/util/8051626/Bug8051626.java: access denied ("java.lang.RuntimePermission" "getClassLoader")
(cherry picked from commit eae772aca9)
(cherry picked from commit d944e5907a)
2026-01-20 01:02:14 +01:00
Anton Tarasov
6e0e1e16df JBR-1795 Project opened from Welcome screen goes to backgound after loading
(cherry picked from commit 322526458a)
(cherry picked from commit 2ee33311dd)
2026-01-20 01:02:14 +01:00
Anton Tarasov
425a0284b3 JBR-1609 Jupyter Notebook eventually causes IDEA to become unresponsive on Mac OSX
(cherry picked from commit 8ae0be8eb6)
(cherry picked from commit 812158fb5b)
2026-01-20 01:02:14 +01:00
Anton Tarasov
b153c0f812 JBR-1786 Weird white border for IDE window
(cherry picked from commit 4b09614a0e)
(cherry picked from commit 8366197c01)
2026-01-20 01:02:14 +01:00
Vyacheslav Moklev
33d2e43e35 JBR-1552 Invalid screen bounds in full screen mode
Check is window is not in undecorated state

(cherry picked from commit 5547701e2c)
(cherry picked from commit d5fa62913e)
2026-01-20 01:02:14 +01:00
Vyacheslav Moklev
18129c125c JBR-1509 Client area size is wrong in Borderless mode
Fix client area size

(cherry picked from commit 00d32e58dc)
(cherry picked from commit f78449b302)
2026-01-20 01:02:14 +01:00
Anton Tarasov
1b614ca1bd JBR-1770 [windows] frame does not open as maximized
(cherry picked from commit d9dfc3c6c5)
(cherry picked from commit 7525d41946)
2026-01-20 01:02:14 +01:00
Anton Tarasov
a6c7ecb217 JBR-1693 difficult to input Japanese text with "Fast" Key Repeat
(cherry picked from commit 12de3e287e)
(cherry picked from commit bfa95fd66e)
2026-01-20 01:02:14 +01:00
Anton Tarasov
d1e30999eb JBR-1669 IDE-managed HiDPI mode is broken
(cherry picked from commit 461b0b5cd4)
(cherry picked from commit 3049d42f8c)
2026-01-20 01:02:14 +01:00
Anton Tarasov
be2ee06582 JBR-1650 propagate custom decoration title bar height to native
(cherry picked from commit f6fc65d014)
(cherry picked from commit 34032b2ced)
2026-01-20 01:02:14 +01:00
Anton Tarasov
15fd2a9f14 JBR-1629 Maximized window cut at the right and bottom
(cherry picked from commit 9e768377db)
(cherry picked from commit 0532e6c2aa)
2026-01-20 01:02:13 +01:00
Anton Tarasov
5ee1ee34fe JBR-1492 Not able to start Intellij Idea 2017.2.5 with modified vmoptions
(cherry picked from commit e7ca6db66b)
(cherry picked from commit 88694a6148)
2026-01-20 01:02:13 +01:00
Anton Tarasov
93e375773d JBR-1427 pycharm jupyter preview stuck and no response when click on preview.
(cherry picked from commit 1746b04686)
(cherry picked from commit 3c3c2ffa90)
2026-01-20 01:02:13 +01:00
Anton Tarasov
e239fe5430 IDEA-210154 Borderless UI: Top frame of IDEA window is blue
(cherry picked from commit 2dd4163bc4)
(cherry picked from commit 2f4e023df0)
2026-01-20 01:02:13 +01:00
Anton Tarasov
37cb6282f6 JBR-1351 Borderless UI: Bold frame around IDEA window appears on non-HiDPI display
(cherry picked from commit 06d35de069)
(cherry picked from commit 0bfcc28a7a)
2026-01-20 01:02:13 +01:00
Anton Tarasov
6fc320046c JBR-1313 wrong insets for non-resizable custom-decorated frame
(cherry picked from commit 9179718cb6)
(cherry picked from commit 05f934ea20)
2026-01-20 01:02:13 +01:00
Anton Tarasov
9dea4d96e5 JBR-1293 do not modify client bounds when custom-decorated frame is set undecorated
(cherry picked from commit cb188edaab)
(cherry picked from commit 2cecea407d)
2026-01-20 01:02:13 +01:00
Anton Tarasov
eb4a7d35c0 JBR-1278 allow native border and shadow for custom decoration mode
(cherry picked from commit ec106a58a3)
2026-01-20 01:02:13 +01:00
Anton Tarasov
a9049d0d87 JRE-1232 forwardport: JRE-1228 support custom frame decoration
(cherry picked from commit d2820524a1)
(cherry picked from commit 1ebd6a000b)
2026-01-20 01:02:13 +01:00
Anton Tarasov
d1e761ba01 JRE-1162 [jdk11] support on-the-fly DPI change on linux
(cherry picked from commit c06c4c69d3)
(cherry picked from commit 5138201282)
2026-01-20 01:02:13 +01:00
Anton Tarasov
8e6b71ea79 JRE-1142 [jdk11] hidpi is not detected since Ubuntu 18.04
(cherry picked from commit be4f8c0d9d)
(cherry picked from commit 96b07c6c65)
2026-01-20 01:02:13 +01:00
Anton Tarasov
1558cb5f87 JRE-1111 [JDK11] java/beans/Beans/TypoInBeanDescription.java crashes at libawt_xawt.so+0x4a30d
(cherry picked from commit b89e6aed0b)
(cherry picked from commit 924b6a8bb7)
2026-01-20 01:02:13 +01:00
Anton Tarasov
a8b3079e4c fix JNI_OnUnload definition
(cherry picked from the commit  3571e39071)

(cherry picked from commit 1019d8f0f2)
(cherry picked from commit 4fae6cb785)
2026-01-20 01:02:12 +01:00
Anton Tarasov
2f9de56886 JRE-981 IM workaround does not work anymore
forward port of 2d7c29b in JetBrains/jdk8u_jdk

(cherry picked from commit f3ccc53e02)
(cherry picked from commit 362eaede04)
2026-01-20 01:02:12 +01:00
Anton Tarasov
6e8bb61efd JRE-938 [windows] Frame.setMaximizedBounds not hidpi-aware
(cherry picked from commit cc97899923320e1fa17f5e44975c4a0f0ba51014)
(cherry picked from commit ccfe65be7f)
(cherry picked from commit b86054beb6)
2026-01-20 01:02:12 +01:00
Anton Tarasov
f9fabfa234 JRE-907 macOS: add ability to check for scaled display mode
(cherry picked from commit e496262aa1)
(cherry picked from commit e07eaabe47)
2026-01-20 01:02:12 +01:00
Anton Tarasov
1919d28cfe JRE-934 Diff viewer errors are not visible on HiDPI Linux
(cherry picked from commit 641a09dd52)
(cherry picked from commit c37bfae963)
2026-01-20 01:02:12 +01:00
Anton Tarasov
9fd8a58a33 [jdk9] HiDPI scale is not detected on some linux desktops
(cherry picked from commit 9279d80110)
(cherry picked from commit 57f7da037b)
2026-01-20 01:02:12 +01:00
Anton Tarasov
a86afd48a4 JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 60bb53f919)
2026-01-20 01:02:12 +01:00
Anton Tarasov
2cf043d43f Read org.gnome.desktop.interface/scaling-factor
(cherry picked from commit 277357ae73)
(cherry picked from commit d4f290861b)
2026-01-20 01:02:12 +01:00
Anton Tarasov
8b03bb579e Revert "8239894: Xserver crashes when the wrong high refresh rate is used"
This code is needed for "Read org.gnome.desktop.interface/scaling-factor".
Keep it until "JDK-8260270 Implement the HiDPI scale factor reading" is fixed.

This reverts commit a7c2ebc7

(cherry picked from commit a249b989e1)
2026-01-20 01:02:12 +01:00
Anton Tarasov
bb5d9d7042 Do not scale base font in HiDPI mode on Linux
(cherry picked from commit 6fb2c36529)
(cherry picked from commit b2e47f1be3)
2026-01-20 01:02:12 +01:00
Anton Tarasov
c84dac1e18 JRE-772 swing returns incorrect FRC when AA is off
(cherry picked from commit a161897d908aa10da6306c06452c5d6317fed2f0)
(cherry picked from commit 2bf5a7ca5c)
(cherry picked from commit 2caa4e3c14)
2026-01-20 01:02:12 +01:00
Anton Tarasov
11c517e34b JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit ab6dee4c1fc453ad3cb5adb69fc243e550d184ae)

(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 556d3c5905)
2026-01-20 01:02:12 +01:00
Anton Tarasov
3a2f76ddc6 JRE-665 Navigate Class/File/Symbol, Find in Path popup windows don't pick characters from input method
(cherry picked from commit 676f305b2b3b278e305bd4d9bde4269f27b3d676)
(cherry picked from commit 6ce31e0a32)
(cherry picked from commit b327688b89)
2026-01-20 01:02:11 +01:00
Anton Tarasov
dcc3b7b750 JRE-616 [linux] notify when dpi correction factor is applied to fonts
(cherry picked from commit f57d41f3118bfd773c99ce32d58cfae16931be6a)
(cherry picked from commit 6246abc72f)
(cherry picked from commit 717349c595)
2026-01-20 01:02:11 +01:00
Anton Tarasov
3885475be6 JRE-612 [windows] icon in frame title is not dpi-aware
(cherry picked from commit dec04385177a2abb677add909d3b94f94c62a14e)

(cherry picked from commit 38466cbab0)
(cherry picked from commit 81662b38f5)
2026-01-20 01:02:11 +01:00
Anton Tarasov
970a6238c4 JRE-604 [fps] frame's client area is one pixel beneath frame's borders
Adopted.

(cherry picked from commit ef2870ee38)
(cherry picked from commit 021c8d8b7b)
2026-01-20 01:02:11 +01:00
Anton Tarasov
63d40a7f7d JRE-596 [windows] popup positioning is broken with JRE-573
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit c5cc28d85d)
(cherry picked from commit 496c7d90d2)
2026-01-20 01:02:11 +01:00
Anton Tarasov
235f438b82 JRE-577 Goland 18 displays out of memory
(cherry picked from commit 2daaf21e420d4af15d3b1bfeb3f896074bea1e61)

(cherry picked from commit 9ea2011948)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b6b83ff41f)
2026-01-20 01:02:11 +01:00
Anton Tarasov
91ff828a09 JRE-573 [windows] window client area bounds mismatch
Apply only WmEraseBkgnd

(cherry picked from commit afa68f7ad6440303c6417be3f675b1c4644b6014)

(cherry picked from commit 0651b45e13)
(cherry picked from commit cfeb8ba435)
2026-01-20 01:02:11 +01:00
Anton Tarasov
4dcfc0cf12 JRE-382 Three AWT-tests become hanging starting since master-875
(cherry picked from commit 7d492101db8fcbb3d285fd8e9669f74b0e0fce8f)
(cherry picked from commit b965f85c1b)
(cherry picked from commit 5b61c2f72a)
2026-01-20 01:02:11 +01:00
Anton Tarasov
4e4973d3b9 JRE-373 [macos] nativeCreateNSWindow deadlocks with a11y
(cherry picked from commit 72c77a992bbf1b95b82ffc08cb2f4f3bc36b3657)

(cherry picked from commit aa09fa2c85)
(cherry picked from commit 9b32557ad4)
2026-01-20 01:02:11 +01:00
Anton Tarasov
7298752964 IDEA-172422 Popup at the wrong place on the second monitor (new hidpi)
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 11a0911d65)
(cherry picked from commit 4c8e3a54b3)
2026-01-20 01:02:11 +01:00
Anton Tarasov
970569d55a JRE-309 [windows] on-screen position of a component is not pixel-perfect in user space in JRE-HiDPI mode
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 985908cf10)
(cherry picked from commit f9ff12884e)
2026-01-20 01:02:11 +01:00
Anton Tarasov
7c8f56b8b0 JRE-269 JLabel doesn't scale <code>text</code> HTML fragments.
(cherry picked from commit 9ef72b6c3a477e4225f9b98e30fa9190613520e4)
(cherry picked from commit c17bc728ee)
(cherry picked from commit 99735071ff)
2026-01-20 01:02:11 +01:00
Anton Tarasov
cfe442876b JRE-225 [macos] IDEA hangs on attempt to call getDefaultScreenDevice() from EDT
(cherry picked from commit 76aba25)

(cherry picked from commit df11dcc97bb5556ac5d0299b773a512b4f0bb5bb)
(cherry picked from commit aeea6c1ca3)
(cherry picked from commit 3fbb520b07)
2026-01-20 01:02:10 +01:00
Anton Tarasov
c294b7cd46 JRE-210 JEditorPane may return wrong preferred size as it moves b/w monitors of different scale
(cherry picked from commit 6c3087e6bda32ae9b095e069d8bea614502f5c03)
(cherry picked from commit adb3a4be16)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b987c7a94)
2026-01-20 01:02:10 +01:00
Anton Tarasov
ba68ee471c JRE-119 [suppress updateGC() for WFileDialogPeer/WPrintDialogPeer]
updateGC() is called from WWindowPeer.<init> though it's not applicable to the named dialogs
as they don't have native AwtWindow peer required for the method.

(cherry picked from commit 72ed9f653177e273b811cfe70c2dba102a8636e4)
(cherry picked from commit cec49aaa38)
(cherry picked from commit a279dd9e1c)
2026-01-20 01:02:10 +01:00
Anton Tarasov
7ce22c82f1 JRE-119 [Dynamically set DPI-awareness level to enable backward compatible HiDPI behavior]
Adopted: rely on java.manifest

(cherry picked from commit d00cfa4dc62a14a4cf89df9d4c4899970c9fc9e8)

Adopted

(cherry picked from commit 60be76b725)
(cherry picked from commit 8ec82c766b)
2026-01-20 01:02:10 +01:00
Anton Tarasov
7efb79cba3 JRE-119 [ask if ui scale is enabled natively]
(cherry picked from commit 801f45875fd8699edcbda5896210cec191062261)
(cherry picked from commit 20edebdefa)
(cherry picked from commit 9ac3479114)
2026-01-20 01:02:10 +01:00
Anton Tarasov
5996d75dfa IDEA-153474 let JDK detect Xft.dpi value on non-GTK Linux DEs
Use the GTK method:

https://developer.gnome.org/gobject/stable/gobject-The-Base-Object-Type.html#g-object-get

to retrieve "gtk-xft-dpi" integer property of the X settings.

Add the property to JDK's GtkEngine & gtk2-interface.
Then read the property via GtkEngine from GTK LaF when "gnome.Xft/dpi" is undefined. It's assumed GTK LaF is forcedly installed.

(cherry picked from commit e05fc391ae0a3cc389e836441f882c0cf6ab3b99)
(cherry picked from commit fd615a5b45)
(cherry picked from commit adc80251ad)
2026-01-20 01:02:10 +01:00
Anton Tarasov
59cb58842e IDEA-148854: AppCode crashes randomly every 15 mins or so
(cherry picked from commit 02f9a5fbb4924ff67c8a04c15e490acfcc750003)
(cherry picked from commit b8f4b4a9ed)
(cherry picked from commit b3961bee9d)
2026-01-20 01:02:10 +01:00
Vitaly Provodin
5991ef1249 updated JTreg exclude list
(cherry picked from commit 418fb32e7f)
2026-01-20 01:02:10 +01:00
Alexey Ushakov
7970b17244 IDEA-57233, IDEA-152816, IDEA-152454 Editor font antialising/appearance problems on Linux
Used desktop DPI instead of hard-coded 72
Compensated increased glyph bitmap size by adjusting font size
Added LCD filter for sub-pixel rendering
Use fontconfig library to provide right rendering options for fonts
Corrected sizes passed to fontconfig library and hinting disabling policy
Added logging and versioned fontconfig lib loading
Resolved font rendering problem in lenses
fix text rendering issues (text cutoff and incorrect rendering in editor fragment components)
FcMatchFont-type pattern substitutions shouldn't be invoked before specific font is selected - it can apply unrelated rules
port commit e21cd635 from JBR 9
partially rollback JBR-363 fix, to apply corresponding change from OpenJDK 12

(cherry picked from commit 5d704a963b)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 0456745afb)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 4c8351fecf)
(cherry picked from commit 5faebc73d5)
(cherry picked from commit d1ed8ab118)
(cherry picked from commit 20487c7515)
2026-01-20 01:02:10 +01:00
Vitaly Provodin
f83b3bb8ca JBR-3398 remove the Experimental AOT and JIT Compiler (JEP 410)
(cherry picked from commit df63a5e6ad)
2026-01-20 01:02:10 +01:00
Alexey Ushakov
b9a04a20c5 JBR-2807: JDK15: update modules.list to resolve jbr build failure
removed nashorn modules

(cherry picked from commit c56a18eaf9)
2026-01-20 01:02:10 +01:00
Vitaly Provodin
7c53241aee JBR-2130 remove module jdk.pack
(cherry picked from commit 9acab72161)
2026-01-20 01:02:10 +01:00
Vitaly Provodin
79afb4ea7d JBR-4810 add VERSION_PATCH into version number string
(cherry picked from commit 401a12b6b9)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
3b1ab487f4 JBR-4754 make root directory with the same name as archive name
(cherry picked from commit 97a17c9a36)
2026-01-20 01:02:09 +01:00
Nikita Provotorov
2c232cb484 JBR-2074 Windows 10 AArch64 support: make the build scripts use custom build-jdk.
(cherry picked from commit 3d9869c702)
2026-01-20 01:02:09 +01:00
Nikita Provotorov
119e59239d JBR-2074 Windows 10 AArch64 support: build fixes.
(cherry picked from commit a873008261)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
b7a7a49a0e JBR-4567 replace comma with point in RenderPerf scores
(cherry picked from commit 5b91efd8c0)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
900afe6309 JBR-4520 set file permissions after signing
(cherry picked from commit 64259b866c)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
8eccd3ce69 JBR-4512 windows: include pdb-files into jbrsdk
(cherry picked from commit 606ad057d3)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
d730d334ae JBR-4087 add version info into the name of root directory in JBR tar.gz-distributions
(cherry picked from commit 45eeae64ee)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
6d9f466904 JBR-4511 remove --disable options from configure mac-aarch64 builds & unify configure for x64 and aarch64
(cherry picked from commit b387b2213e)
2026-01-20 01:02:09 +01:00
Maxim Kartashev
9ea1a79037 JBR-4064 Windows: update build scripts to produce more deterministic output
Passed the configure script options necessary to enable reproducible builds
on Windows. With this options, the resulting jars are reproducible, but
native executables and libraries aren't.

(cherry picked from commit c1da1fa0d6)
2026-01-20 01:02:09 +01:00
Vladislav Rassokhin
198db90217 JBR-4451 Make bash scripts safer
(cherry picked from commit 4f048b9790)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
93e253423e JBR-4487 enable Linux 32 builds
(cherry picked from commit 38dbda93d0)
2026-01-20 01:02:09 +01:00
Vitaly Provodin
34ab07852b JBR-4458 enable JBR17 windows 32 bit builds
(cherry picked from commit d3e65953e7)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
b9af7fccf1 JBR-4272 generate and save debug symbols for JBR on macos/linux
(cherry picked from commit ef34e66dbf)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
5732df245c JBR-4053 integrate DCEVM patches as usual commits
(cherry picked from commit 45672abcad)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
e5fa119bd7 JBR-4370 create a test checking all JBR artifacts exist - add exit code
(cherry picked from commit 4dce25a5db)
2026-01-20 01:02:08 +01:00
Nikita Provotorov
ef028b2d7e JBR-2074 Windows 10 AArch64 support: add build and pack scripts.
(cherry picked from commit e33c77a615)
2026-01-20 01:02:08 +01:00
Vladimir Kempik
fba28c89bb JBR-4452: Update crash report message with JBR youtrack link
instead of bugreport.java.com

(cherry picked from commit c52914a035)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
7370c54a0d JBR-4437 add sources to JBRSDK distributions for Windows and Linux
(cherry picked from commit 0399594195)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
f02773a401 JBR-4437 add sources to JBRSDK distributions
(cherry picked from commit a13a015597)
2026-01-20 01:02:08 +01:00
Anton Tarasov
59d6f5475a JBR-3906 JBR for Linux aarch64 with JCEF is missing, is there any support plan?
(cherry picked from commit d47bc61b0e)
2026-01-20 01:02:08 +01:00
Vitaly Provodin
c58f5e302c JBR-4188 add script comparing performance results
add exec permissions && fix misprint in checking if headers exist

move the script comparing performance results from jdk8u_test

(cherry picked from commit 924e7baadd)
2026-01-20 01:02:08 +01:00
Vladimir Kempik
f5da356229 JBR-4283: Provide native JBR builds for alpine Linux-aarch64
(cherry picked from commit 925f02d3c5)
2026-01-20 01:02:08 +01:00
Vladimir Kempik
cd19c1d329 JBR-4242:Provide native JBR builds for alpine Linux
(cherry picked from commit c62e05e7ac)
2026-01-20 01:02:08 +01:00
Maxim Kartashev
8d64634c11 JBR-3917 Problem using windows certificate store (trustStoreType=Windows-ROOT not recognized)
(cherry picked from commit 65abc7b029)
2026-01-20 01:02:07 +01:00
Maxim Kartashev
4104ae65f7 JBR-4145 Make builds independent from build directory
Supplied the --disable-absolute-path-in-output option to the configure script
when building JBR.

(cherry picked from commit 5aa22bb901)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
b7ea4d3e6a JBR-4154 extract version info from sources & JBR-4099 make test-image on jbrsdk_jcef step
(cherry picked from commit f22a76949b)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
29743d500a JBR-4067 fix misprint with applying obsolete exclude_jcef_module.patch
(cherry picked from commit 106349f0fe)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
48f69f5a8a JBR-3756 remove JNF from mac-aarch64 binaries
(cherry picked from commit 011d461c99)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
5ee8ab0e90 JBR-4082 create JBR & JBRSDK installer packages
(cherry picked from commit a2e1fe0fa4)
2026-01-20 01:02:07 +01:00
Maxim Kartashev
63f3a3a4df JBR-4061 Specify build user for the build
(cherry picked from commit 66713adb61)
2026-01-20 01:02:07 +01:00
Maxim Kartashev
78ad057322 JBR-4063 macOS: update build scripts to produce more deterministic output
Make mkimages.sh produce more deterministic .tar.gz archives on MacOS.
NB: build notarization is not in the scope of this change.

(cherry picked from commit e1a1b6814d)
(cherry picked from commit 43f7ebddec)
2026-01-20 01:02:07 +01:00
Maxim Kartashev
03878eb8db JBR-4033 Linux: update build scripts to produce more deterministic output
This commits achieves almost the same build output with the same build
input on Linux. Exceptions are:
- class files timestamps differ in jrt-fs.jar (for all output),
- class files timestamps differ in all the jmod files (for
  jbrsdk...tar.gz).
NB: jbrsdk...test...tar.gz does not need to be deterministic.

This was achieved mainly by
- setting several environment variables (SOURCE_DATE_EPOCH, TZ),
- providing the necessary options to the configure script,
- setting the timestamp of all files that make up the resulting
  archive to SORUCE_DATE_EPOCH and normalizing the list of said
  files before archiving.

(cherry picked from commit ffded82734)
(cherry picked from commit 38ec30a58d)
2026-01-20 01:02:07 +01:00
Maxim Kartashev
722c0b1db5 JBR-4059 Create Dockerfile for building on AArch64 Linux
(cherry picked from commit 249614a30b)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
f305c27848 JBR-3905 add incremental JBR building
(cherry picked from commit 54f28cde44)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
7255a9a621 JBR-3904 fix the image directory name of macos builds
(cherry picked from commit cf13b7c46e)
2026-01-20 01:02:07 +01:00
Vitaly Provodin
eb82348615 configure BOOT_JDK to use JDK 17
(cherry picked from commit d815b82649)
2026-01-20 01:02:06 +01:00
Anton Tarasov
0c7f415352 JBR-3655 jbr-dev build fails to find jcef modules on Windows
(cherry picked from commit f63fd1c8ec)
2026-01-20 01:02:06 +01:00
Maxim Kartashev
1aa9c80e36 JBR-3645 Tool to support keeping JBR in sync with OpenJDK
(cherry picked from commit 21c43f48cf)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
6f217c7ad0 JBR-3639 add jbrsdk tarballs for dcevm, jcef builds
(cherry picked from commit 0117d49591)
2026-01-20 01:02:06 +01:00
Anton Tarasov
7e7e223690 JBR-3627 include jmods in jbrsdk bundle for jbr-dev
(cherry picked from commit f54c836685)
2026-01-20 01:02:06 +01:00
Vitaly.Provodin
c0b7e75ef8 add dockerfile for x86
(cherry picked from commit 8fb2341ea8)
(cherry picked from commit cfbafa6c73)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
b93aa7594d JBR-1505 add jdk.jcmd module into JBR
(cherry picked from commit c40b9c8b9e)
(cherry picked from commit 5362ff99a2)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
fce744712b JBR-2957 notarize JBR and JBRSDK as APPL
(cherry picked from commit 0e7f9ce4ca)
(cherry picked from commit 3f4aee8c63)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
0c2b35e45a JBR-667 add shenandoahgc feature
(cherry picked from commit e15dad04)
(cherry picked from commit 0845bb7308)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
6bd54d7471 configure BOOT_JDK to use JDK 16
(cherry picked from commit 3e34330003)
2026-01-20 01:02:06 +01:00
Anton Tarasov
07068c2578 Add build.gradle
(cherry picked from commit 9d01f893b6)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
0cab3efa54 JBR-3401 enable macos-aarhc64 builds
(cherry picked from commit d2c40f66f8)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
ba2ec47ed6 JBR-3305 remove the option --disable-warnings-as-errors from configure
(cherry picked from commit 301fcb2df1)
2026-01-20 01:02:06 +01:00
Vitaly Provodin
10cb209ade JBR-2922 add JCEF to jbrsdk binaries
& fix a misprint in get_mods_list

JBR-2922 add JCEF to jbrsdk binaries

& fix a misprint in get_mods_list

(cherry picked from commit 6fa3e775ab)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
74edcc7c65 JBR-2912 add JBR 15 builds with DCEVM
(cherry picked from commit 95416c501a)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
6b2267d33e JBR-2864 initial commit of DCEVM patches reworked for 15
(cherry picked from commit a592f63537)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
7ae1092f36 JBR-2812 remove --with-import-modules from configure for aarch64
(cherry picked from commit 49fa98391a)
2026-01-20 01:02:05 +01:00
Anton Tarasov
0500fe3470 JBR-2812 bundle jcef in jmod format instead of modular-sdk
Build test-image with non-jcef build target

(cherry picked from commit 9edee0e476)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
e6153ef3f7 JBR-2787 fix copying jcef files into jbr/jbrsdk binaries
(cherry picked from commit a4269d0907)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
330b55785e JBR-2758 refactor building scripts to apply patches adding required modules instead of excluding
Add jogl and gluegen modules to support jcef osr mode

(cherry picked from commit e2cf692ec5)
2026-01-20 01:02:05 +01:00
Anton Tarasov
8f5933ae71 JBR-2016 add jcef module and export packages to it
(cherry picked from commit cf997f71c6)
(cherry picked from commit cad125e01d)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
017f23b4d8 JBR-2473 modify building scripts to add dcevm clauses, add git config to docker image
(cherry picked from commit 2620c62848)
(cherry picked from commit d9797240fc)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
ce1b9bb8d5 JBR-2395 eliminate JavaFX from JBR
(cherry picked from commit cd7e539561)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
fb52702c3f JBR-2409 fix prameters for configure
(cherry picked from commit f309357fba)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
7f9a543d0b JDK14: exclude dependencies on jcef in x86, fastdebug builds
(cherry picked from commit 14e98eaf94)
2026-01-20 01:02:05 +01:00
Vitaly Provodin
deafb0b8c4 JBR-2396 fix CONF names
(cherry picked from commit 34cd854326)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
d0ce89ca6b JBR-2394 replace --disable-debug-symbols with --with-native-debug-symbols=none
(cherry picked from commit 79ff0cb7b3)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
5c806e4cd6 add exec permitions to configure
(cherry picked from commit bf2e441e09)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
f309e06f1f split checkout before building JBR+JFX or JBR+JCEF on two separate commands
(cherry picked from commit b7030bae8e)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
59fe264b62 change BOOT_JDK, fix target names
(cherry picked from commit 6a778fa6ea)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
f366f6e94c JBR-2291 add vendor info into bundles
(cherry picked from commit 026fcaaf2b)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
7646b1bca9 JBR-2324 address new layout in mac jcef 80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit 6f45378ed9)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
6cdf445330 JBR-2320 add jdk.attach module into JBR
(cherry picked from commit a1884561bd)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
730ffeebfa JBR-2217 provide JCEF-only (no JavaFX) bundle for master/202 branches
(cherry picked from commit d5fef466f4)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
49eda28865 JBR-2212 add scripts for linux_x86, linux_aarch64, linux_x64_fastdebug, osx_fastdebug, windows_x86
(cherry picked from commit 211b306949)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
e034626f78 JBR-1643 fix intermittent fialures of Windows builds at make/Init.gmk:304
combine images and test-image into one make invocation

(cherry picked from commit ad32f648b5)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
7ba85a0510 JBR-2181 create two separate JBR bundles with JFX and JFX+JCEF
(cherry picked from commit a26a1dcef0)
2026-01-20 01:02:04 +01:00
Vitaly Provodin
8865edb913 JBR-2148 modify signapp&build scripts to match to the new layout
(cherry picked from commit 7cdd4cbf4a)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
e98cdc2126 JBR-2084 modify scripts to sign Contents/MacOS/libjli.dylib as a a normal file
(cherry picked from commit 47ac942dfb)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
efe911f1f4 JBR-1821 notarize JBR bundles as a standalone app
(cherry picked from commit 96e733ed79)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
e2bdc26f2f JBR-2162 move building scripts from TC to JBR repo
(cherry picked from commit 6f4774c0d4)
2026-01-20 01:02:03 +01:00
Anton Tarasov
4abd1e1b9a JBR-2016 add jcef module and export some sun.* packages to it
(cherry picked from commit 193da0eff7)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
fb5d9c7b97 JBR-2014 add jdk.hotspot.agent module to jbr
(cherry picked from commit b352fa1b54)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
7f25dc421a JBR-1286 add jdk.compiler into JBR
(cherry picked from commit 245db892cd)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
1c64da765d JBR-1199 add JBR modules list for jlink
(cherry picked from commit ff8dc6567f)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
be4bef984c Update docker script to create jdk15 build env
(cherry picked from commit cd5b1b94e7)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
098d1f077d JBR-3045 add pressing ESC to close the dialog after test completion
(cherry picked from commit 44d8b28b0b)
(cherry picked from commit c98106b4b0)
2026-01-20 01:02:03 +01:00
Vitaly Provodin
9da130318c JBR-3040 press the button END at the beggining in order to avoid text selection
(cherry picked from commit 1c2bf33db2)
(cherry picked from commit aeab9ef42c)
2026-01-20 01:02:03 +01:00
Vitaly.Provodin
965a143e12 updated JTreg exclude list
(cherry picked from commit 6d1cee2181)
2026-01-20 01:02:03 +01:00
475 changed files with 10521 additions and 14740 deletions

View File

@@ -69,18 +69,22 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
# Debug prefix mapping if supported by compiler
DEBUG_PREFIX_CFLAGS=
UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: literal,
DEFAULT: [auto], VALID_VALUES: [auto 1 2 3],
CHECK_AVAILABLE: [
if test x$TOOLCHAIN_TYPE = xmicrosoft; then
AVAILABLE=false
fi
],
UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: string,
DEFAULT: "",
RESULT: DEBUG_SYMBOLS_LEVEL,
DESC: [set the native debug symbol level (GCC and Clang only)],
DEFAULT_DESC: [toolchain default],
IF_AUTO: [
RESULT=""
])
DEFAULT_DESC: [toolchain default])
AC_SUBST(DEBUG_SYMBOLS_LEVEL)
if test "x${TOOLCHAIN_TYPE}" = xgcc || \
test "x${TOOLCHAIN_TYPE}" = xclang; then
DEBUG_SYMBOLS_LEVEL_FLAGS="-g"
if test "x${DEBUG_SYMBOLS_LEVEL}" != "x"; then
DEBUG_SYMBOLS_LEVEL_FLAGS="-g${DEBUG_SYMBOLS_LEVEL}"
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_SYMBOLS_LEVEL_FLAGS}],
IF_FALSE: AC_MSG_ERROR("Debug info level ${DEBUG_SYMBOLS_LEVEL} is not supported"))
fi
fi
# Debug symbols
if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -107,8 +111,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
fi
# Debug info level should follow the debug format to be effective.
CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
elif test "x$TOOLCHAIN_TYPE" = xclang; then
if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
# Check if compiler supports -fdebug-prefix-map. If so, use that to make
@@ -128,8 +132,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
IF_FALSE: [GDWARF_FLAGS=""])
# Debug info level should follow the debug format to be effective.
CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
CFLAGS_DEBUG_SYMBOLS="-Z7"
fi

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -61,8 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
DISABLED_WARNINGS_gcc := format-nonliteral maybe-uninitialized undef \
unused-result zero-as-null-pointer-constant, \
DISABLED_WARNINGS_clang := format-nonliteral undef unused-result \
zero-as-null-pointer-constant, \
DISABLED_WARNINGS_clang := format-nonliteral undef unused-result, \
DISABLED_WARNINGS_microsoft := 4530, \
DEFAULT_CFLAGS := false, \
CFLAGS := $(JVM_CFLAGS) \

View File

@@ -31,14 +31,13 @@ include LibCommon.gmk
## Build libjaas
################################################################################
ifeq ($(call isTargetOs, windows), true)
$(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
NAME := jaas, \
OPTIMIZATION := LOW, \
EXTRA_HEADER_DIRS := java.base:libjava, \
LIBS_windows := advapi32.lib mpr.lib netapi32.lib user32.lib, \
))
$(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
NAME := jaas, \
OPTIMIZATION := LOW, \
EXTRA_HEADER_DIRS := java.base:libjava, \
LIBS_windows := advapi32.lib mpr.lib netapi32.lib user32.lib, \
))
TARGETS += $(BUILD_LIBJAAS)
TARGETS += $(BUILD_LIBJAAS)
endif
################################################################################

View File

@@ -5782,9 +5782,6 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
// return false;
bind(A_IS_NOT_NULL);
ldrw(cnt1, Address(a1, length_offset));
ldrw(tmp5, Address(a2, length_offset));
cmp(cnt1, tmp5);
br(NE, DONE); // If lengths differ, return false
// Increase loop counter by diff between base- and actual start-offset.
addw(cnt1, cnt1, extra_length);
lea(a1, Address(a1, start_offset));
@@ -5851,9 +5848,6 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
cbz(a1, DONE);
ldrw(cnt1, Address(a1, length_offset));
cbz(a2, DONE);
ldrw(tmp5, Address(a2, length_offset));
cmp(cnt1, tmp5);
br(NE, DONE); // If lengths differ, return false
// Increase loop counter by diff between base- and actual start-offset.
addw(cnt1, cnt1, extra_length);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
* Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -722,20 +722,22 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
// Class initialization barrier for static methods
entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
Label L_skip_barrier;
if (VM_Version::supports_fast_class_init_checks()) {
Label L_skip_barrier;
// Bypass the barrier for non-static methods
__ ldrh(rscratch1, Address(rmethod, Method::access_flags_offset()));
__ andsw(zr, rscratch1, JVM_ACC_STATIC);
__ br(Assembler::EQ, L_skip_barrier); // non-static
{ // Bypass the barrier for non-static methods
__ ldrh(rscratch1, Address(rmethod, Method::access_flags_offset()));
__ andsw(zr, rscratch1, JVM_ACC_STATIC);
__ br(Assembler::EQ, L_skip_barrier); // non-static
}
__ load_method_holder(rscratch2, rmethod);
__ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
__ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
__ load_method_holder(rscratch2, rmethod);
__ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
__ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
}
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->c2i_entry_barrier(masm);
@@ -1506,8 +1508,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// SVC, HVC, or SMC. Make it a NOP.
__ nop();
if (method->needs_clinit_barrier()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
Label L_skip_barrier;
__ mov_metadata(rscratch2, method->method_holder()); // InstanceKlass*
__ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -2290,8 +2290,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
__ subs(zr, temp, (int) code); // have we resolved this bytecode?
// Class initialization barrier for static methods
if (bytecode() == Bytecodes::_invokestatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
__ br(Assembler::NE, L_clinit_barrier_slow);
__ ldr(temp, Address(Rcache, in_bytes(ResolvedMethodEntry::method_offset())));
__ load_method_holder(temp, temp);
@@ -2341,8 +2340,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
__ subs(zr, temp, (int) code); // have we resolved this bytecode?
// Class initialization barrier for static fields
if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() &&
(bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
const Register field_holder = temp;
__ br(Assembler::NE, L_clinit_barrier_slow);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -356,10 +356,10 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
assert(is_interpreted_frame(), "Not an interpreted frame");
// These are reasonable sanity checks
if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
return false;
}
if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
return false;
}
if (fp() + interpreter_frame_initial_sp_offset < sp()) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@ void NativeMovConstReg::set_data(intptr_t x, address pc) {
address addr = oop_addr != nullptr ? (address)oop_addr : (address)metadata_addr;
if (pc == nullptr) {
if(pc == 0) {
offset = addr - instruction_address() - 8;
} else {
offset = addr - pc - 8;
@@ -228,7 +228,7 @@ void NativeMovConstReg::set_data(intptr_t x, address pc) {
void NativeMovConstReg::set_pc_relative_offset(address addr, address pc) {
int offset;
if (pc == nullptr) {
if (pc == 0) {
offset = addr - instruction_address() - 8;
} else {
offset = addr - pc - 8;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -371,7 +371,7 @@ class NativeMovConstReg: public NativeInstruction {
public:
intptr_t data() const;
void set_data(intptr_t x, address pc = nullptr);
void set_data(intptr_t x, address pc = 0);
bool is_pc_relative() {
return !is_movw();
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2025 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1237,24 +1237,26 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
// Class initialization barrier for static methods
entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
Label L_skip_barrier;
if (VM_Version::supports_fast_class_init_checks()) {
Label L_skip_barrier;
// Bypass the barrier for non-static methods
__ lhz(R0, in_bytes(Method::access_flags_offset()), R19_method);
__ andi_(R0, R0, JVM_ACC_STATIC);
__ beq(CR0, L_skip_barrier); // non-static
{ // Bypass the barrier for non-static methods
__ lhz(R0, in_bytes(Method::access_flags_offset()), R19_method);
__ andi_(R0, R0, JVM_ACC_STATIC);
__ beq(CR0, L_skip_barrier); // non-static
}
Register klass = R11_scratch1;
__ load_method_holder(klass, R19_method);
__ clinit_barrier(klass, R16_thread, &L_skip_barrier /*L_fast_path*/);
Register klass = R11_scratch1;
__ load_method_holder(klass, R19_method);
__ clinit_barrier(klass, R16_thread, &L_skip_barrier /*L_fast_path*/);
__ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub(), R0);
__ mtctr(klass);
__ bctr();
__ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub(), R0);
__ mtctr(klass);
__ bctr();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
}
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->c2i_entry_barrier(masm, /* tmp register*/ ic_klass, /* tmp register*/ receiver_klass, /* tmp register*/ code);
@@ -2208,8 +2210,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// --------------------------------------------------------------------------
vep_start_pc = (intptr_t)__ pc();
if (method->needs_clinit_barrier()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
Label L_skip_barrier;
Register klass = r_temp_1;
// Notify OOP recorder (don't need the relocation)

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2025 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -2199,8 +2199,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no, Register Rca
__ isync(); // Order load wrt. succeeding loads.
// Class initialization barrier for static methods
if (bytecode() == Bytecodes::_invokestatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
const Register method = Rscratch;
const Register klass = Rscratch;
@@ -2245,8 +2244,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no, Register Rcac
__ isync(); // Order load wrt. succeeding loads.
// Class initialization barrier for static fields
if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() &&
(bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
const Register field_holder = R4_ARG2;
// InterpreterRuntime::resolve_get_put sets field_holder and finally release-stores put_code.

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,7 +213,7 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm) {
// Is vector's size (in bytes) bigger than a size saved by default?
// riscv does not ovlerlay the floating-point registers on vector registers like aarch64.
bool SharedRuntime::is_wide_vector(int size) {
return UseRVV && size > 0;
return UseRVV;
}
// ---------------------------------------------------------------------------
@@ -637,20 +637,22 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
// Class initialization barrier for static methods
entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
Label L_skip_barrier;
if (VM_Version::supports_fast_class_init_checks()) {
Label L_skip_barrier;
// Bypass the barrier for non-static methods
__ load_unsigned_short(t0, Address(xmethod, Method::access_flags_offset()));
__ test_bit(t1, t0, exact_log2(JVM_ACC_STATIC));
__ beqz(t1, L_skip_barrier); // non-static
{ // Bypass the barrier for non-static methods
__ load_unsigned_short(t0, Address(xmethod, Method::access_flags_offset()));
__ test_bit(t1, t0, exact_log2(JVM_ACC_STATIC));
__ beqz(t1, L_skip_barrier); // non-static
}
__ load_method_holder(t1, xmethod);
__ clinit_barrier(t1, t0, &L_skip_barrier);
__ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
__ load_method_holder(t1, xmethod);
__ clinit_barrier(t1, t0, &L_skip_barrier);
__ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
}
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->c2i_entry_barrier(masm);
@@ -1441,8 +1443,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ nop(); // 4 bytes
}
if (method->needs_clinit_barrier()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
Label L_skip_barrier;
__ mov_metadata(t1, method->method_holder()); // InstanceKlass*
__ clinit_barrier(t1, t0, &L_skip_barrier);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2192,8 +2192,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
__ mv(t0, (int) code);
// Class initialization barrier for static methods
if (bytecode() == Bytecodes::_invokestatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
__ bne(temp, t0, L_clinit_barrier_slow); // have we resolved this bytecode?
__ ld(temp, Address(Rcache, in_bytes(ResolvedMethodEntry::method_offset())));
__ load_method_holder(temp, temp);
@@ -2244,8 +2243,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
__ mv(t0, (int) code); // have we resolved this bytecode?
// Class initialization barrier for static fields
if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() &&
(bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
const Register field_holder = temp;
__ bne(temp, t0, L_clinit_barrier_slow);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2024 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1567,8 +1567,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
//---------------------------------------------------------------------
wrapper_VEPStart = __ offset();
if (method->needs_clinit_barrier()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
Label L_skip_barrier;
Register klass = Z_R1_scratch;
// Notify OOP recorder (don't need the relocation)
@@ -2379,22 +2378,24 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
// Class initialization barrier for static methods
entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
Label L_skip_barrier;
if (VM_Version::supports_fast_class_init_checks()) {
Label L_skip_barrier;
// Bypass the barrier for non-static methods
__ testbit_ushort(Address(Z_method, Method::access_flags_offset()), JVM_ACC_STATIC_BIT);
__ z_bfalse(L_skip_barrier); // non-static
{ // Bypass the barrier for non-static methods
__ testbit_ushort(Address(Z_method, Method::access_flags_offset()), JVM_ACC_STATIC_BIT);
__ z_bfalse(L_skip_barrier); // non-static
}
Register klass = Z_R11;
__ load_method_holder(klass, Z_method);
__ clinit_barrier(klass, Z_thread, &L_skip_barrier /*L_fast_path*/);
Register klass = Z_R11;
__ load_method_holder(klass, Z_method);
__ clinit_barrier(klass, Z_thread, &L_skip_barrier /*L_fast_path*/);
__ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub());
__ z_br(klass);
__ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub());
__ z_br(klass);
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
}
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
return;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2024 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -2377,8 +2377,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
__ z_cli(Address(Rcache, bc_offset), code);
// Class initialization barrier for static methods
if (bytecode() == Bytecodes::_invokestatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
const Register method = Z_R1_scratch;
const Register klass = Z_R1_scratch;
__ z_brne(L_clinit_barrier_slow);
@@ -2428,8 +2427,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
__ z_cli(Address(cache, code_offset), code);
// Class initialization barrier for static fields
if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() &&
(bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
const Register field_holder = index;
__ z_brne(L_clinit_barrier_slow);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1043,24 +1043,26 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
// Class initialization barrier for static methods
entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
Label L_skip_barrier;
Register method = rbx;
if (VM_Version::supports_fast_class_init_checks()) {
Label L_skip_barrier;
Register method = rbx;
// Bypass the barrier for non-static methods
Register flags = rscratch1;
__ load_unsigned_short(flags, Address(method, Method::access_flags_offset()));
__ testl(flags, JVM_ACC_STATIC);
__ jcc(Assembler::zero, L_skip_barrier); // non-static
{ // Bypass the barrier for non-static methods
Register flags = rscratch1;
__ load_unsigned_short(flags, Address(method, Method::access_flags_offset()));
__ testl(flags, JVM_ACC_STATIC);
__ jcc(Assembler::zero, L_skip_barrier); // non-static
}
Register klass = rscratch1;
__ load_method_holder(klass, method);
__ clinit_barrier(klass, &L_skip_barrier /*L_fast_path*/);
Register klass = rscratch1;
__ load_method_holder(klass, method);
__ clinit_barrier(klass, &L_skip_barrier /*L_fast_path*/);
__ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub())); // slow path
__ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub())); // slow path
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
__ bind(L_skip_barrier);
entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
}
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->c2i_entry_barrier(masm);
@@ -1902,8 +1904,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
int vep_offset = ((intptr_t)__ pc()) - start;
if (method->needs_clinit_barrier()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
Label L_skip_barrier;
Register klass = r10;
__ mov_metadata(klass, method->method_holder()); // InstanceKlass*
@@ -3601,3 +3602,4 @@ RuntimeStub* SharedRuntime::generate_jfr_return_lease() {
}
#endif // INCLUDE_JFR

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2216,8 +2216,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
__ cmpl(temp, code); // have we resolved this bytecode?
// Class initialization barrier for static methods
if (bytecode() == Bytecodes::_invokestatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
const Register method = temp;
const Register klass = temp;
@@ -2265,8 +2264,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
__ cmpl(temp, code); // have we resolved this bytecode?
// Class initialization barrier for static fields
if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
if (VM_Version::supports_fast_class_init_checks() &&
(bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
const Register field_holder = temp;
__ jcc(Assembler::notEqual, L_clinit_barrier_slow);

View File

@@ -132,7 +132,7 @@ public:
static const char* tagToStr(uint32_t user_tag) {
switch (user_tag) {
case 0:
return nullptr;
return 0;
X1(MALLOC, malloc);
X1(MALLOC_SMALL, malloc_small);
X1(MALLOC_LARGE, malloc_large);

View File

@@ -628,7 +628,7 @@ static void *thread_native_entry(Thread *thread) {
log_info(os, thread)("Thread finished (tid: %zu, pthread id: %zu).",
os::current_thread_id(), (uintx) pthread_self());
return nullptr;
return 0;
}
bool os::create_thread(Thread* thread, ThreadType thr_type,
@@ -1424,7 +1424,7 @@ int os::get_loaded_modules_info(os::LoadedModulesCallbackFunc callback, void *pa
#elif defined(__APPLE__)
for (uint32_t i = 1; i < _dyld_image_count(); i++) {
// Value for top_address is returned as 0 since we don't have any information about module size
if (callback(_dyld_get_image_name(i), (address)_dyld_get_image_header(i), nullptr, param)) {
if (callback(_dyld_get_image_name(i), (address)_dyld_get_image_header(i), (address)0, param)) {
return 1;
}
}

View File

@@ -188,7 +188,7 @@ class CachedMetric : public CHeapObj<mtInternal>{
volatile jlong _next_check_counter;
public:
CachedMetric() {
_metric = static_cast<MetricType>(value_unlimited);
_metric = value_unlimited;
_next_check_counter = min_jlong;
}
bool should_check_metric() {

View File

@@ -304,13 +304,12 @@ void OSContainer::print_container_metric(outputStream* st, const char* metrics,
constexpr int longest_value = max_length - 11; // Max length - shortest "metric: " string ("cpu_quota: ")
char value_str[longest_value + 1] = {};
os::snprintf_checked(value_str, longest_value, metric_fmt<T>::fmt, value);
const int pad_width = max_length - static_cast<int>(strlen(metrics)) - 2; // -2 for the ": "
const char* unit_prefix = unit[0] != '\0' ? " " : "";
char line[128] = {};
os::snprintf_checked(line, sizeof(line), "%s: %*s%s%s", metrics, pad_width, value_str, unit_prefix, unit);
st->print_cr("%s", line);
st->print("%s: %*s", metrics, max_length - static_cast<int>(strlen(metrics)) - 2, value_str); // -2 for the ": "
if (unit[0] != '\0') {
st->print_cr(" %s", unit);
} else {
st->print_cr("");
}
}
void OSContainer::print_container_helper(outputStream* st, MetricResult& res, const char* metrics) {

View File

@@ -4967,14 +4967,9 @@ int os::open(const char *path, int oflag, int mode) {
oflag |= O_CLOEXEC;
int fd = ::open(path, oflag, mode);
// No further checking is needed if open() returned an error or
// access mode is not read only.
if (fd == -1 || (oflag & O_ACCMODE) != O_RDONLY) {
return fd;
}
if (fd == -1) return -1;
// If the open succeeded and is read only, the file might be a directory
// which the JVM doesn't allow to be read.
//If the open succeeded, the file might still be a directory
{
struct stat buf;
int ret = ::fstat(fd, &buf);

View File

@@ -112,10 +112,6 @@ static void save_memory_to_file(char* addr, size_t size) {
result = ::close(fd);
if (result == OS_ERR) {
warning("Could not close %s: %s\n", destfile, os::strerror(errno));
} else {
if (!successful_write) {
remove(destfile);
}
}
}
FREE_C_HEAP_ARRAY(char, destfile);
@@ -953,7 +949,6 @@ static int create_sharedmem_file(const char* dirname, const char* filename, size
warning("Insufficient space for shared memory file: %s/%s\n", dirname, filename);
}
result = OS_ERR;
remove(filename);
break;
}
}

View File

@@ -571,12 +571,7 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
}
if (is_excluded(klass)) {
ResourceMark rm;
aot_log_trace(aot)("pointer set to null: class (excluded): %s", klass->external_name());
return set_to_null;
}
if (klass->is_array_klass() && CDSConfig::is_dumping_dynamic_archive()) {
ResourceMark rm;
aot_log_trace(aot)("pointer set to null: array class not supported in dynamic region: %s", klass->external_name());
log_debug(cds, dynamic)("Skipping class (excluded): %s", klass->external_name());
return set_to_null;
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -209,17 +209,6 @@ void G1Arguments::initialize() {
FLAG_SET_DEFAULT(GCTimeRatio, 24);
}
// Do not interfere with GC-Pressure driven heap resizing unless the user
// explicitly sets otherwise. G1 heap sizing should be free to grow or shrink
// the heap based on GC pressure, rather than being forced to satisfy
// MinHeapFreeRatio or MaxHeapFreeRatio defaults that the user did not set.
if (FLAG_IS_DEFAULT(MinHeapFreeRatio)) {
FLAG_SET_DEFAULT(MinHeapFreeRatio, 0);
}
if (FLAG_IS_DEFAULT(MaxHeapFreeRatio)) {
FLAG_SET_DEFAULT(MaxHeapFreeRatio, 100);
}
// Below, we might need to calculate the pause time interval based on
// the pause target. When we do so we are going to give G1 maximum
// flexibility and allow it to do pauses when it needs to. So, we'll

View File

@@ -70,11 +70,7 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
template <DecoratorSet decorators, typename T>
inline void G1BarrierSet::write_ref_field_post(T* field) {
// Make sure that the card table reference is read only once. Otherwise the compiler
// might reload that value in the two accesses below, that could cause writes to
// the wrong card table.
CardTable* card_table = AtomicAccess::load(&_card_table);
CardValue* byte = card_table->byte_for(field);
volatile CardValue* byte = _card_table->byte_for(field);
if (*byte == G1CardTable::clean_card_val()) {
*byte = G1CardTable::dirty_card_val();
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
#include "gc/g1/g1BatchedTask.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1GCParPhaseTimesTracker.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/growableArray.hpp"
void G1AbstractSubTask::record_work_item(uint worker_id, uint index, size_t count) {
@@ -39,7 +40,7 @@ const char* G1AbstractSubTask::name() const {
}
bool G1BatchedTask::try_claim_serial_task(int& task) {
task = _num_serial_tasks_done.fetch_then_add(1);
task = AtomicAccess::fetch_then_add(&_num_serial_tasks_done, 1);
return task < _serial_tasks.length();
}
@@ -95,8 +96,8 @@ void G1BatchedTask::work(uint worker_id) {
}
G1BatchedTask::~G1BatchedTask() {
assert(_num_serial_tasks_done.load_relaxed() >= _serial_tasks.length(),
"Only %d tasks of %d claimed", _num_serial_tasks_done.load_relaxed(), _serial_tasks.length());
assert(AtomicAccess::load(&_num_serial_tasks_done) >= _serial_tasks.length(),
"Only %d tasks of %d claimed", AtomicAccess::load(&_num_serial_tasks_done), _serial_tasks.length());
for (G1AbstractSubTask* task : _parallel_tasks) {
delete task;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
#include "gc/g1/g1GCPhaseTimes.hpp"
#include "gc/shared/workerThread.hpp"
#include "memory/allocation.hpp"
#include "runtime/atomic.hpp"
template <typename E, MemTag MT>
class GrowableArrayCHeap;
@@ -121,7 +120,7 @@ public:
// 5) ~T()
//
class G1BatchedTask : public WorkerTask {
Atomic<int> _num_serial_tasks_done;
volatile int _num_serial_tasks_done;
G1GCPhaseTimes* _phase_times;
bool try_claim_serial_task(int& task);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,20 +44,20 @@ G1CardTableClaimTable::~G1CardTableClaimTable() {
void G1CardTableClaimTable::initialize(uint max_reserved_regions) {
assert(_card_claims == nullptr, "Must not be initialized twice");
_card_claims = NEW_C_HEAP_ARRAY(Atomic<uint>, max_reserved_regions, mtGC);
_card_claims = NEW_C_HEAP_ARRAY(uint, max_reserved_regions, mtGC);
_max_reserved_regions = max_reserved_regions;
reset_all_to_unclaimed();
}
void G1CardTableClaimTable::reset_all_to_unclaimed() {
for (uint i = 0; i < _max_reserved_regions; i++) {
_card_claims[i].store_relaxed(0);
_card_claims[i] = 0;
}
}
void G1CardTableClaimTable::reset_all_to_claimed() {
for (uint i = 0; i < _max_reserved_regions; i++) {
_card_claims[i].store_relaxed((uint)G1HeapRegion::CardsPerRegion);
_card_claims[i] = (uint)G1HeapRegion::CardsPerRegion;
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
#include "gc/g1/g1CardTable.hpp"
#include "memory/allocation.hpp"
#include "runtime/atomic.hpp"
class G1HeapRegionClosure;
@@ -46,7 +45,7 @@ class G1CardTableClaimTable : public CHeapObj<mtGC> {
// Card table iteration claim values for every heap region, from 0 (completely unclaimed)
// to (>=) G1HeapRegion::CardsPerRegion (completely claimed).
Atomic<uint>* _card_claims;
uint volatile* _card_claims;
uint _cards_per_chunk; // For conversion between card index and chunk index.

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,25 +29,26 @@
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1HeapRegion.inline.hpp"
#include "runtime/atomicAccess.hpp"
bool G1CardTableClaimTable::has_unclaimed_cards(uint region) {
assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
return _card_claims[region].load_relaxed() < G1HeapRegion::CardsPerRegion;
return AtomicAccess::load(&_card_claims[region]) < G1HeapRegion::CardsPerRegion;
}
void G1CardTableClaimTable::reset_to_unclaimed(uint region) {
assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
_card_claims[region].store_relaxed(0u);
AtomicAccess::store(&_card_claims[region], 0u);
}
uint G1CardTableClaimTable::claim_cards(uint region, uint increment) {
assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
return _card_claims[region].fetch_then_add(increment, memory_order_relaxed);
return AtomicAccess::fetch_then_add(&_card_claims[region], increment, memory_order_relaxed);
}
uint G1CardTableClaimTable::claim_chunk(uint region) {
assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
return _card_claims[region].fetch_then_add(cards_per_chunk(), memory_order_relaxed);
return AtomicAccess::fetch_then_add(&_card_claims[region], cards_per_chunk(), memory_order_relaxed);
}
uint G1CardTableClaimTable::claim_all_cards(uint region) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "gc/g1/g1HeapRegion.hpp"
#include "memory/allocation.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/concurrentHashTable.inline.hpp"
#include "utilities/concurrentHashTableTasks.inline.hpp"
@@ -60,7 +60,7 @@ class G1CodeRootSetHashTable : public CHeapObj<mtGC> {
HashTable _table;
HashTableScanTask _table_scanner;
Atomic<size_t> _num_entries;
size_t volatile _num_entries;
bool is_empty() const { return number_of_entries() == 0; }
@@ -120,7 +120,7 @@ public:
bool grow_hint = false;
bool inserted = _table.insert(Thread::current(), lookup, method, &grow_hint);
if (inserted) {
_num_entries.add_then_fetch(1u);
AtomicAccess::inc(&_num_entries);
}
if (grow_hint) {
_table.grow(Thread::current());
@@ -131,7 +131,7 @@ public:
HashTableLookUp lookup(method);
bool removed = _table.remove(Thread::current(), lookup);
if (removed) {
_num_entries.sub_then_fetch(1u);
AtomicAccess::dec(&_num_entries);
}
return removed;
}
@@ -182,7 +182,7 @@ public:
guarantee(succeeded, "unable to clean table");
if (num_deleted != 0) {
size_t current_size = _num_entries.sub_then_fetch(num_deleted);
size_t current_size = AtomicAccess::sub(&_num_entries, num_deleted);
shrink_to_match(current_size);
}
}
@@ -226,7 +226,7 @@ public:
size_t mem_size() { return sizeof(*this) + _table.get_mem_size(Thread::current()); }
size_t number_of_entries() const { return _num_entries.load_relaxed(); }
size_t number_of_entries() const { return AtomicAccess::load(&_num_entries); }
};
uintx G1CodeRootSetHashTable::HashTableLookUp::get_hash() const {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@
#include "memory/allocation.hpp"
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/threadSMR.hpp"
#include "utilities/bitMap.hpp"
@@ -125,7 +124,7 @@ class G1JavaThreadsListClaimer : public StackObj {
ThreadsListHandle _list;
uint _claim_step;
Atomic<uint> _cur_claim;
volatile uint _cur_claim;
// Attempts to claim _claim_step JavaThreads, returning an array of claimed
// JavaThread* with count elements. Returns null (and a zero count) if there
@@ -1268,6 +1267,7 @@ public:
bool is_marked(oop obj) const;
inline static bool is_obj_filler(const oop obj);
// Determine if an object is dead, given the object and also
// the region to which the object belongs.
inline bool is_obj_dead(const oop obj, const G1HeapRegion* hr) const;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,10 +38,10 @@
#include "gc/g1/g1Policy.hpp"
#include "gc/g1/g1RegionPinCache.inline.hpp"
#include "gc/g1/g1RemSet.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
#include "gc/shared/markBitMap.inline.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "oops/stackChunkOop.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/threadSMR.inline.hpp"
#include "utilities/bitMap.inline.hpp"
@@ -53,10 +53,10 @@ inline bool G1STWIsAliveClosure::do_object_b(oop p) {
inline JavaThread* const* G1JavaThreadsListClaimer::claim(uint& count) {
count = 0;
if (_cur_claim.load_relaxed() >= _list.length()) {
if (AtomicAccess::load(&_cur_claim) >= _list.length()) {
return nullptr;
}
uint claim = _cur_claim.fetch_then_add(_claim_step);
uint claim = AtomicAccess::fetch_then_add(&_cur_claim, _claim_step);
if (claim >= _list.length()) {
return nullptr;
}
@@ -230,11 +230,16 @@ inline bool G1CollectedHeap::requires_barriers(stackChunkOop obj) const {
return !heap_region_containing(obj)->is_young(); // is_in_young does an unnecessary null check
}
inline bool G1CollectedHeap::is_obj_filler(const oop obj) {
Klass* k = obj->klass_without_asserts();
return k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass();
}
inline bool G1CollectedHeap::is_obj_dead(const oop obj, const G1HeapRegion* hr) const {
assert(!hr->is_free(), "looking up obj " PTR_FORMAT " in Free region %u", p2i(obj), hr->hrm_index());
if (hr->is_in_parsable_area(obj)) {
// This object is in the parsable part of the heap, live unless scrubbed.
return is_filler_object(obj);
return is_obj_filler(obj);
} else {
// From Remark until a region has been concurrently scrubbed, parts of the
// region is not guaranteed to be parsable. Use the bitmap for liveness.

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "gc/g1/g1CollectionSetChooser.hpp"
#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
#include "gc/shared/space.hpp"
#include "runtime/atomic.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/quickSort.hpp"
// Determine collection set candidates (from marking): For all regions determine
@@ -50,7 +50,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
G1HeapRegion** _data;
Atomic<uint> _cur_claim_idx;
uint volatile _cur_claim_idx;
static int compare_region_gc_efficiency(G1HeapRegion** rr1, G1HeapRegion** rr2) {
G1HeapRegion* r1 = *rr1;
@@ -105,7 +105,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
// Claim a new chunk, returning its bounds [from, to[.
void claim_chunk(uint& from, uint& to) {
uint result = _cur_claim_idx.add_then_fetch(_chunk_size);
uint result = AtomicAccess::add(&_cur_claim_idx, _chunk_size);
assert(_max_size > result - 1,
"Array too small, is %u should be %u with chunk size %u.",
_max_size, result, _chunk_size);
@@ -121,15 +121,14 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
}
void sort_by_gc_efficiency() {
uint length = _cur_claim_idx.load_relaxed();
if (length == 0) {
if (_cur_claim_idx == 0) {
return;
}
for (uint i = length; i < _max_size; i++) {
for (uint i = _cur_claim_idx; i < _max_size; i++) {
assert(_data[i] == nullptr, "must be");
}
qsort(_data, length, sizeof(_data[0]), (_sort_Fn)compare_region_gc_efficiency);
for (uint i = length; i < _max_size; i++) {
qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)compare_region_gc_efficiency);
for (uint i = _cur_claim_idx; i < _max_size; i++) {
assert(_data[i] == nullptr, "must be");
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,9 +51,6 @@
#include "gc/shared/gcTimer.hpp"
#include "gc/shared/gcTraceTime.inline.hpp"
#include "gc/shared/gcVMOperations.hpp"
#include "gc/shared/partialArraySplitter.inline.hpp"
#include "gc/shared/partialArrayState.hpp"
#include "gc/shared/partialArrayTaskStats.hpp"
#include "gc/shared/referencePolicy.hpp"
#include "gc/shared/suspendibleThreadSet.hpp"
#include "gc/shared/taskqueue.inline.hpp"
@@ -70,6 +67,7 @@
#include "nmt/memTracker.hpp"
#include "oops/access.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/globals_extension.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
@@ -78,7 +76,6 @@
#include "runtime/prefetch.inline.hpp"
#include "runtime/threads.hpp"
#include "utilities/align.hpp"
#include "utilities/checkedCast.hpp"
#include "utilities/formatBuffer.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/powerOfTwo.hpp"
@@ -102,7 +99,7 @@ bool G1CMBitMapClosure::do_addr(HeapWord* const addr) {
// We move that task's local finger along.
_task->move_finger_to(addr);
_task->process_entry(G1TaskQueueEntry(cast_to_oop(addr)), false /* stolen */);
_task->scan_task_entry(G1TaskQueueEntry::from_oop(cast_to_oop(addr)));
// we only partially drain the local queue and global stack
_task->drain_local_queue(true);
_task->drain_global_stack(true);
@@ -151,25 +148,25 @@ bool G1CMMarkStack::initialize() {
}
G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::ChunkAllocator::allocate_new_chunk() {
if (_size.load_relaxed() >= _max_capacity) {
if (_size >= _max_capacity) {
return nullptr;
}
size_t cur_idx = _size.fetch_then_add(1u);
size_t cur_idx = AtomicAccess::fetch_then_add(&_size, 1u);
if (cur_idx >= _max_capacity) {
return nullptr;
}
size_t bucket = get_bucket(cur_idx);
if (_buckets[bucket].load_acquire() == nullptr) {
if (AtomicAccess::load_acquire(&_buckets[bucket]) == nullptr) {
if (!_should_grow) {
// Prefer to restart the CM.
return nullptr;
}
MutexLocker x(G1MarkStackChunkList_lock, Mutex::_no_safepoint_check_flag);
if (_buckets[bucket].load_acquire() == nullptr) {
if (AtomicAccess::load_acquire(&_buckets[bucket]) == nullptr) {
size_t desired_capacity = bucket_size(bucket) * 2;
if (!try_expand_to(desired_capacity)) {
return nullptr;
@@ -178,7 +175,7 @@ G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::ChunkAllocator::allocate_new_
}
size_t bucket_idx = get_bucket_index(cur_idx);
TaskQueueEntryChunk* result = ::new (&_buckets[bucket].load_relaxed()[bucket_idx]) TaskQueueEntryChunk;
TaskQueueEntryChunk* result = ::new (&_buckets[bucket][bucket_idx]) TaskQueueEntryChunk;
result->next = nullptr;
return result;
}
@@ -200,10 +197,10 @@ bool G1CMMarkStack::ChunkAllocator::initialize(size_t initial_capacity, size_t m
_max_capacity = max_capacity;
_num_buckets = get_bucket(_max_capacity) + 1;
_buckets = NEW_C_HEAP_ARRAY(Atomic<TaskQueueEntryChunk*>, _num_buckets, mtGC);
_buckets = NEW_C_HEAP_ARRAY(TaskQueueEntryChunk*, _num_buckets, mtGC);
for (size_t i = 0; i < _num_buckets; i++) {
_buckets[i].store_relaxed(nullptr);
_buckets[i] = nullptr;
}
size_t new_capacity = bucket_size(0);
@@ -243,9 +240,9 @@ G1CMMarkStack::ChunkAllocator::~ChunkAllocator() {
}
for (size_t i = 0; i < _num_buckets; i++) {
if (_buckets[i].load_relaxed() != nullptr) {
MmapArrayAllocator<TaskQueueEntryChunk>::free(_buckets[i].load_relaxed(), bucket_size(i));
_buckets[i].store_relaxed(nullptr);
if (_buckets[i] != nullptr) {
MmapArrayAllocator<TaskQueueEntryChunk>::free(_buckets[i], bucket_size(i));
_buckets[i] = nullptr;
}
}
@@ -262,7 +259,7 @@ bool G1CMMarkStack::ChunkAllocator::reserve(size_t new_capacity) {
// and the new capacity (new_capacity). This step ensures that there are no gaps in the
// array and that the capacity accurately reflects the reserved memory.
for (; i <= highest_bucket; i++) {
if (_buckets[i].load_acquire() != nullptr) {
if (AtomicAccess::load_acquire(&_buckets[i]) != nullptr) {
continue; // Skip over already allocated buckets.
}
@@ -282,7 +279,7 @@ bool G1CMMarkStack::ChunkAllocator::reserve(size_t new_capacity) {
return false;
}
_capacity += bucket_capacity;
_buckets[i].release_store(bucket_base);
AtomicAccess::release_store(&_buckets[i], bucket_base);
}
return true;
}
@@ -493,7 +490,6 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
_task_queues(new G1CMTaskQueueSet(_max_num_tasks)),
_terminator(_max_num_tasks, _task_queues),
_partial_array_state_manager(new PartialArrayStateManager(_max_num_tasks)),
_first_overflow_barrier_sync(),
_second_overflow_barrier_sync(),
@@ -560,10 +556,6 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
reset_at_marking_complete();
}
PartialArrayStateManager* G1ConcurrentMark::partial_array_state_manager() const {
return _partial_array_state_manager;
}
void G1ConcurrentMark::reset() {
_has_aborted = false;
@@ -658,26 +650,7 @@ void G1ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurr
}
}
#if TASKQUEUE_STATS
void G1ConcurrentMark::print_and_reset_taskqueue_stats() {
_task_queues->print_and_reset_taskqueue_stats("G1ConcurrentMark Oop Queue");
auto get_pa_stats = [&](uint i) {
return _tasks[i]->partial_array_task_stats();
};
PartialArrayTaskStats::log_set(_max_num_tasks, get_pa_stats,
"G1ConcurrentMark Partial Array Task Stats");
for (uint i = 0; i < _max_num_tasks; ++i) {
get_pa_stats(i)->reset();
}
}
#endif
void G1ConcurrentMark::reset_at_marking_complete() {
TASKQUEUE_STATS_ONLY(print_and_reset_taskqueue_stats());
// We set the global marking state to some default values when we're
// not doing marking.
reset_marking_for_restart();
@@ -831,25 +804,11 @@ void G1ConcurrentMark::cleanup_for_next_mark() {
clear_bitmap(_concurrent_workers, true);
reset_partial_array_state_manager();
// Repeat the asserts from above.
guarantee(cm_thread()->in_progress(), "invariant");
guarantee(!_g1h->collector_state()->mark_or_rebuild_in_progress(), "invariant");
}
void G1ConcurrentMark::reset_partial_array_state_manager() {
for (uint i = 0; i < _max_num_tasks; ++i) {
_tasks[i]->unregister_partial_array_splitter();
}
partial_array_state_manager()->reset();
for (uint i = 0; i < _max_num_tasks; ++i) {
_tasks[i]->register_partial_array_splitter();
}
}
void G1ConcurrentMark::clear_bitmap(WorkerThreads* workers) {
assert_at_safepoint_on_vm_thread();
// To avoid fragmentation the full collection requesting to clear the bitmap
@@ -1830,18 +1789,17 @@ public:
{ }
void operator()(G1TaskQueueEntry task_entry) const {
if (task_entry.is_partial_array_state()) {
oop obj = task_entry.to_partial_array_state()->source();
guarantee(_g1h->is_in_reserved(obj), "Partial Array " PTR_FORMAT " must be in heap.", p2i(obj));
if (task_entry.is_array_slice()) {
guarantee(_g1h->is_in_reserved(task_entry.slice()), "Slice " PTR_FORMAT " must be in heap.", p2i(task_entry.slice()));
return;
}
guarantee(oopDesc::is_oop(task_entry.to_oop()),
guarantee(oopDesc::is_oop(task_entry.obj()),
"Non-oop " PTR_FORMAT ", phase: %s, info: %d",
p2i(task_entry.to_oop()), _phase, _info);
G1HeapRegion* r = _g1h->heap_region_containing(task_entry.to_oop());
p2i(task_entry.obj()), _phase, _info);
G1HeapRegion* r = _g1h->heap_region_containing(task_entry.obj());
guarantee(!(r->in_collection_set() || r->has_index_in_opt_cset()),
"obj " PTR_FORMAT " from %s (%d) in region %u in (optional) collection set",
p2i(task_entry.to_oop()), _phase, _info, r->hrm_index());
p2i(task_entry.obj()), _phase, _info, r->hrm_index());
}
};
@@ -2097,17 +2055,6 @@ void G1CMTask::reset(G1CMBitMap* mark_bitmap) {
_mark_stats_cache.reset();
}
void G1CMTask::register_partial_array_splitter() {
::new (&_partial_array_splitter) PartialArraySplitter(_cm->partial_array_state_manager(),
_cm->max_num_tasks(),
ObjArrayMarkingStride);
}
void G1CMTask::unregister_partial_array_splitter() {
_partial_array_splitter.~PartialArraySplitter();
}
bool G1CMTask::should_exit_termination() {
if (!regular_clock_call()) {
return true;
@@ -2238,7 +2185,7 @@ bool G1CMTask::get_entries_from_global_stack() {
if (task_entry.is_null()) {
break;
}
assert(task_entry.is_partial_array_state() || oopDesc::is_oop(task_entry.to_oop()), "Element " PTR_FORMAT " must be an array slice or oop", p2i(task_entry.to_oop()));
assert(task_entry.is_array_slice() || oopDesc::is_oop(task_entry.obj()), "Element " PTR_FORMAT " must be an array slice or oop", p2i(task_entry.obj()));
bool success = _task_queue->push(task_entry);
// We only call this when the local queue is empty or under a
// given target limit. So, we do not expect this push to fail.
@@ -2269,7 +2216,7 @@ void G1CMTask::drain_local_queue(bool partially) {
G1TaskQueueEntry entry;
bool ret = _task_queue->pop_local(entry);
while (ret) {
process_entry(entry, false /* stolen */);
scan_task_entry(entry);
if (_task_queue->size() <= target_size || has_aborted()) {
ret = false;
} else {
@@ -2279,37 +2226,6 @@ void G1CMTask::drain_local_queue(bool partially) {
}
}
size_t G1CMTask::start_partial_array_processing(oop obj) {
assert(should_be_sliced(obj), "Must be an array object %d and large %zu", obj->is_objArray(), obj->size());
objArrayOop obj_array = objArrayOop(obj);
size_t array_length = obj_array->length();
size_t initial_chunk_size = _partial_array_splitter.start(_task_queue, obj_array, nullptr, array_length);
// Mark objArray klass metadata
if (_cm_oop_closure->do_metadata()) {
_cm_oop_closure->do_klass(obj_array->klass());
}
process_array_chunk(obj_array, 0, initial_chunk_size);
// Include object header size
return objArrayOopDesc::object_size(checked_cast<int>(initial_chunk_size));
}
size_t G1CMTask::process_partial_array(const G1TaskQueueEntry& task, bool stolen) {
PartialArrayState* state = task.to_partial_array_state();
// Access state before release by claim().
objArrayOop obj = objArrayOop(state->source());
PartialArraySplitter::Claim claim =
_partial_array_splitter.claim(state, _task_queue, stolen);
process_array_chunk(obj, claim._start, claim._end);
return heap_word_size((claim._end - claim._start) * heapOopSize);
}
void G1CMTask::drain_global_stack(bool partially) {
if (has_aborted()) {
return;
@@ -2514,7 +2430,7 @@ void G1CMTask::attempt_stealing() {
while (!has_aborted()) {
G1TaskQueueEntry entry;
if (_cm->try_stealing(_worker_id, entry)) {
process_entry(entry, true /* stolen */);
scan_task_entry(entry);
// And since we're towards the end, let's totally drain the
// local queue and global stack.
@@ -2843,12 +2759,12 @@ G1CMTask::G1CMTask(uint worker_id,
G1ConcurrentMark* cm,
G1CMTaskQueue* task_queue,
G1RegionMarkStats* mark_stats) :
_objArray_processor(this),
_worker_id(worker_id),
_g1h(G1CollectedHeap::heap()),
_cm(cm),
_mark_bitmap(nullptr),
_task_queue(task_queue),
_partial_array_splitter(_cm->partial_array_state_manager(), _cm->max_num_tasks(), ObjArrayMarkingStride),
_mark_stats_cache(mark_stats, G1RegionMarkStatsCache::RegionMarkStatsCacheSize),
_calls(0),
_time_target_ms(0.0),

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,17 @@
#define SHARE_GC_G1_G1CONCURRENTMARK_HPP
#include "gc/g1/g1ConcurrentMarkBitMap.hpp"
#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
#include "gc/g1/g1HeapRegionSet.hpp"
#include "gc/g1/g1HeapVerifier.hpp"
#include "gc/g1/g1RegionMarkStatsCache.hpp"
#include "gc/shared/gcCause.hpp"
#include "gc/shared/partialArraySplitter.hpp"
#include "gc/shared/partialArrayState.hpp"
#include "gc/shared/partialArrayTaskStats.hpp"
#include "gc/shared/taskqueue.hpp"
#include "gc/shared/taskTerminator.hpp"
#include "gc/shared/verifyOption.hpp"
#include "gc/shared/workerThread.hpp"
#include "gc/shared/workerUtils.hpp"
#include "memory/allocation.hpp"
#include "runtime/atomic.hpp"
#include "utilities/compilerWarnings.hpp"
#include "utilities/numberSeq.hpp"
@@ -56,7 +53,41 @@ class G1RegionToSpaceMapper;
class G1SurvivorRegions;
class ThreadClosure;
typedef ScannerTask G1TaskQueueEntry;
// This is a container class for either an oop or a continuation address for
// mark stack entries. Both are pushed onto the mark stack.
class G1TaskQueueEntry {
private:
void* _holder;
static const uintptr_t ArraySliceBit = 1;
G1TaskQueueEntry(oop obj) : _holder(obj) {
assert(_holder != nullptr, "Not allowed to set null task queue element");
}
G1TaskQueueEntry(HeapWord* addr) : _holder((void*)((uintptr_t)addr | ArraySliceBit)) { }
public:
G1TaskQueueEntry() : _holder(nullptr) { }
// Trivially copyable, for use in GenericTaskQueue.
static G1TaskQueueEntry from_slice(HeapWord* what) { return G1TaskQueueEntry(what); }
static G1TaskQueueEntry from_oop(oop obj) { return G1TaskQueueEntry(obj); }
oop obj() const {
assert(!is_array_slice(), "Trying to read array slice " PTR_FORMAT " as oop", p2i(_holder));
return cast_to_oop(_holder);
}
HeapWord* slice() const {
assert(is_array_slice(), "Trying to read oop " PTR_FORMAT " as array slice", p2i(_holder));
return (HeapWord*)((uintptr_t)_holder & ~ArraySliceBit);
}
bool is_oop() const { return !is_array_slice(); }
bool is_array_slice() const { return ((uintptr_t)_holder & ArraySliceBit) != 0; }
bool is_null() const { return _holder == nullptr; }
};
typedef GenericTaskQueue<G1TaskQueueEntry, mtGC> G1CMTaskQueue;
typedef GenericTaskQueueSet<G1CMTaskQueue, mtGC> G1CMTaskQueueSet;
@@ -141,9 +172,9 @@ private:
size_t _capacity;
size_t _num_buckets;
bool _should_grow;
Atomic<TaskQueueEntryChunk*>* _buckets;
TaskQueueEntryChunk* volatile* _buckets;
char _pad0[DEFAULT_PADDING_SIZE];
Atomic<size_t> _size;
volatile size_t _size;
char _pad4[DEFAULT_PADDING_SIZE - sizeof(size_t)];
size_t bucket_size(size_t bucket) {
@@ -181,7 +212,7 @@ private:
bool initialize(size_t initial_capacity, size_t max_capacity);
void reset() {
_size.store_relaxed(0);
_size = 0;
_should_grow = false;
}
@@ -380,8 +411,6 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
G1CMTaskQueueSet* _task_queues; // Task queue set
TaskTerminator _terminator; // For termination
PartialArrayStateManager* _partial_array_state_manager;
// Two sync barriers that are used to synchronize tasks when an
// overflow occurs. The algorithm is the following. All tasks enter
// the first one to ensure that they have all stopped manipulating
@@ -459,8 +488,6 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
// Prints all gathered CM-related statistics
void print_stats();
void print_and_reset_taskqueue_stats();
HeapWord* finger() { return _finger; }
bool concurrent() { return _concurrent; }
uint active_tasks() { return _num_active_tasks; }
@@ -529,14 +556,14 @@ public:
// mark_in_bitmap call. Updates various statistics data.
void add_to_liveness(uint worker_id, oop const obj, size_t size);
// Did the last marking find a live object between bottom and TAMS?
bool contains_live_object(uint region) const { return _region_mark_stats[region].live_words() != 0; }
bool contains_live_object(uint region) const { return _region_mark_stats[region]._live_words != 0; }
// Live bytes in the given region as determined by concurrent marking, i.e. the amount of
// live bytes between bottom and TAMS.
size_t live_bytes(uint region) const { return _region_mark_stats[region].live_words() * HeapWordSize; }
size_t live_bytes(uint region) const { return _region_mark_stats[region]._live_words * HeapWordSize; }
// Set live bytes for concurrent marking.
void set_live_bytes(uint region, size_t live_bytes) { _region_mark_stats[region]._live_words.store_relaxed(live_bytes / HeapWordSize); }
void set_live_bytes(uint region, size_t live_bytes) { _region_mark_stats[region]._live_words = live_bytes / HeapWordSize; }
// Approximate number of incoming references found during marking.
size_t incoming_refs(uint region) const { return _region_mark_stats[region].incoming_refs(); }
size_t incoming_refs(uint region) const { return _region_mark_stats[region]._incoming_refs; }
// Update the TAMS for the given region to the current top.
inline void update_top_at_mark_start(G1HeapRegion* r);
@@ -555,8 +582,6 @@ public:
uint worker_id_offset() const { return _worker_id_offset; }
uint max_num_tasks() const {return _max_num_tasks; }
// Clear statistics gathered during the concurrent cycle for the given region after
// it has been reclaimed.
void clear_statistics(G1HeapRegion* r);
@@ -606,8 +631,6 @@ public:
// Calculates the number of concurrent GC threads to be used in the marking phase.
uint calc_active_marking_workers();
PartialArrayStateManager* partial_array_state_manager() const;
// Resets the global marking data structures, as well as the
// task local ones; should be called during concurrent start.
void reset();
@@ -619,10 +642,6 @@ public:
// to be called concurrently to the mutator. It will yield to safepoint requests.
void cleanup_for_next_mark();
// Recycle the memory that has been requested by allocators associated with
// this manager.
void reset_partial_array_state_manager();
// Clear the next marking bitmap during safepoint.
void clear_bitmap(WorkerThreads* workers);
@@ -713,13 +732,14 @@ private:
refs_reached_period = 1024,
};
G1CMObjArrayProcessor _objArray_processor;
uint _worker_id;
G1CollectedHeap* _g1h;
G1ConcurrentMark* _cm;
G1CMBitMap* _mark_bitmap;
// the task queue of this task
G1CMTaskQueue* _task_queue;
PartialArraySplitter _partial_array_splitter;
G1RegionMarkStatsCache _mark_stats_cache;
// Number of calls to this task
@@ -830,24 +850,13 @@ private:
// mark bitmap scan, and so needs to be pushed onto the mark stack.
bool is_below_finger(oop obj, HeapWord* global_finger) const;
template<bool scan> void process_grey_task_entry(G1TaskQueueEntry task_entry, bool stolen);
static bool should_be_sliced(oop obj);
// Start processing the given objArrayOop by first pushing its continuations and
// then scanning the first chunk including the header.
size_t start_partial_array_processing(oop obj);
// Process the given continuation. Returns the number of words scanned.
size_t process_partial_array(const G1TaskQueueEntry& task, bool stolen);
// Apply the closure to the given range of elements in the objArray.
inline void process_array_chunk(objArrayOop obj, size_t start, size_t end);
template<bool scan> void process_grey_task_entry(G1TaskQueueEntry task_entry);
public:
// Apply the closure on the given area of the objArray. Return the number of words
// scanned.
inline size_t scan_objArray(objArrayOop obj, MemRegion mr);
// Resets the task; should be called right at the beginning of a marking phase.
void reset(G1CMBitMap* mark_bitmap);
// Register/unregister Partial Array Splitter Allocator with the PartialArrayStateManager.
// This allows us to discard memory arenas used for partial object array states at the end
// of a concurrent mark cycle.
void register_partial_array_splitter();
void unregister_partial_array_splitter();
// Clears all the fields that correspond to a claimed region.
void clear_region_fields();
@@ -903,7 +912,7 @@ public:
inline bool deal_with_reference(T* p);
// Scans an object and visits its children.
inline void process_entry(G1TaskQueueEntry task_entry, bool stolen);
inline void scan_task_entry(G1TaskQueueEntry task_entry);
// Pushes an object on the local queue.
inline void push(G1TaskQueueEntry task_entry);
@@ -948,11 +957,6 @@ public:
Pair<size_t, size_t> flush_mark_stats_cache();
// Prints statistics associated with this task
void print_stats();
#if TASKQUEUE_STATS
PartialArrayTaskStats* partial_array_task_stats() {
return _partial_array_splitter.stats();
}
#endif
};
// Class that's used to to print out per-region liveness

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
#include "gc/g1/g1HeapRegion.hpp"
#include "gc/g1/g1HeapRegionRemSet.inline.hpp"
#include "gc/g1/g1OopClosures.inline.hpp"
@@ -38,7 +39,6 @@
#include "gc/shared/suspendibleThreadSet.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/checkedCast.hpp"
inline bool G1CMIsAliveClosure::do_object_b(oop obj) {
// Check whether the passed in object is null. During discovery the referent
@@ -107,15 +107,13 @@ inline void G1CMMarkStack::iterate(Fn fn) const {
#endif
// It scans an object and visits its children.
inline void G1CMTask::process_entry(G1TaskQueueEntry task_entry, bool stolen) {
process_grey_task_entry<true>(task_entry, stolen);
}
inline void G1CMTask::scan_task_entry(G1TaskQueueEntry task_entry) { process_grey_task_entry<true>(task_entry); }
inline void G1CMTask::push(G1TaskQueueEntry task_entry) {
assert(task_entry.is_partial_array_state() || _g1h->is_in_reserved(task_entry.to_oop()), "invariant");
assert(task_entry.is_partial_array_state() || !_g1h->is_on_master_free_list(
_g1h->heap_region_containing(task_entry.to_oop())), "invariant");
assert(task_entry.is_partial_array_state() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.to_oop())), "invariant");
assert(task_entry.is_array_slice() || _g1h->is_in_reserved(task_entry.obj()), "invariant");
assert(task_entry.is_array_slice() || !_g1h->is_on_master_free_list(
_g1h->heap_region_containing(task_entry.obj())), "invariant");
assert(task_entry.is_array_slice() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.obj())), "invariant");
if (!_task_queue->push(task_entry)) {
// The local task queue looks full. We need to push some entries
@@ -161,34 +159,29 @@ inline bool G1CMTask::is_below_finger(oop obj, HeapWord* global_finger) const {
}
template<bool scan>
inline void G1CMTask::process_grey_task_entry(G1TaskQueueEntry task_entry, bool stolen) {
assert(scan || (!task_entry.is_partial_array_state() && task_entry.to_oop()->is_typeArray()), "Skipping scan of grey non-typeArray");
assert(task_entry.is_partial_array_state() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.to_oop())),
inline void G1CMTask::process_grey_task_entry(G1TaskQueueEntry task_entry) {
assert(scan || (task_entry.is_oop() && task_entry.obj()->is_typeArray()), "Skipping scan of grey non-typeArray");
assert(task_entry.is_array_slice() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.obj())),
"Any stolen object should be a slice or marked");
if (scan) {
if (task_entry.is_partial_array_state()) {
_words_scanned += process_partial_array(task_entry, stolen);
if (task_entry.is_array_slice()) {
_words_scanned += _objArray_processor.process_slice(task_entry.slice());
} else {
oop obj = task_entry.to_oop();
if (should_be_sliced(obj)) {
_words_scanned += start_partial_array_processing(obj);
oop obj = task_entry.obj();
if (G1CMObjArrayProcessor::should_be_sliced(obj)) {
_words_scanned += _objArray_processor.process_obj(obj);
} else {
_words_scanned += obj->oop_iterate_size(_cm_oop_closure);
_words_scanned += obj->oop_iterate_size(_cm_oop_closure);;
}
}
}
check_limits();
}
inline bool G1CMTask::should_be_sliced(oop obj) {
return obj->is_objArray() && ((objArrayOop)obj)->length() >= (int)ObjArrayMarkingStride;
}
inline void G1CMTask::process_array_chunk(objArrayOop obj, size_t start, size_t end) {
obj->oop_iterate_elements_range(_cm_oop_closure,
checked_cast<int>(start),
checked_cast<int>(end));
inline size_t G1CMTask::scan_objArray(objArrayOop obj, MemRegion mr) {
obj->oop_iterate(_cm_oop_closure, mr);
return mr.word_size();
}
inline void G1ConcurrentMark::update_top_at_mark_start(G1HeapRegion* r) {
@@ -272,7 +265,7 @@ inline bool G1CMTask::make_reference_grey(oop obj) {
// be pushed on the stack. So, some duplicate work, but no
// correctness problems.
if (is_below_finger(obj, global_finger)) {
G1TaskQueueEntry entry(obj);
G1TaskQueueEntry entry = G1TaskQueueEntry::from_oop(obj);
if (obj->is_typeArray()) {
// Immediately process arrays of primitive types, rather
// than pushing on the mark stack. This keeps us from
@@ -284,7 +277,7 @@ inline bool G1CMTask::make_reference_grey(oop obj) {
// by only doing a bookkeeping update and avoiding the
// actual scan of the object - a typeArray contains no
// references, and the metadata is built-in.
process_grey_task_entry<false>(entry, false /* stolen */);
process_grey_task_entry<false>(entry);
} else {
push(entry);
}

View File

@@ -0,0 +1,80 @@
/*
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1ConcurrentMark.inline.hpp"
#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
#include "gc/g1/g1HeapRegion.inline.hpp"
#include "gc/shared/gc_globals.hpp"
#include "memory/memRegion.hpp"
#include "utilities/globalDefinitions.hpp"
void G1CMObjArrayProcessor::push_array_slice(HeapWord* what) {
_task->push(G1TaskQueueEntry::from_slice(what));
}
size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
if (remaining > ObjArrayMarkingStride) {
push_array_slice(start_from + ObjArrayMarkingStride);
}
// Then process current area.
MemRegion mr(start_from, words_to_scan);
return _task->scan_objArray(obj, mr);
}
size_t G1CMObjArrayProcessor::process_obj(oop obj) {
assert(should_be_sliced(obj), "Must be an array object %d and large %zu", obj->is_objArray(), obj->size());
return process_array_slice(objArrayOop(obj), cast_from_oop<HeapWord*>(obj), objArrayOop(obj)->size());
}
size_t G1CMObjArrayProcessor::process_slice(HeapWord* slice) {
// Find the start address of the objArrayOop.
// Shortcut the BOT access if the given address is from a humongous object. The BOT
// slide is fast enough for "smaller" objects in non-humongous regions, but is slower
// than directly using heap region table.
G1CollectedHeap* g1h = G1CollectedHeap::heap();
G1HeapRegion* r = g1h->heap_region_containing(slice);
HeapWord* const start_address = r->is_humongous() ?
r->humongous_start_region()->bottom() :
r->block_start(slice);
assert(cast_to_oop(start_address)->is_objArray(), "Address " PTR_FORMAT " does not refer to an object array ", p2i(start_address));
assert(start_address < slice,
"Object start address " PTR_FORMAT " must be smaller than decoded address " PTR_FORMAT,
p2i(start_address),
p2i(slice));
objArrayOop objArray = objArrayOop(cast_to_oop(start_address));
size_t already_scanned = pointer_delta(slice, start_address);
size_t remaining = objArray->size() - already_scanned;
return process_array_slice(objArray, slice, remaining);
}

View File

@@ -0,0 +1,59 @@
/*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
#include "oops/oopsHierarchy.hpp"
class G1CMTask;
// Helper class to mark through large objArrays during marking in an efficient way.
// Instead of pushing large object arrays, we push continuations onto the
// mark stack. These continuations are identified by having their LSB set.
// This allows incremental processing of large objects.
class G1CMObjArrayProcessor {
private:
// Reference to the task for doing the actual work.
G1CMTask* _task;
// Push the continuation at the given address onto the mark stack.
void push_array_slice(HeapWord* addr);
// Process (apply the closure) on the given continuation of the given objArray.
size_t process_array_slice(objArrayOop const obj, HeapWord* start_from, size_t remaining);
public:
static bool should_be_sliced(oop obj);
G1CMObjArrayProcessor(G1CMTask* task) : _task(task) {
}
// Process the given continuation. Returns the number of words scanned.
size_t process_slice(HeapWord* slice);
// Start processing the given objArrayOop by scanning the header and pushing its
// continuation.
size_t process_obj(oop obj);
};
#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2026, Google LLC and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,13 +19,20 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
// key: compiler.note.lambda.deserialization.stat
// options: --debug=dumpLambdaDeserializationStats
#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
import java.io.Serializable;
#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
class LambdaDeserializationStat {
Runnable r = (Runnable & Serializable) () -> {};
#include "gc/shared/gc_globals.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oopsHierarchy.hpp"
inline bool G1CMObjArrayProcessor::should_be_sliced(oop obj) {
return obj->is_objArray() && ((objArrayOop)obj)->size() >= 2 * ObjArrayMarkingStride;
}
#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
#include "gc/g1/g1HeapRegionPrinter.hpp"
#include "gc/g1/g1RemSetTrackingPolicy.hpp"
#include "logging/log.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/mutexLocker.hpp"
struct G1UpdateRegionLivenessAndSelectForRebuildTask::G1OnRegionClosure : public G1HeapRegionClosure {
@@ -153,7 +154,7 @@ void G1UpdateRegionLivenessAndSelectForRebuildTask::work(uint worker_id) {
G1OnRegionClosure on_region_cl(_g1h, _cm, &local_cleanup_list);
_g1h->heap_region_par_iterate_from_worker_offset(&on_region_cl, &_hrclaimer, worker_id);
_total_selected_for_rebuild.add_then_fetch(on_region_cl._num_selected_for_rebuild);
AtomicAccess::add(&_total_selected_for_rebuild, on_region_cl._num_selected_for_rebuild);
// Update the old/humongous region sets
_g1h->remove_from_old_gen_sets(on_region_cl._num_old_regions_removed,

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
#include "gc/g1/g1HeapRegionManager.hpp"
#include "gc/g1/g1HeapRegionSet.hpp"
#include "gc/shared/workerThread.hpp"
#include "runtime/atomic.hpp"
class G1CollectedHeap;
class G1ConcurrentMark;
@@ -42,7 +41,7 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
G1ConcurrentMark* _cm;
G1HeapRegionClaimer _hrclaimer;
Atomic<uint> _total_selected_for_rebuild;
uint volatile _total_selected_for_rebuild;
// Reclaimed empty regions
G1FreeRegionList _cleanup_list;
@@ -58,9 +57,7 @@ public:
void work(uint worker_id) override;
uint total_selected_for_rebuild() const {
return _total_selected_for_rebuild.load_relaxed();
}
uint total_selected_for_rebuild() const { return _total_selected_for_rebuild; }
static uint desired_num_workers(uint num_regions);
};

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -116,8 +116,8 @@ G1FullCollector::G1FullCollector(G1CollectedHeap* heap,
_num_workers(calc_active_workers()),
_has_compaction_targets(false),
_has_humongous(false),
_marking_task_queues(_num_workers),
_partial_array_state_manager(nullptr),
_oop_queue_set(_num_workers),
_array_queue_set(_num_workers),
_preserved_marks_set(true),
_serial_compaction_point(this, nullptr),
_humongous_compaction_point(this, nullptr),
@@ -140,31 +140,23 @@ G1FullCollector::G1FullCollector(G1CollectedHeap* heap,
_compaction_tops[j] = nullptr;
}
_partial_array_state_manager = new PartialArrayStateManager(_num_workers);
for (uint i = 0; i < _num_workers; i++) {
_markers[i] = new G1FullGCMarker(this, i, _live_stats);
_compaction_points[i] = new G1FullGCCompactionPoint(this, _preserved_marks_set.get(i));
_marking_task_queues.register_queue(i, marker(i)->task_queue());
_oop_queue_set.register_queue(i, marker(i)->oop_stack());
_array_queue_set.register_queue(i, marker(i)->objarray_stack());
}
_serial_compaction_point.set_preserved_stack(_preserved_marks_set.get(0));
_humongous_compaction_point.set_preserved_stack(_preserved_marks_set.get(0));
_region_attr_table.initialize(heap->reserved(), G1HeapRegion::GrainBytes);
}
PartialArrayStateManager* G1FullCollector::partial_array_state_manager() const {
return _partial_array_state_manager;
}
G1FullCollector::~G1FullCollector() {
for (uint i = 0; i < _num_workers; i++) {
delete _markers[i];
delete _compaction_points[i];
}
delete _partial_array_state_manager;
FREE_C_HEAP_ARRAY(G1FullGCMarker*, _markers);
FREE_C_HEAP_ARRAY(G1FullGCCompactionPoint*, _compaction_points);
FREE_C_HEAP_ARRAY(HeapWord*, _compaction_tops);
@@ -287,8 +279,8 @@ public:
uint index = (_tm == RefProcThreadModel::Single) ? 0 : worker_id;
G1FullKeepAliveClosure keep_alive(_collector.marker(index));
BarrierEnqueueDiscoveredFieldClosure enqueue;
G1MarkStackClosure* complete_marking = _collector.marker(index)->stack_closure();
_rp_task->rp_work(worker_id, &is_alive, &keep_alive, &enqueue, complete_marking);
G1FollowStackClosure* complete_gc = _collector.marker(index)->stack_closure();
_rp_task->rp_work(worker_id, &is_alive, &keep_alive, &enqueue, complete_gc);
}
};
@@ -310,7 +302,7 @@ void G1FullCollector::phase1_mark_live_objects() {
const ReferenceProcessorStats& stats = reference_processor()->process_discovered_references(task, _heap->workers(), pt);
scope()->tracer()->report_gc_reference_stats(stats);
pt.print_all_references();
assert(marker(0)->task_queue()->is_empty(), "Should be no oops on the stack");
assert(marker(0)->oop_stack()->is_empty(), "Should be no oops on the stack");
}
{
@@ -336,7 +328,8 @@ void G1FullCollector::phase1_mark_live_objects() {
scope()->tracer()->report_object_count_after_gc(&_is_alive, _heap->workers());
}
#if TASKQUEUE_STATS
marking_task_queues()->print_and_reset_taskqueue_stats("Marking Task Queue");
oop_queue_set()->print_and_reset_taskqueue_stats("Oop Queue");
array_queue_set()->print_and_reset_taskqueue_stats("ObjArrayOop Queue");
#endif
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,8 +79,8 @@ class G1FullCollector : StackObj {
bool _has_humongous;
G1FullGCMarker** _markers;
G1FullGCCompactionPoint** _compaction_points;
G1MarkTasksQueueSet _marking_task_queues;
PartialArrayStateManager* _partial_array_state_manager;
OopQueueSet _oop_queue_set;
ObjArrayTaskQueueSet _array_queue_set;
PreservedMarksSet _preserved_marks_set;
G1FullGCCompactionPoint _serial_compaction_point;
G1FullGCCompactionPoint _humongous_compaction_point;
@@ -113,7 +113,8 @@ public:
uint workers() { return _num_workers; }
G1FullGCMarker* marker(uint id) { return _markers[id]; }
G1FullGCCompactionPoint* compaction_point(uint id) { return _compaction_points[id]; }
G1MarkTasksQueueSet* marking_task_queues() { return &_marking_task_queues; }
OopQueueSet* oop_queue_set() { return &_oop_queue_set; }
ObjArrayTaskQueueSet* array_queue_set() { return &_array_queue_set; }
PreservedMarksSet* preserved_mark_set() { return &_preserved_marks_set; }
G1FullGCCompactionPoint* serial_compaction_point() { return &_serial_compaction_point; }
G1FullGCCompactionPoint* humongous_compaction_point() { return &_humongous_compaction_point; }
@@ -121,11 +122,9 @@ public:
ReferenceProcessor* reference_processor();
size_t live_words(uint region_index) const {
assert(region_index < _heap->max_num_regions(), "sanity");
return _live_stats[region_index].live_words();
return _live_stats[region_index]._live_words;
}
PartialArrayStateManager* partial_array_state_manager() const;
void before_marking_update_attribute_table(G1HeapRegion* hr);
inline bool is_compacting(oop obj) const;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
G1FullGCMarkTask::G1FullGCMarkTask(G1FullCollector* collector) :
G1FullGCTask("G1 Parallel Marking Task", collector),
_root_processor(G1CollectedHeap::heap(), collector->workers()),
_terminator(collector->workers(), collector->marking_task_queues()) {
_terminator(collector->workers(), collector->array_queue_set()) {
}
void G1FullGCMarkTask::work(uint worker_id) {
@@ -54,9 +54,10 @@ void G1FullGCMarkTask::work(uint worker_id) {
}
// Mark stack is populated, now process and drain it.
marker->complete_marking(collector()->marking_task_queues(), &_terminator);
marker->complete_marking(collector()->oop_queue_set(), collector()->array_queue_set(), &_terminator);
// This is the point where the entire marking should have completed.
assert(marker->task_queue()->is_empty(), "Marking should have completed");
assert(marker->oop_stack()->is_empty(), "Marking should have completed");
assert(marker->objarray_stack()->is_empty(), "Array marking should have completed");
log_task("Marking task", worker_id, start);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
#include "classfile/classLoaderData.hpp"
#include "classfile/classLoaderDataGraph.hpp"
#include "gc/g1/g1FullGCMarker.inline.hpp"
#include "gc/shared/partialArraySplitter.inline.hpp"
#include "gc/shared/partialArrayState.hpp"
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shared/taskTerminator.hpp"
#include "gc/shared/verifyOption.hpp"
@@ -38,8 +36,8 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
_collector(collector),
_worker_id(worker_id),
_bitmap(collector->mark_bitmap()),
_task_queue(),
_partial_array_splitter(collector->partial_array_state_manager(), collector->workers(), ObjArrayMarkingStride),
_oop_stack(),
_objarray_stack(),
_mark_closure(worker_id, this, ClassLoaderData::_claim_stw_fullgc_mark, G1CollectedHeap::heap()->ref_processor_stw()),
_stack_closure(this),
_cld_closure(mark_closure(), ClassLoaderData::_claim_stw_fullgc_mark),
@@ -49,36 +47,24 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
}
G1FullGCMarker::~G1FullGCMarker() {
assert(is_task_queue_empty(), "Must be empty at this point");
assert(is_empty(), "Must be empty at this point");
}
void G1FullGCMarker::process_partial_array(PartialArrayState* state, bool stolen) {
// Access state before release by claim().
objArrayOop obj_array = objArrayOop(state->source());
PartialArraySplitter::Claim claim =
_partial_array_splitter.claim(state, task_queue(), stolen);
process_array_chunk(obj_array, claim._start, claim._end);
}
void G1FullGCMarker::start_partial_array_processing(objArrayOop obj) {
mark_closure()->do_klass(obj->klass());
// Don't push empty arrays to avoid unnecessary work.
size_t array_length = obj->length();
if (array_length > 0) {
size_t initial_chunk_size = _partial_array_splitter.start(task_queue(), obj, nullptr, array_length);
process_array_chunk(obj, 0, initial_chunk_size);
}
}
void G1FullGCMarker::complete_marking(G1ScannerTasksQueueSet* task_queues,
void G1FullGCMarker::complete_marking(OopQueueSet* oop_stacks,
ObjArrayTaskQueueSet* array_stacks,
TaskTerminator* terminator) {
do {
process_marking_stacks();
ScannerTask stolen_task;
if (task_queues->steal(_worker_id, stolen_task)) {
dispatch_task(stolen_task, true);
follow_marking_stacks();
ObjArrayTask steal_array;
if (array_stacks->steal(_worker_id, steal_array)) {
follow_array_chunk(objArrayOop(steal_array.obj()), steal_array.index());
} else {
oop steal_oop;
if (oop_stacks->steal(_worker_id, steal_oop)) {
follow_object(steal_oop);
}
}
} while (!is_task_queue_empty() || !terminator->offer_termination());
} while (!is_empty() || !terminator->offer_termination());
}
void G1FullGCMarker::flush_mark_stats_cache() {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
#include "gc/g1/g1FullGCOopClosures.hpp"
#include "gc/g1/g1OopClosures.hpp"
#include "gc/g1/g1RegionMarkStatsCache.hpp"
#include "gc/shared/partialArraySplitter.hpp"
#include "gc/shared/partialArrayState.hpp"
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/taskqueue.hpp"
#include "memory/iterator.hpp"
@@ -40,15 +38,16 @@
#include "utilities/growableArray.hpp"
#include "utilities/stack.hpp"
typedef OverflowTaskQueue<oop, mtGC> OopQueue;
typedef OverflowTaskQueue<ObjArrayTask, mtGC> ObjArrayTaskQueue;
typedef GenericTaskQueueSet<OopQueue, mtGC> OopQueueSet;
typedef GenericTaskQueueSet<ObjArrayTaskQueue, mtGC> ObjArrayTaskQueueSet;
class G1CMBitMap;
class G1FullCollector;
class TaskTerminator;
typedef OverflowTaskQueue<ScannerTask, mtGC> G1MarkTasksQueue;
typedef GenericTaskQueueSet<G1MarkTasksQueue, mtGC> G1MarkTasksQueueSet;
class G1FullGCMarker : public CHeapObj<mtGC> {
G1FullCollector* _collector;
@@ -57,50 +56,56 @@ class G1FullGCMarker : public CHeapObj<mtGC> {
G1CMBitMap* _bitmap;
// Mark stack
G1MarkTasksQueue _task_queue;
PartialArraySplitter _partial_array_splitter;
OopQueue _oop_stack;
ObjArrayTaskQueue _objarray_stack;
// Marking closures
G1MarkAndPushClosure _mark_closure;
G1MarkStackClosure _stack_closure;
G1FollowStackClosure _stack_closure;
CLDToOopClosure _cld_closure;
StringDedup::Requests _string_dedup_requests;
G1RegionMarkStatsCache _mark_stats_cache;
inline bool is_task_queue_empty();
inline bool is_empty();
inline void push_objarray(oop obj, size_t index);
inline bool mark_object(oop obj);
// Marking helpers
inline void process_array_chunk(objArrayOop obj, size_t start, size_t end);
inline void dispatch_task(const ScannerTask& task, bool stolen);
// Start processing the given objArrayOop by first pushing its continuations and
// then scanning the first chunk.
void start_partial_array_processing(objArrayOop obj);
// Process the given continuation.
void process_partial_array(PartialArrayState* state, bool stolen);
inline void follow_object(oop obj);
inline void follow_array(objArrayOop array);
inline void follow_array_chunk(objArrayOop array, int index);
inline void publish_and_drain_oop_tasks();
// Try to publish all contents from the objArray task queue overflow stack to
// the shared objArray stack.
// Returns true and a valid task if there has not been enough space in the shared
// objArray stack, otherwise returns false and the task is invalid.
inline bool publish_or_pop_objarray_tasks(ObjArrayTask& task);
public:
G1FullGCMarker(G1FullCollector* collector,
uint worker_id,
G1RegionMarkStats* mark_stats);
~G1FullGCMarker();
G1MarkTasksQueue* task_queue() { return &_task_queue; }
// Stack getters
OopQueue* oop_stack() { return &_oop_stack; }
ObjArrayTaskQueue* objarray_stack() { return &_objarray_stack; }
// Marking entry points
template <class T> inline void mark_and_push(T* p);
inline void process_marking_stacks();
void complete_marking(G1MarkTasksQueueSet* task_queues,
inline void follow_marking_stacks();
void complete_marking(OopQueueSet* oop_stacks,
ObjArrayTaskQueueSet* array_stacks,
TaskTerminator* terminator);
// Closure getters
CLDToOopClosure* cld_closure() { return &_cld_closure; }
G1MarkAndPushClosure* mark_closure() { return &_mark_closure; }
G1MarkStackClosure* stack_closure() { return &_stack_closure; }
G1FollowStackClosure* stack_closure() { return &_stack_closure; }
// Flush live bytes to regions
void flush_mark_stats_cache();

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
#include "oops/access.inline.hpp"
#include "oops/compressedOops.inline.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/checkedCast.hpp"
#include "utilities/debug.hpp"
inline bool G1FullGCMarker::mark_object(oop obj) {
@@ -72,55 +71,94 @@ template <class T> inline void G1FullGCMarker::mark_and_push(T* p) {
if (!CompressedOops::is_null(heap_oop)) {
oop obj = CompressedOops::decode_not_null(heap_oop);
if (mark_object(obj)) {
_task_queue.push(ScannerTask(obj));
_oop_stack.push(obj);
}
assert(_bitmap->is_marked(obj), "Must be marked");
}
}
inline bool G1FullGCMarker::is_task_queue_empty() {
return _task_queue.is_empty();
inline bool G1FullGCMarker::is_empty() {
return _oop_stack.is_empty() && _objarray_stack.is_empty();
}
inline void G1FullGCMarker::process_array_chunk(objArrayOop obj, size_t start, size_t end) {
obj->oop_iterate_elements_range(mark_closure(),
checked_cast<int>(start),
checked_cast<int>(end));
inline void G1FullGCMarker::push_objarray(oop obj, size_t index) {
ObjArrayTask task(obj, index);
assert(task.is_valid(), "bad ObjArrayTask");
_objarray_stack.push(task);
}
inline void G1FullGCMarker::dispatch_task(const ScannerTask& task, bool stolen) {
if (task.is_partial_array_state()) {
assert(_bitmap->is_marked(task.to_partial_array_state()->source()), "should be marked");
process_partial_array(task.to_partial_array_state(), stolen);
inline void G1FullGCMarker::follow_array(objArrayOop array) {
mark_closure()->do_klass(array->klass());
// Don't push empty arrays to avoid unnecessary work.
if (array->length() > 0) {
push_objarray(array, 0);
}
}
void G1FullGCMarker::follow_array_chunk(objArrayOop array, int index) {
const int len = array->length();
const int beg_index = index;
assert(beg_index < len || len == 0, "index too large");
const int stride = MIN2(len - beg_index, (int) ObjArrayMarkingStride);
const int end_index = beg_index + stride;
// Push the continuation first to allow more efficient work stealing.
if (end_index < len) {
push_objarray(array, end_index);
}
array->oop_iterate_elements_range(mark_closure(), beg_index, end_index);
}
inline void G1FullGCMarker::follow_object(oop obj) {
assert(_bitmap->is_marked(obj), "should be marked");
if (obj->is_objArray()) {
// Handle object arrays explicitly to allow them to
// be split into chunks if needed.
follow_array((objArrayOop)obj);
} else {
oop obj = task.to_oop();
assert(_bitmap->is_marked(obj), "should be marked");
if (obj->is_objArray()) {
// Handle object arrays explicitly to allow them to
// be split into chunks if needed.
start_partial_array_processing((objArrayOop)obj);
} else {
obj->oop_iterate(mark_closure());
}
obj->oop_iterate(mark_closure());
}
}
inline void G1FullGCMarker::publish_and_drain_oop_tasks() {
ScannerTask task;
while (_task_queue.pop_overflow(task)) {
if (!_task_queue.try_push_to_taskqueue(task)) {
dispatch_task(task, false);
oop obj;
while (_oop_stack.pop_overflow(obj)) {
if (!_oop_stack.try_push_to_taskqueue(obj)) {
assert(_bitmap->is_marked(obj), "must be marked");
follow_object(obj);
}
}
while (_task_queue.pop_local(task)) {
dispatch_task(task, false);
while (_oop_stack.pop_local(obj)) {
assert(_bitmap->is_marked(obj), "must be marked");
follow_object(obj);
}
}
void G1FullGCMarker::process_marking_stacks() {
inline bool G1FullGCMarker::publish_or_pop_objarray_tasks(ObjArrayTask& task) {
// It is desirable to move as much as possible work from the overflow queue to
// the shared queue as quickly as possible.
while (_objarray_stack.pop_overflow(task)) {
if (!_objarray_stack.try_push_to_taskqueue(task)) {
return true;
}
}
return false;
}
void G1FullGCMarker::follow_marking_stacks() {
do {
// First, drain regular oop stack.
publish_and_drain_oop_tasks();
} while (!is_task_queue_empty());
// Then process ObjArrays one at a time to avoid marking stack bloat.
ObjArrayTask task;
if (publish_or_pop_objarray_tasks(task) ||
_objarray_stack.pop_local(task)) {
follow_array_chunk(objArrayOop(task.obj()), task.index());
}
} while (!is_empty());
}
#endif // SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP

View File

@@ -35,7 +35,7 @@
G1IsAliveClosure::G1IsAliveClosure(G1FullCollector* collector) :
G1IsAliveClosure(collector, collector->mark_bitmap()) { }
void G1MarkStackClosure::do_void() { _marker->process_marking_stacks(); }
void G1FollowStackClosure::do_void() { _marker->follow_marking_stacks(); }
void G1FullKeepAliveClosure::do_oop(oop* p) { do_oop_work(p); }
void G1FullKeepAliveClosure::do_oop(narrowOop* p) { do_oop_work(p); }

View File

@@ -86,11 +86,11 @@ public:
virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
};
class G1MarkStackClosure: public VoidClosure {
class G1FollowStackClosure: public VoidClosure {
G1FullGCMarker* _marker;
public:
G1MarkStackClosure(G1FullGCMarker* marker) : _marker(marker) {}
G1FollowStackClosure(G1FullGCMarker* marker) : _marker(marker) {}
virtual void do_void();
};

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
#include "gc/g1/g1ParallelCleaning.hpp"
#include "runtime/atomicAccess.hpp"
#if INCLUDE_JVMCI
#include "jvmci/jvmci.hpp"
#endif
@@ -34,11 +35,11 @@ JVMCICleaningTask::JVMCICleaningTask() :
}
bool JVMCICleaningTask::claim_cleaning_task() {
if (_cleaning_claimed.load_relaxed()) {
if (AtomicAccess::load(&_cleaning_claimed)) {
return false;
}
return _cleaning_claimed.compare_set(false, true);
return !AtomicAccess::cmpxchg(&_cleaning_claimed, false, true);
}
void JVMCICleaningTask::work(bool unloading_occurred) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,10 @@
#define SHARE_GC_G1_G1PARALLELCLEANING_HPP
#include "gc/shared/parallelCleaning.hpp"
#if INCLUDE_JVMCI
#include "runtime/atomic.hpp"
#endif
#if INCLUDE_JVMCI
class JVMCICleaningTask : public StackObj {
Atomic<bool> _cleaning_claimed;
volatile bool _cleaning_claimed;
public:
JVMCICleaningTask();

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -203,8 +203,8 @@ void G1Policy::update_young_length_bounds(size_t pending_cards, size_t card_rs_l
// allocation.
// That is "fine" - at most this will schedule a GC (hopefully only a little) too
// early or too late.
_young_list_desired_length.store_relaxed(new_young_list_desired_length);
_young_list_target_length.store_relaxed(new_young_list_target_length);
AtomicAccess::store(&_young_list_desired_length, new_young_list_desired_length);
AtomicAccess::store(&_young_list_target_length, new_young_list_target_length);
}
// Calculates desired young gen length. It is calculated from:
@@ -943,7 +943,7 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
phase_times()->sum_thread_work_items(G1GCPhaseTimes::MergePSS, G1GCPhaseTimes::MergePSSToYoungGenCards));
}
record_pause(this_pause, start_time_sec, end_time_sec);
record_pause(this_pause, start_time_sec, end_time_sec, allocation_failure);
if (G1GCPauseTypeHelper::is_last_young_pause(this_pause)) {
assert(!G1GCPauseTypeHelper::is_concurrent_start_pause(this_pause),
@@ -1389,13 +1389,16 @@ void G1Policy::update_gc_pause_time_ratios(G1GCPauseType gc_type, double start_t
void G1Policy::record_pause(G1GCPauseType gc_type,
double start,
double end) {
double end,
bool allocation_failure) {
// Manage the MMU tracker. For some reason it ignores Full GCs.
if (gc_type != G1GCPauseType::FullGC) {
_mmu_tracker->add_pause(start, end);
}
update_gc_pause_time_ratios(gc_type, start, end);
if (!allocation_failure) {
update_gc_pause_time_ratios(gc_type, start, end);
}
update_time_to_mixed_tracking(gc_type, start, end);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
#include "gc/g1/g1RemSetTrackingPolicy.hpp"
#include "gc/g1/g1YoungGenSizer.hpp"
#include "gc/shared/gcCause.hpp"
#include "runtime/atomic.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/pair.hpp"
#include "utilities/ticks.hpp"
@@ -81,9 +81,12 @@ class G1Policy: public CHeapObj<mtGC> {
// Desired young gen length without taking actually available free regions into
// account.
Atomic<uint> _young_list_desired_length;
volatile uint _young_list_desired_length;
// Actual target length given available free memory.
Atomic<uint> _young_list_target_length;
volatile uint _young_list_target_length;
// The max number of regions we can extend the eden by while the GC
// locker is active. This should be >= _young_list_target_length;
volatile uint _young_list_max_length;
// The survivor rate groups below must be initialized after the predictor because they
// indirectly use it through the "this" object passed to their constructor.
@@ -272,7 +275,8 @@ private:
// Record the given STW pause with the given start and end times (in s).
void record_pause(G1GCPauseType gc_type,
double start,
double end);
double end,
bool allocation_failure = false);
void update_gc_pause_time_ratios(G1GCPauseType gc_type, double start_sec, double end_sec);
@@ -359,8 +363,8 @@ public:
// This must be called at the very beginning of an evacuation pause.
void decide_on_concurrent_start_pause();
uint young_list_desired_length() const { return _young_list_desired_length.load_relaxed(); }
uint young_list_target_length() const { return _young_list_target_length.load_relaxed(); }
uint young_list_desired_length() const { return AtomicAccess::load(&_young_list_desired_length); }
uint young_list_target_length() const { return AtomicAccess::load(&_young_list_target_length); }
bool should_allocate_mutator_region() const;
bool should_expand_on_mutator_allocation() const;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
#include "runtime/atomic.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/pair.hpp"
@@ -41,23 +40,20 @@
// * the number of incoming references found during marking. This is an approximate
// value because we do not mark through all objects.
struct G1RegionMarkStats {
Atomic<size_t> _live_words;
Atomic<size_t> _incoming_refs;
size_t _live_words;
size_t _incoming_refs;
// Clear all members.
void clear() {
_live_words.store_relaxed(0);
_incoming_refs.store_relaxed(0);
_live_words = 0;
_incoming_refs = 0;
}
// Clear all members after a marking overflow. Only needs to clear the number of
// incoming references as all objects will be rescanned, while the live words are
// gathered whenever a thread can mark an object, which is synchronized.
void clear_during_overflow() {
_incoming_refs.store_relaxed(0);
_incoming_refs = 0;
}
size_t live_words() const { return _live_words.load_relaxed(); }
size_t incoming_refs() const { return _incoming_refs.load_relaxed(); }
};
// Per-marking thread cache for the region mark statistics.
@@ -116,16 +112,12 @@ public:
void add_live_words(oop obj);
void add_live_words(uint region_idx, size_t live_words) {
G1RegionMarkStatsCacheEntry* const cur = find_for_add(region_idx);
// This method is only ever called single-threaded, so we do not need atomic
// update here.
cur->_stats._live_words.store_relaxed(cur->_stats.live_words() + live_words);
cur->_stats._live_words += live_words;
}
void inc_incoming_refs(uint region_idx) {
G1RegionMarkStatsCacheEntry* const cur = find_for_add(region_idx);
// This method is only ever called single-threaded, so we do not need atomic
// update here.
cur->_stats._incoming_refs.store_relaxed(cur->_stats.incoming_refs() + 1u);
cur->_stats._incoming_refs++;
}
void reset(uint region_idx) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
#include "gc/g1/g1RegionMarkStatsCache.hpp"
#include "runtime/atomicAccess.hpp"
inline G1RegionMarkStatsCache::G1RegionMarkStatsCacheEntry* G1RegionMarkStatsCache::find_for_add(uint region_idx) {
uint const cache_idx = hash(region_idx);
@@ -44,12 +46,12 @@ inline G1RegionMarkStatsCache::G1RegionMarkStatsCacheEntry* G1RegionMarkStatsCac
inline void G1RegionMarkStatsCache::evict(uint idx) {
G1RegionMarkStatsCacheEntry* cur = &_cache[idx];
if (cur->_stats.live_words() != 0) {
_target[cur->_region_idx]._live_words.add_then_fetch(cur->_stats.live_words());
if (cur->_stats._live_words != 0) {
AtomicAccess::add(&_target[cur->_region_idx]._live_words, cur->_stats._live_words);
}
if (cur->_stats.incoming_refs() != 0) {
_target[cur->_region_idx]._incoming_refs.add_then_fetch(cur->_stats.incoming_refs());
if (cur->_stats._incoming_refs != 0) {
AtomicAccess::add(&_target[cur->_region_idx]._incoming_refs, cur->_stats._incoming_refs);
}
cur->clear();

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@
#include "gc/shared/workerThread.hpp"
#include "jfr/jfrEvents.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomic.hpp"
#include "runtime/threads.hpp"
#include "utilities/ticks.hpp"
@@ -460,8 +459,8 @@ class G1PrepareEvacuationTask : public WorkerTask {
G1CollectedHeap* _g1h;
G1HeapRegionClaimer _claimer;
Atomic<uint> _humongous_total;
Atomic<uint> _humongous_candidates;
volatile uint _humongous_total;
volatile uint _humongous_candidates;
G1MonotonicArenaMemoryStats _all_card_set_stats;
@@ -482,19 +481,19 @@ public:
}
void add_humongous_candidates(uint candidates) {
_humongous_candidates.add_then_fetch(candidates);
AtomicAccess::add(&_humongous_candidates, candidates);
}
void add_humongous_total(uint total) {
_humongous_total.add_then_fetch(total);
AtomicAccess::add(&_humongous_total, total);
}
uint humongous_candidates() {
return _humongous_candidates.load_relaxed();
return _humongous_candidates;
}
uint humongous_total() {
return _humongous_total.load_relaxed();
return _humongous_total;
}
const G1MonotonicArenaMemoryStats all_card_set_stats() const {
@@ -699,7 +698,7 @@ protected:
virtual void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) = 0;
private:
Atomic<bool> _pinned_regions_recorded;
volatile bool _pinned_regions_recorded;
public:
G1EvacuateRegionsBaseTask(const char* name,
@@ -723,7 +722,7 @@ public:
G1ParScanThreadState* pss = _per_thread_states->state_for_worker(worker_id);
pss->set_ref_discoverer(_g1h->ref_processor_stw());
if (_pinned_regions_recorded.compare_set(false, true)) {
if (!AtomicAccess::cmpxchg(&_pinned_regions_recorded, false, true)) {
record_pinned_regions(pss, worker_id);
}
scan_roots(pss, worker_id);

View File

@@ -46,7 +46,6 @@
#include "oops/access.inline.hpp"
#include "oops/compressedOops.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.hpp"
#include "runtime/prefetch.inline.hpp"
#include "runtime/threads.hpp"
#include "runtime/threadSMR.hpp"
@@ -760,7 +759,7 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
const size_t* _surviving_young_words;
uint _active_workers;
G1EvacFailureRegions* _evac_failure_regions;
Atomic<uint> _num_retained_regions;
volatile uint _num_retained_regions;
FreeCSetStats* worker_stats(uint worker) {
return &_worker_stats[worker];
@@ -795,7 +794,7 @@ public:
virtual ~FreeCollectionSetTask() {
Ticks serial_time = Ticks::now();
bool has_new_retained_regions = _num_retained_regions.load_relaxed() != 0;
bool has_new_retained_regions = AtomicAccess::load(&_num_retained_regions) != 0;
if (has_new_retained_regions) {
G1CollectionSetCandidates* candidates = _g1h->collection_set()->candidates();
candidates->sort_by_efficiency();
@@ -830,7 +829,7 @@ public:
// Report per-region type timings.
cl.report_timing();
_num_retained_regions.add_then_fetch(cl.num_retained_regions(), memory_order_relaxed);
AtomicAccess::add(&_num_retained_regions, cl.num_retained_regions(), memory_order_relaxed);
}
};

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
#include "gc/parallel/psStringDedup.hpp"
#include "gc/parallel/psYoungGen.hpp"
#include "gc/shared/classUnloadingContext.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
#include "gc/shared/fullGCForwarding.inline.hpp"
#include "gc/shared/gcCause.hpp"
#include "gc/shared/gcHeapSummary.hpp"
@@ -933,17 +932,6 @@ void PSParallelCompact::summary_phase(bool should_do_max_compaction)
}
}
void PSParallelCompact::report_object_count_after_gc() {
GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer);
// The heap is compacted, all objects are iterable. However there may be
// filler objects in the heap which we should ignore.
class SkipFillerObjectClosure : public BoolObjectClosure {
public:
bool do_object_b(oop obj) override { return !CollectedHeap::is_filler_object(obj); }
} cl;
_gc_tracer.report_object_count_after_gc(&cl, &ParallelScavengeHeap::heap()->workers());
}
bool PSParallelCompact::invoke(bool clear_all_soft_refs, bool should_do_max_compaction) {
assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
assert(Thread::current() == (Thread*)VMThread::vm_thread(),
@@ -1039,8 +1027,6 @@ bool PSParallelCompact::invoke(bool clear_all_soft_refs, bool should_do_max_comp
heap->print_heap_change(pre_gc_values);
report_object_count_after_gc();
// Track memory usage and detect low memory
MemoryService::track_memory_usage();
heap->update_counters();
@@ -1288,6 +1274,10 @@ void PSParallelCompact::marking_phase(ParallelOldTracer *gc_tracer) {
}
}
{
GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer);
_gc_tracer.report_object_count_after_gc(is_alive_closure(), &ParallelScavengeHeap::heap()->workers());
}
#if TASKQUEUE_STATS
ParCompactionManager::print_and_reset_taskqueue_stats();
#endif
@@ -1845,7 +1835,8 @@ void PSParallelCompact::verify_filler_in_dense_prefix() {
oop obj = cast_to_oop(cur_addr);
oopDesc::verify(obj);
if (!mark_bitmap()->is_marked(cur_addr)) {
assert(CollectedHeap::is_filler_object(cast_to_oop(cur_addr)), "inv");
Klass* k = cast_to_oop(cur_addr)->klass();
assert(k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass(), "inv");
}
cur_addr += obj->size();
}

View File

@@ -749,7 +749,6 @@ private:
// Move objects to new locations.
static void compact();
static void report_object_count_after_gc();
// Add available regions to the stack and draining tasks to the task queue.
static void prepare_region_draining_tasks(uint parallel_gc_threads);

View File

@@ -771,7 +771,7 @@ Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* mem, Node* toobi
// this will require extensive changes to the loop optimization in order to
// prevent a degradation of the optimization.
// See comment in memnode.hpp, around line 227 in class LoadPNode.
Node* tlab_end = macro->make_load_raw(toobig_false, mem, tlab_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
Node* tlab_end = macro->make_load(toobig_false, mem, tlab_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
// Load the TLAB top.
Node* old_tlab_top = new LoadPNode(toobig_false, mem, tlab_top_adr, TypeRawPtr::BOTTOM, TypeRawPtr::BOTTOM, MemNode::unordered);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -309,8 +309,6 @@ protected:
fill_with_object(start, pointer_delta(end, start), zap);
}
inline static bool is_filler_object(oop obj);
virtual void fill_with_dummy_object(HeapWord* start, HeapWord* end, bool zap);
static size_t min_dummy_object_size() {
return oopDesc::header_size();

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,7 @@
#include "gc/shared/collectedHeap.hpp"
#include "classfile/vmClasses.hpp"
#include "gc/shared/memAllocator.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/align.hpp"
@@ -52,9 +50,4 @@ inline void CollectedHeap::add_vmthread_cpu_time(jlong time) {
_vmthread_cpu_time += time;
}
inline bool CollectedHeap::is_filler_object(oop obj) {
Klass* k = obj->klass_without_asserts();
return k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass();
}
#endif // SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -641,10 +641,6 @@ public:
return (raw_value() & PartialArrayTag) != 0;
}
bool is_null() const {
return _p == nullptr;
}
oop* to_oop_ptr() const {
return static_cast<oop*>(decode(OopTag));
}

View File

@@ -96,22 +96,8 @@ void WorkerThreads::initialize_workers() {
}
}
bool WorkerThreads::allow_inject_creation_failure() const {
if (!is_init_completed()) {
// Never allow creation failures during VM init
return false;
}
if (_created_workers == 0) {
// Never allow creation failures of the first worker, it will cause the VM to exit
return false;
}
return true;
}
WorkerThread* WorkerThreads::create_worker(uint name_suffix) {
if (InjectGCWorkerCreationFailure && allow_inject_creation_failure()) {
if (is_init_completed() && InjectGCWorkerCreationFailure) {
return nullptr;
}

View File

@@ -104,7 +104,6 @@ public:
WorkerThreads(const char* name, uint max_workers);
void initialize_workers();
bool allow_inject_creation_failure() const;
uint max_workers() const { return _max_workers; }
uint created_workers() const { return _created_workers; }

View File

@@ -68,9 +68,9 @@ ShenandoahAdaptiveHeuristics::ShenandoahAdaptiveHeuristics(ShenandoahSpaceInfo*
ShenandoahAdaptiveHeuristics::~ShenandoahAdaptiveHeuristics() {}
size_t ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
void ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
size_t garbage_threshold = ShenandoahHeapRegion::region_size_bytes() * ShenandoahGarbageThreshold / 100;
// The logic for cset selection in adaptive is as follows:
@@ -124,7 +124,6 @@ size_t ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata(Shena
cur_garbage = new_garbage;
}
}
return 0;
}
void ShenandoahAdaptiveHeuristics::record_cycle_start() {

View File

@@ -108,9 +108,9 @@ public:
virtual ~ShenandoahAdaptiveHeuristics();
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
virtual void record_cycle_start() override;
virtual void record_success_concurrent() override;

View File

@@ -39,16 +39,15 @@ ShenandoahAggressiveHeuristics::ShenandoahAggressiveHeuristics(ShenandoahSpaceIn
SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahEvacReserveOverflow);
}
size_t ShenandoahAggressiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free) {
void ShenandoahAggressiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free) {
for (size_t idx = 0; idx < size; idx++) {
ShenandoahHeapRegion* r = data[idx].get_region();
if (r->garbage() > 0) {
cset->add_region(r);
}
}
return 0;
}
bool ShenandoahAggressiveHeuristics::should_start_gc() {

View File

@@ -35,9 +35,9 @@ class ShenandoahAggressiveHeuristics : public ShenandoahHeuristics {
public:
ShenandoahAggressiveHeuristics(ShenandoahSpaceInfo* space_info);
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free);
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free);
virtual bool should_start_gc();

View File

@@ -76,9 +76,9 @@ bool ShenandoahCompactHeuristics::should_start_gc() {
return ShenandoahHeuristics::should_start_gc();
}
size_t ShenandoahCompactHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
void ShenandoahCompactHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
// Do not select too large CSet that would overflow the available free space
size_t max_cset = actual_free * 3 / 4;
@@ -97,5 +97,4 @@ size_t ShenandoahCompactHeuristics::choose_collection_set_from_regiondata(Shenan
cset->add_region(r);
}
}
return 0;
}

View File

@@ -37,9 +37,9 @@ public:
virtual bool should_start_gc();
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free);
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free);
virtual const char* name() { return "Compact"; }
virtual bool is_diagnostic() { return false; }

View File

@@ -37,7 +37,7 @@ ShenandoahGenerationalHeuristics::ShenandoahGenerationalHeuristics(ShenandoahGen
: ShenandoahAdaptiveHeuristics(generation), _generation(generation) {
}
size_t ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
assert(collection_set->is_empty(), "Must be empty");
auto heap = ShenandoahGenerationalHeap::heap();
@@ -168,12 +168,16 @@ size_t ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollect
byte_size_in_proper_unit(total_garbage), proper_unit_for_byte_size(total_garbage));
size_t immediate_percent = (total_garbage == 0) ? 0 : (immediate_garbage * 100 / total_garbage);
bool doing_promote_in_place = (humongous_regions_promoted + regular_regions_promoted_in_place > 0);
size_t add_regions_to_old = 0;
bool doing_promote_in_place = (humongous_regions_promoted + regular_regions_promoted_in_place > 0);
if (doing_promote_in_place || (preselected_candidates > 0) || (immediate_percent <= ShenandoahImmediateThreshold)) {
// Only young collections need to prime the collection set.
if (_generation->is_young()) {
heap->old_generation()->heuristics()->prime_collection_set(collection_set);
}
// Call the subclasses to add young-gen regions into the collection set.
add_regions_to_old = choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
}
if (collection_set->has_old_regions()) {
@@ -190,7 +194,6 @@ size_t ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollect
regular_regions_promoted_free,
immediate_regions,
immediate_garbage);
return add_regions_to_old;
}
@@ -207,6 +210,13 @@ size_t ShenandoahGenerationalHeuristics::add_preselected_regions_to_collection_s
assert(ShenandoahGenerationalHeap::heap()->is_tenurable(r), "Preselected regions must have tenure age");
// Entire region will be promoted, This region does not impact young-gen or old-gen evacuation reserve.
// This region has been pre-selected and its impact on promotion reserve is already accounted for.
// r->used() is r->garbage() + r->get_live_data_bytes()
// Since all live data in this region is being evacuated from young-gen, it is as if this memory
// is garbage insofar as young-gen is concerned. Counting this as garbage reduces the need to
// reclaim highly utilized young-gen regions just for the sake of finding min_garbage to reclaim
// within young-gen memory.
cur_young_garbage += r->garbage();
cset->add_region(r);
}

View File

@@ -44,7 +44,7 @@ class ShenandoahGenerationalHeuristics : public ShenandoahAdaptiveHeuristics {
public:
explicit ShenandoahGenerationalHeuristics(ShenandoahGeneration* generation);
size_t choose_collection_set(ShenandoahCollectionSet* collection_set) override;
void choose_collection_set(ShenandoahCollectionSet* collection_set) override;
protected:
ShenandoahGeneration* _generation;

View File

@@ -24,7 +24,6 @@
*/
#include "gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp"
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
#include "gc/shenandoah/shenandoahGenerationalHeap.inline.hpp"
#include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
@@ -36,14 +35,13 @@ ShenandoahGlobalHeuristics::ShenandoahGlobalHeuristics(ShenandoahGlobalGeneratio
}
size_t ShenandoahGlobalHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
void ShenandoahGlobalHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
// Better select garbage-first regions
QuickSort::sort<RegionData>(data, (int) size, compare_by_garbage);
choose_global_collection_set(cset, data, size, actual_free, 0 /* cur_young_garbage */);
return 0;
}
@@ -51,212 +49,94 @@ void ShenandoahGlobalHeuristics::choose_global_collection_set(ShenandoahCollecti
const ShenandoahHeuristics::RegionData* data,
size_t size, size_t actual_free,
size_t cur_young_garbage) const {
shenandoah_assert_heaplocked_or_safepoint();
auto heap = ShenandoahGenerationalHeap::heap();
auto free_set = heap->free_set();
size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
size_t capacity = heap->soft_max_capacity();
size_t garbage_threshold = region_size_bytes * ShenandoahGarbageThreshold / 100;
size_t ignore_threshold = region_size_bytes * ShenandoahIgnoreGarbageThreshold / 100;
size_t young_evac_reserve = heap->young_generation()->get_evacuation_reserve();
size_t original_young_evac_reserve = young_evac_reserve;
size_t old_evac_reserve = heap->old_generation()->get_evacuation_reserve();
size_t old_promo_reserve = heap->old_generation()->get_promoted_reserve();
size_t max_young_cset = (size_t) (young_evac_reserve / ShenandoahEvacWaste);
size_t young_cur_cset = 0;
size_t max_old_cset = (size_t) (old_evac_reserve / ShenandoahOldEvacWaste);
size_t old_cur_cset = 0;
size_t unaffiliated_young_regions = free_set->collector_unaffiliated_regions();
// Figure out how many unaffiliated young regions are dedicated to mutator and to evacuator. Allow the young
// collector's unaffiliated regions to be transferred to old-gen if old-gen has more easily reclaimed garbage
// than young-gen. At the end of this cycle, any excess regions remaining in old-gen will be transferred back
// to young. Do not transfer the mutator's unaffiliated regions to old-gen. Those must remain available
// to the mutator as it needs to be able to consume this memory during concurrent GC.
size_t unaffiliated_young_regions = heap->young_generation()->free_unaffiliated_regions();
size_t unaffiliated_young_memory = unaffiliated_young_regions * region_size_bytes;
size_t unaffiliated_old_regions = free_set->old_collector_unaffiliated_regions();
size_t unaffiliated_old_memory = unaffiliated_old_regions * region_size_bytes;
// Figure out how many unaffiliated regions are dedicated to Collector and OldCollector reserves. Let these
// be shuffled between young and old generations in order to expedite evacuation of whichever regions have the
// most garbage, regardless of whether these garbage-first regions reside in young or old generation.
// Excess reserves will be transferred back to the mutator after collection set has been chosen. At the end
// of evacuation, any reserves not consumed by evacuation will also be transferred to the mutator free set.
// Truncate reserves to only target unaffiliated memory
size_t shared_reserve_regions = 0;
if (young_evac_reserve > unaffiliated_young_memory) {
shared_reserve_regions += unaffiliated_young_regions;
} else {
size_t delta_regions = young_evac_reserve / region_size_bytes;
shared_reserve_regions += delta_regions;
if (unaffiliated_young_memory > max_young_cset) {
size_t unaffiliated_mutator_memory = unaffiliated_young_memory - max_young_cset;
unaffiliated_young_memory -= unaffiliated_mutator_memory;
unaffiliated_young_regions = unaffiliated_young_memory / region_size_bytes; // round down
unaffiliated_young_memory = unaffiliated_young_regions * region_size_bytes;
}
young_evac_reserve = 0;
size_t total_old_reserve = old_evac_reserve + old_promo_reserve;
if (total_old_reserve > unaffiliated_old_memory) {
// Give all the unaffiliated memory to the shared reserves. Leave the rest for promo reserve.
shared_reserve_regions += unaffiliated_old_regions;
old_promo_reserve = total_old_reserve - unaffiliated_old_memory;
} else {
size_t delta_regions = old_evac_reserve / region_size_bytes;
shared_reserve_regions += delta_regions;
}
old_evac_reserve = 0;
assert(shared_reserve_regions <=
(heap->young_generation()->free_unaffiliated_regions() + heap->old_generation()->free_unaffiliated_regions()),
"simple math");
size_t shared_reserves = shared_reserve_regions * region_size_bytes;
size_t committed_from_shared_reserves = 0;
// We'll affiliate these unaffiliated regions with either old or young, depending on need.
max_young_cset -= unaffiliated_young_memory;
size_t promo_bytes = 0;
size_t old_evac_bytes = 0;
size_t young_evac_bytes = 0;
// Keep track of how many regions we plan to transfer from young to old.
size_t regions_transferred_to_old = 0;
size_t consumed_by_promo = 0; // promo_bytes * ShenandoahPromoEvacWaste
size_t consumed_by_old_evac = 0; // old_evac_bytes * ShenandoahOldEvacWaste
size_t consumed_by_young_evac = 0; // young_evac_bytes * ShenandoahEvacWaste
// Of the memory reclaimed by GC, some of this will need to be reserved for the next GC collection. Use the current
// young reserve as an approximation of the future Collector reserve requirement. Try to end with at least
// (capacity * ShenandoahMinFreeThreshold) / 100 bytes available to the mutator.
size_t free_target = (capacity * ShenandoahMinFreeThreshold) / 100 + original_young_evac_reserve;
size_t free_target = (capacity * ShenandoahMinFreeThreshold) / 100 + max_young_cset;
size_t min_garbage = (free_target > actual_free) ? (free_target - actual_free) : 0;
size_t aged_regions_promoted = 0;
size_t young_regions_evacuated = 0;
size_t old_regions_evacuated = 0;
log_info(gc, ergo)("Adaptive CSet Selection for GLOBAL. Max Young Evacuation: %zu"
"%s, Max Old Evacuation: %zu%s, Max Either Evacuation: %zu%s, Actual Free: %zu%s.",
byte_size_in_proper_unit(max_young_cset), proper_unit_for_byte_size(max_young_cset),
byte_size_in_proper_unit(max_old_cset), proper_unit_for_byte_size(max_old_cset),
byte_size_in_proper_unit(unaffiliated_young_memory), proper_unit_for_byte_size(unaffiliated_young_memory),
byte_size_in_proper_unit(actual_free), proper_unit_for_byte_size(actual_free));
log_info(gc, ergo)("Adaptive CSet Selection for GLOBAL. Discretionary evacuation budget (for either old or young): %zu%s"
", Actual Free: %zu%s.",
byte_size_in_proper_unit(shared_reserves), proper_unit_for_byte_size(shared_reserves),
byte_size_in_proper_unit(actual_free), proper_unit_for_byte_size(actual_free));
size_t cur_garbage = cur_young_garbage;
for (size_t idx = 0; idx < size; idx++) {
ShenandoahHeapRegion* r = data[idx].get_region();
assert(!cset->is_preselected(r->index()), "There should be no preselected regions during GLOBAL GC");
bool add_region = false;
size_t region_garbage = r->garbage();
size_t new_garbage = cur_garbage + region_garbage;
bool add_regardless = (region_garbage > ignore_threshold) && (new_garbage < min_garbage);
size_t live_bytes = r->get_live_data_bytes();
if (add_regardless || (region_garbage >= garbage_threshold)) {
if (r->is_old()) {
size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahOldEvacWaste);
size_t new_old_consumption = consumed_by_old_evac + anticipated_consumption;
size_t new_old_evac_reserve = old_evac_reserve;
size_t proposed_old_region_expansion = 0;
while ((new_old_consumption > new_old_evac_reserve) && (committed_from_shared_reserves < shared_reserves)) {
committed_from_shared_reserves += region_size_bytes;
proposed_old_region_expansion++;
new_old_evac_reserve += region_size_bytes;
if (r->is_old() || heap->is_tenurable(r)) {
size_t new_cset = old_cur_cset + r->get_live_data_bytes();
if ((r->garbage() > garbage_threshold)) {
while ((new_cset > max_old_cset) && (unaffiliated_young_regions > 0)) {
unaffiliated_young_regions--;
regions_transferred_to_old++;
max_old_cset += region_size_bytes / ShenandoahOldEvacWaste;
}
// If this region has free memory and we choose to place it in the collection set, its free memory is no longer
// available to hold promotion results. So we behave as if its free memory is consumed within the promotion reserve.
size_t anticipated_loss_from_promo_reserve = r->free();
size_t new_promo_consumption = consumed_by_promo + anticipated_loss_from_promo_reserve;
size_t new_promo_reserve = old_promo_reserve;
while ((new_promo_consumption > new_promo_reserve) && (committed_from_shared_reserves < shared_reserves)) {
committed_from_shared_reserves += region_size_bytes;
proposed_old_region_expansion++;
new_promo_reserve += region_size_bytes;
}
if ((new_old_consumption <= new_old_evac_reserve) && (new_promo_consumption <= new_promo_reserve)) {
add_region = true;
old_evac_reserve = new_old_evac_reserve;
old_promo_reserve = new_promo_reserve;
old_evac_bytes += live_bytes;
consumed_by_old_evac = new_old_consumption;
consumed_by_promo = new_promo_consumption;
cur_garbage = new_garbage;
old_regions_evacuated++;
} else {
// We failed to sufficiently expand old so unwind proposed expansion
committed_from_shared_reserves -= proposed_old_region_expansion * region_size_bytes;
}
} else if (heap->is_tenurable(r)) {
size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahPromoEvacWaste);
size_t new_promo_consumption = consumed_by_promo + anticipated_consumption;
size_t new_promo_reserve = old_promo_reserve;
size_t proposed_old_region_expansion = 0;
while ((new_promo_consumption > new_promo_reserve) && (committed_from_shared_reserves < shared_reserves)) {
committed_from_shared_reserves += region_size_bytes;
proposed_old_region_expansion++;
new_promo_reserve += region_size_bytes;
}
if (new_promo_consumption <= new_promo_reserve) {
add_region = true;
old_promo_reserve = new_promo_reserve;
promo_bytes += live_bytes;
consumed_by_promo = new_promo_consumption;
cur_garbage = new_garbage;
aged_regions_promoted++;
} else {
// We failed to sufficiently expand old so unwind proposed expansion
committed_from_shared_reserves -= proposed_old_region_expansion * region_size_bytes;
}
} else {
assert(r->is_young() && !heap->is_tenurable(r), "DeMorgan's law (assuming r->is_affiliated)");
size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahEvacWaste);
size_t new_young_evac_consumption = consumed_by_young_evac + anticipated_consumption;
size_t new_young_evac_reserve = young_evac_reserve;
size_t proposed_young_region_expansion = 0;
while ((new_young_evac_consumption > new_young_evac_reserve) && (committed_from_shared_reserves < shared_reserves)) {
committed_from_shared_reserves += region_size_bytes;
proposed_young_region_expansion++;
new_young_evac_reserve += region_size_bytes;
}
if (new_young_evac_consumption <= new_young_evac_reserve) {
add_region = true;
young_evac_reserve = new_young_evac_reserve;
young_evac_bytes += live_bytes;
consumed_by_young_evac = new_young_evac_consumption;
cur_garbage = new_garbage;
young_regions_evacuated++;
} else {
// We failed to sufficiently expand old so unwind proposed expansion
committed_from_shared_reserves -= proposed_young_region_expansion * region_size_bytes;
}
if ((new_cset <= max_old_cset) && (r->garbage() > garbage_threshold)) {
add_region = true;
old_cur_cset = new_cset;
}
} else {
assert(r->is_young() && !heap->is_tenurable(r), "DeMorgan's law (assuming r->is_affiliated)");
size_t new_cset = young_cur_cset + r->get_live_data_bytes();
size_t region_garbage = r->garbage();
size_t new_garbage = cur_young_garbage + region_garbage;
bool add_regardless = (region_garbage > ignore_threshold) && (new_garbage < min_garbage);
if (add_regardless || (r->garbage() > garbage_threshold)) {
while ((new_cset > max_young_cset) && (unaffiliated_young_regions > 0)) {
unaffiliated_young_regions--;
max_young_cset += region_size_bytes / ShenandoahEvacWaste;
}
}
if ((new_cset <= max_young_cset) && (add_regardless || (region_garbage > garbage_threshold))) {
add_region = true;
young_cur_cset = new_cset;
cur_young_garbage = new_garbage;
}
}
if (add_region) {
cset->add_region(r);
}
}
if (committed_from_shared_reserves < shared_reserves) {
// Give all the rest to promotion
old_promo_reserve += (shared_reserves - committed_from_shared_reserves);
// dead code: committed_from_shared_reserves = shared_reserves;
if (regions_transferred_to_old > 0) {
assert(young_evac_reserve > regions_transferred_to_old * region_size_bytes, "young reserve cannot be negative");
heap->young_generation()->set_evacuation_reserve(young_evac_reserve - regions_transferred_to_old * region_size_bytes);
heap->old_generation()->set_evacuation_reserve(old_evac_reserve + regions_transferred_to_old * region_size_bytes);
}
// Consider the effects of round-off:
// 1. We know that the sum over each evacuation mutiplied by Evacuation Waste is <= total evacuation reserve
// 2. However, the reserve for each individual evacuation may be rounded down. In the worst case, we will be over budget
// by the number of regions evacuated, since each region's reserve might be under-estimated by at most 1
// 3. Likewise, if we take the sum of bytes evacuated and multiply this by the Evacuation Waste and then round down
// to nearest integer, the calculated reserve will underestimate the true reserve needs by at most 1.
// 4. This explains the adjustments to subtotals in the assert statements below.
assert(young_evac_bytes * ShenandoahEvacWaste <= young_evac_reserve + young_regions_evacuated,
"budget: %zu <= %zu", (size_t) (young_evac_bytes * ShenandoahEvacWaste), young_evac_reserve);
assert(old_evac_bytes * ShenandoahOldEvacWaste <= old_evac_reserve + old_regions_evacuated,
"budget: %zu <= %zu", (size_t) (old_evac_bytes * ShenandoahOldEvacWaste), old_evac_reserve);
assert(promo_bytes * ShenandoahPromoEvacWaste <= old_promo_reserve + aged_regions_promoted,
"budget: %zu <= %zu", (size_t) (promo_bytes * ShenandoahPromoEvacWaste), old_promo_reserve);
assert(young_evac_reserve + old_evac_reserve + old_promo_reserve <=
heap->young_generation()->get_evacuation_reserve() + heap->old_generation()->get_evacuation_reserve() +
heap->old_generation()->get_promoted_reserve(), "Exceeded budget");
if (heap->young_generation()->get_evacuation_reserve() < young_evac_reserve) {
size_t delta_bytes = young_evac_reserve - heap->young_generation()->get_evacuation_reserve();
size_t delta_regions = delta_bytes / region_size_bytes;
size_t regions_to_transfer = MIN2(unaffiliated_old_regions, delta_regions);
log_info(gc)("Global GC moves %zu unaffiliated regions from old collector to young collector reserves", regions_to_transfer);
ssize_t negated_regions = -regions_to_transfer;
heap->free_set()->move_unaffiliated_regions_from_collector_to_old_collector(negated_regions);
} else if (heap->young_generation()->get_evacuation_reserve() > young_evac_reserve) {
size_t delta_bytes = heap->young_generation()->get_evacuation_reserve() - young_evac_reserve;
size_t delta_regions = delta_bytes / region_size_bytes;
size_t regions_to_transfer = MIN2(unaffiliated_young_regions, delta_regions);
log_info(gc)("Global GC moves %zu unaffiliated regions from young collector to old collector reserves", regions_to_transfer);
heap->free_set()->move_unaffiliated_regions_from_collector_to_old_collector(regions_to_transfer);
}
heap->young_generation()->set_evacuation_reserve(young_evac_reserve);
heap->old_generation()->set_evacuation_reserve(old_evac_reserve);
heap->old_generation()->set_promoted_reserve(old_promo_reserve);
}

View File

@@ -39,9 +39,9 @@ class ShenandoahGlobalHeuristics : public ShenandoahGenerationalHeuristics {
public:
ShenandoahGlobalHeuristics(ShenandoahGlobalGeneration* generation);
size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
private:
void choose_global_collection_set(ShenandoahCollectionSet* cset,

View File

@@ -72,7 +72,7 @@ ShenandoahHeuristics::~ShenandoahHeuristics() {
FREE_C_HEAP_ARRAY(RegionGarbage, _region_data);
}
size_t ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
ShenandoahHeap* heap = ShenandoahHeap::heap();
assert(collection_set->is_empty(), "Must be empty");
@@ -153,8 +153,8 @@ size_t ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* coll
if (immediate_percent <= ShenandoahImmediateThreshold) {
choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
}
collection_set->summarize(total_garbage, immediate_garbage, immediate_regions);
return 0;
}
void ShenandoahHeuristics::record_cycle_start() {

View File

@@ -129,13 +129,6 @@ protected:
#endif
}
inline void update_livedata(size_t live) {
_region_union._live_data = live;
#ifdef ASSERT
_union_tag = is_live_data;
#endif
}
inline ShenandoahHeapRegion* get_region() const {
assert(_union_tag != is_uninitialized, "Cannot fetch region from uninitialized RegionData");
return _region;
@@ -183,12 +176,9 @@ protected:
static int compare_by_garbage(RegionData a, RegionData b);
// This is a helper function to choose_collection_set(), returning the number of regions that need to be transferred to
// the old reserve from the young reserve in order to effectively evacuate the chosen collection set. In non-generational
// mode, the return value is 0.
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
RegionData* data, size_t data_size,
size_t free) = 0;
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
RegionData* data, size_t data_size,
size_t free) = 0;
void adjust_penalty(intx step);
@@ -236,9 +226,7 @@ public:
virtual void record_requested_gc();
// Choose the collection set, returning the number of regions that need to be transferred to the old reserve from the young
// reserve in order to effectively evacuate the chosen collection set. In non-generational mode, the return value is 0.
virtual size_t choose_collection_set(ShenandoahCollectionSet* collection_set);
virtual void choose_collection_set(ShenandoahCollectionSet* collection_set);
virtual bool can_unload_classes();

View File

@@ -26,11 +26,9 @@
#include "gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp"
#include "gc/shenandoah/shenandoahCollectionSet.hpp"
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
#include "gc/shenandoah/shenandoahOldGeneration.hpp"
#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
#include "logging/log.hpp"
#include "utilities/quickSort.hpp"
@@ -79,31 +77,18 @@ ShenandoahOldHeuristics::ShenandoahOldHeuristics(ShenandoahOldGeneration* genera
}
bool ShenandoahOldHeuristics::prime_collection_set(ShenandoahCollectionSet* collection_set) {
_mixed_evac_cset = collection_set;
_included_old_regions = 0;
_evacuated_old_bytes = 0;
_collected_old_bytes = 0;
if (unprocessed_old_collection_candidates() == 0) {
return false;
}
if (_old_generation->is_preparing_for_mark()) {
// We have unprocessed old collection candidates, but the heuristic has given up on evacuating them.
// This is most likely because they were _all_ pinned at the time of the last mixed evacuation (and
// this in turn is most likely because there are just one or two candidate regions remaining).
log_info(gc, ergo)("Remaining " UINT32_FORMAT
" old regions are being coalesced and filled", unprocessed_old_collection_candidates());
log_info(gc, ergo)("Remaining " UINT32_FORMAT " old regions are being coalesced and filled", unprocessed_old_collection_candidates());
return false;
}
// Between consecutive mixed-evacuation cycles, the live data within each candidate region may change due to
// promotions and old-gen evacuations. Re-sort the candidate regions in order to first evacuate regions that have
// the smallest amount of live data. These are easiest to evacuate with least effort. Doing these first allows
// us to more quickly replenish free memory with empty regions.
for (uint i = _next_old_collection_candidate; i < _last_old_collection_candidate; i++) {
ShenandoahHeapRegion* r = _region_data[i].get_region();
_region_data[i].update_livedata(r->get_mixed_candidate_live_data_bytes());
}
QuickSort::sort<RegionData>(_region_data + _next_old_collection_candidate, unprocessed_old_collection_candidates(),
compare_by_live);
_first_pinned_candidate = NOT_FOUND;
uint included_old_regions = 0;
@@ -115,44 +100,150 @@ bool ShenandoahOldHeuristics::prime_collection_set(ShenandoahCollectionSet* coll
// of memory that can still be evacuated. We address this by reducing the evacuation budget by the amount
// of live memory in that region and by the amount of unallocated memory in that region if the evacuation
// budget is constrained by availability of free memory.
_old_evacuation_reserve = _old_generation->get_evacuation_reserve();
_old_evacuation_budget = (size_t) ((double) _old_evacuation_reserve / ShenandoahOldEvacWaste);
const size_t old_evacuation_reserve = _old_generation->get_evacuation_reserve();
const size_t old_evacuation_budget = (size_t) ((double) old_evacuation_reserve / ShenandoahOldEvacWaste);
size_t unfragmented_available = _old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
size_t fragmented_available;
size_t excess_fragmented_available;
// fragmented_available is the amount of memory within partially consumed old regions that may be required to
// hold the results of old evacuations. If all of the memory required by the old evacuation reserve is available
// in unfragmented regions (unaffiliated old regions), then fragmented_available is zero because we do not need
// to evacuate into the existing partially consumed old regions.
// if fragmented_available is non-zero, excess_fragmented_old_budget represents the amount of fragmented memory
// that is available within old, but is not required to hold the resuilts of old evacuation. As old-gen regions
// are added into the collection set, their free memory is subtracted from excess_fragmented_old_budget until the
// excess is exhausted. For old-gen regions subsequently added to the collection set, their free memory is
// subtracted from fragmented_available and from the old_evacuation_budget (since the budget decreases when this
// fragmented_available memory decreases). After fragmented_available has been exhausted, any further old regions
// selected for the cset do not further decrease the old_evacuation_budget because all further evacuation is targeted
// to unfragmented regions.
size_t unaffiliated_available = _old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
if (unaffiliated_available > _old_evacuation_reserve) {
_unspent_unfragmented_old_budget = _old_evacuation_budget;
_unspent_fragmented_old_budget = 0;
_excess_fragmented_old_budget = 0;
if (unfragmented_available > old_evacuation_budget) {
unfragmented_available = old_evacuation_budget;
fragmented_available = 0;
excess_fragmented_available = 0;
} else {
assert(_old_generation->available() >= _old_evacuation_reserve, "Cannot reserve more than is available");
size_t affiliated_available = _old_generation->available() - unaffiliated_available;
assert(affiliated_available + unaffiliated_available >= _old_evacuation_reserve, "Budgets do not add up");
if (affiliated_available + unaffiliated_available > _old_evacuation_reserve) {
_excess_fragmented_old_budget = (affiliated_available + unaffiliated_available) - _old_evacuation_reserve;
affiliated_available -= _excess_fragmented_old_budget;
assert(_old_generation->available() >= old_evacuation_budget, "Cannot budget more than is available");
fragmented_available = _old_generation->available() - unfragmented_available;
assert(fragmented_available + unfragmented_available >= old_evacuation_budget, "Budgets do not add up");
if (fragmented_available + unfragmented_available > old_evacuation_budget) {
excess_fragmented_available = (fragmented_available + unfragmented_available) - old_evacuation_budget;
fragmented_available -= excess_fragmented_available;
}
_unspent_fragmented_old_budget = (size_t) ((double) affiliated_available / ShenandoahOldEvacWaste);
_unspent_unfragmented_old_budget = (size_t) ((double) unaffiliated_available / ShenandoahOldEvacWaste);
}
log_debug(gc)("Choose old regions for mixed collection: old evacuation budget: " PROPERFMT ", candidates: %u",
PROPERFMTARGS(_old_evacuation_budget),
size_t remaining_old_evacuation_budget = old_evacuation_budget;
log_debug(gc)("Choose old regions for mixed collection: old evacuation budget: %zu%s, candidates: %u",
byte_size_in_proper_unit(old_evacuation_budget), proper_unit_for_byte_size(old_evacuation_budget),
unprocessed_old_collection_candidates());
return add_old_regions_to_cset();
size_t lost_evacuation_capacity = 0;
// The number of old-gen regions that were selected as candidates for collection at the end of the most recent old-gen
// concurrent marking phase and have not yet been collected is represented by unprocessed_old_collection_candidates().
// Candidate regions are ordered according to increasing amount of live data. If there is not sufficient room to
// evacuate region N, then there is no need to even consider evacuating region N+1.
while (unprocessed_old_collection_candidates() > 0) {
// Old collection candidates are sorted in order of decreasing garbage contained therein.
ShenandoahHeapRegion* r = next_old_collection_candidate();
if (r == nullptr) {
break;
}
assert(r->is_regular(), "There should be no humongous regions in the set of mixed-evac candidates");
// If region r is evacuated to fragmented memory (to free memory within a partially used region), then we need
// to decrease the capacity of the fragmented memory by the scaled loss.
const size_t live_data_for_evacuation = r->get_live_data_bytes();
size_t lost_available = r->free();
if ((lost_available > 0) && (excess_fragmented_available > 0)) {
if (lost_available < excess_fragmented_available) {
excess_fragmented_available -= lost_available;
lost_evacuation_capacity -= lost_available;
lost_available = 0;
} else {
lost_available -= excess_fragmented_available;
lost_evacuation_capacity -= excess_fragmented_available;
excess_fragmented_available = 0;
}
}
size_t scaled_loss = (size_t) ((double) lost_available / ShenandoahOldEvacWaste);
if ((lost_available > 0) && (fragmented_available > 0)) {
if (scaled_loss + live_data_for_evacuation < fragmented_available) {
fragmented_available -= scaled_loss;
scaled_loss = 0;
} else {
// We will have to allocate this region's evacuation memory from unfragmented memory, so don't bother
// to decrement scaled_loss
}
}
if (scaled_loss > 0) {
// We were not able to account for the lost free memory within fragmented memory, so we need to take this
// allocation out of unfragmented memory. Unfragmented memory does not need to account for loss of free.
if (live_data_for_evacuation > unfragmented_available) {
// There is no room to evacuate this region or any that come after it in within the candidates array.
log_debug(gc, cset)("Not enough unfragmented memory (%zu) to hold evacuees (%zu) from region: (%zu)",
unfragmented_available, live_data_for_evacuation, r->index());
break;
} else {
unfragmented_available -= live_data_for_evacuation;
}
} else {
// Since scaled_loss == 0, we have accounted for the loss of free memory, so we can allocate from either
// fragmented or unfragmented available memory. Use up the fragmented memory budget first.
size_t evacuation_need = live_data_for_evacuation;
if (evacuation_need > fragmented_available) {
evacuation_need -= fragmented_available;
fragmented_available = 0;
} else {
fragmented_available -= evacuation_need;
evacuation_need = 0;
}
if (evacuation_need > unfragmented_available) {
// There is no room to evacuate this region or any that come after it in within the candidates array.
log_debug(gc, cset)("Not enough unfragmented memory (%zu) to hold evacuees (%zu) from region: (%zu)",
unfragmented_available, live_data_for_evacuation, r->index());
break;
} else {
unfragmented_available -= evacuation_need;
// dead code: evacuation_need == 0;
}
}
collection_set->add_region(r);
included_old_regions++;
evacuated_old_bytes += live_data_for_evacuation;
collected_old_bytes += r->garbage();
consume_old_collection_candidate();
}
if (_first_pinned_candidate != NOT_FOUND) {
// Need to deal with pinned regions
slide_pinned_regions_to_front();
}
decrease_unprocessed_old_collection_candidates_live_memory(evacuated_old_bytes);
if (included_old_regions > 0) {
log_info(gc, ergo)("Old-gen piggyback evac (" UINT32_FORMAT " regions, evacuating " PROPERFMT ", reclaiming: " PROPERFMT ")",
included_old_regions, PROPERFMTARGS(evacuated_old_bytes), PROPERFMTARGS(collected_old_bytes));
}
if (unprocessed_old_collection_candidates() == 0) {
// We have added the last of our collection candidates to a mixed collection.
// Any triggers that occurred during mixed evacuations may no longer be valid. They can retrigger if appropriate.
clear_triggers();
_old_generation->complete_mixed_evacuations();
} else if (included_old_regions == 0) {
// We have candidates, but none were included for evacuation - are they all pinned?
// or did we just not have enough room for any of them in this collection set?
// We don't want a region with a stuck pin to prevent subsequent old collections, so
// if they are all pinned we transition to a state that will allow us to make these uncollected
// (pinned) regions parsable.
if (all_candidates_are_pinned()) {
log_info(gc, ergo)("All candidate regions " UINT32_FORMAT " are pinned", unprocessed_old_collection_candidates());
_old_generation->abandon_mixed_evacuations();
} else {
log_info(gc, ergo)("No regions selected for mixed collection. "
"Old evacuation budget: " PROPERFMT ", Remaining evacuation budget: " PROPERFMT
", Lost capacity: " PROPERFMT
", Next candidate: " UINT32_FORMAT ", Last candidate: " UINT32_FORMAT,
PROPERFMTARGS(old_evacuation_reserve),
PROPERFMTARGS(remaining_old_evacuation_budget),
PROPERFMTARGS(lost_evacuation_capacity),
_next_old_collection_candidate, _last_old_collection_candidate);
}
}
return (included_old_regions > 0);
}
bool ShenandoahOldHeuristics::all_candidates_are_pinned() {
@@ -226,187 +317,6 @@ void ShenandoahOldHeuristics::slide_pinned_regions_to_front() {
_next_old_collection_candidate = write_index + 1;
}
bool ShenandoahOldHeuristics::add_old_regions_to_cset() {
if (unprocessed_old_collection_candidates() == 0) {
return false;
}
_first_pinned_candidate = NOT_FOUND;
// The number of old-gen regions that were selected as candidates for collection at the end of the most recent old-gen
// concurrent marking phase and have not yet been collected is represented by unprocessed_old_collection_candidates().
// Candidate regions are ordered according to increasing amount of live data. If there is not sufficient room to
// evacuate region N, then there is no need to even consider evacuating region N+1.
while (unprocessed_old_collection_candidates() > 0) {
// Old collection candidates are sorted in order of decreasing garbage contained therein.
ShenandoahHeapRegion* r = next_old_collection_candidate();
if (r == nullptr) {
break;
}
assert(r->is_regular(), "There should be no humongous regions in the set of mixed-evac candidates");
// If region r is evacuated to fragmented memory (to free memory within a partially used region), then we need
// to decrease the capacity of the fragmented memory by the scaled loss.
const size_t live_data_for_evacuation = r->get_live_data_bytes();
size_t lost_available = r->free();
ssize_t fragmented_delta = 0;
ssize_t unfragmented_delta = 0;
ssize_t excess_delta = 0;
// We must decrease our mixed-evacuation budgets proportional to the lost available memory. This memory that is no
// longer available was likely "promised" to promotions, so we must decrease our mixed evacuations now.
// (e.g. if we loose 14 bytes of available old memory, we must decrease the evacuation budget by 10 bytes.)
size_t scaled_loss = (size_t) (((double) lost_available) / ShenandoahOldEvacWaste);
if (lost_available > 0) {
// We need to subtract lost_available from our working evacuation budgets
if (scaled_loss < _excess_fragmented_old_budget) {
excess_delta -= scaled_loss;
_excess_fragmented_old_budget -= scaled_loss;
} else {
excess_delta -= _excess_fragmented_old_budget;
_excess_fragmented_old_budget = 0;
}
if (scaled_loss < _unspent_fragmented_old_budget) {
_unspent_fragmented_old_budget -= scaled_loss;
fragmented_delta = -scaled_loss;
scaled_loss = 0;
} else {
scaled_loss -= _unspent_fragmented_old_budget;
fragmented_delta = -_unspent_fragmented_old_budget;
_unspent_fragmented_old_budget = 0;
}
if (scaled_loss < _unspent_unfragmented_old_budget) {
_unspent_unfragmented_old_budget -= scaled_loss;
unfragmented_delta = -scaled_loss;
scaled_loss = 0;
} else {
scaled_loss -= _unspent_unfragmented_old_budget;
fragmented_delta = -_unspent_unfragmented_old_budget;
_unspent_unfragmented_old_budget = 0;
}
}
// Allocate replica from unfragmented memory if that exists
size_t evacuation_need = live_data_for_evacuation;
if (evacuation_need < _unspent_unfragmented_old_budget) {
_unspent_unfragmented_old_budget -= evacuation_need;
} else {
if (_unspent_unfragmented_old_budget > 0) {
evacuation_need -= _unspent_unfragmented_old_budget;
unfragmented_delta -= _unspent_unfragmented_old_budget;
_unspent_unfragmented_old_budget = 0;
}
// Take the remaining allocation out of fragmented available
if (_unspent_fragmented_old_budget > evacuation_need) {
_unspent_fragmented_old_budget -= evacuation_need;
} else {
// We cannot add this region into the collection set. We're done. Undo the adjustments to available.
_unspent_fragmented_old_budget -= fragmented_delta;
_unspent_unfragmented_old_budget -= unfragmented_delta;
_excess_fragmented_old_budget -= excess_delta;
break;
}
}
_mixed_evac_cset->add_region(r);
_included_old_regions++;
_evacuated_old_bytes += live_data_for_evacuation;
_collected_old_bytes += r->garbage();
consume_old_collection_candidate();
}
return true;
}
bool ShenandoahOldHeuristics::finalize_mixed_evacs() {
if (_first_pinned_candidate != NOT_FOUND) {
// Need to deal with pinned regions
slide_pinned_regions_to_front();
}
decrease_unprocessed_old_collection_candidates_live_memory(_evacuated_old_bytes);
if (_included_old_regions > 0) {
log_info(gc)("Old-gen mixed evac (%zu regions, evacuating %zu%s, reclaiming: %zu%s)",
_included_old_regions,
byte_size_in_proper_unit(_evacuated_old_bytes), proper_unit_for_byte_size(_evacuated_old_bytes),
byte_size_in_proper_unit(_collected_old_bytes), proper_unit_for_byte_size(_collected_old_bytes));
}
if (unprocessed_old_collection_candidates() == 0) {
// We have added the last of our collection candidates to a mixed collection.
// Any triggers that occurred during mixed evacuations may no longer be valid. They can retrigger if appropriate.
clear_triggers();
_old_generation->complete_mixed_evacuations();
} else if (_included_old_regions == 0) {
// We have candidates, but none were included for evacuation - are they all pinned?
// or did we just not have enough room for any of them in this collection set?
// We don't want a region with a stuck pin to prevent subsequent old collections, so
// if they are all pinned we transition to a state that will allow us to make these uncollected
// (pinned) regions parsable.
if (all_candidates_are_pinned()) {
log_info(gc)("All candidate regions " UINT32_FORMAT " are pinned", unprocessed_old_collection_candidates());
_old_generation->abandon_mixed_evacuations();
} else {
log_info(gc)("No regions selected for mixed collection. "
"Old evacuation budget: " PROPERFMT ", Next candidate: " UINT32_FORMAT ", Last candidate: " UINT32_FORMAT,
PROPERFMTARGS(_old_evacuation_reserve),
_next_old_collection_candidate, _last_old_collection_candidate);
}
}
return (_included_old_regions > 0);
}
bool ShenandoahOldHeuristics::top_off_collection_set(size_t &add_regions_to_old) {
if (unprocessed_old_collection_candidates() == 0) {
add_regions_to_old = 0;
return false;
} else {
ShenandoahYoungGeneration* young_generation = _heap->young_generation();
size_t young_unaffiliated_regions = young_generation->free_unaffiliated_regions();
size_t max_young_cset = young_generation->get_evacuation_reserve();
// We have budgeted to assure the live_bytes_in_tenurable_regions() get evacuated into old generation. Young reserves
// only for untenurable region evacuations.
size_t planned_young_evac = _mixed_evac_cset->get_live_bytes_in_untenurable_regions();
size_t consumed_from_young_cset = (size_t) (planned_young_evac * ShenandoahEvacWaste);
size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
size_t regions_required_for_collector_reserve = (consumed_from_young_cset + region_size_bytes - 1) / region_size_bytes;
assert(consumed_from_young_cset <= max_young_cset, "sanity");
assert(max_young_cset <= young_unaffiliated_regions * region_size_bytes, "sanity");
size_t regions_for_old_expansion;
if (consumed_from_young_cset < max_young_cset) {
size_t excess_young_reserves = max_young_cset - consumed_from_young_cset;
// We can only transfer empty regions from young to old. Furthermore, we must be careful to assure that the young
// Collector reserve that remains after transfer is comprised entirely of empty (unaffiliated) regions.
size_t consumed_unaffiliated_regions = (consumed_from_young_cset + region_size_bytes - 1) / region_size_bytes;
size_t available_unaffiliated_regions = ((young_unaffiliated_regions > consumed_unaffiliated_regions)?
young_unaffiliated_regions - consumed_unaffiliated_regions: 0);
regions_for_old_expansion = MIN2(available_unaffiliated_regions, excess_young_reserves / region_size_bytes);
} else {
regions_for_old_expansion = 0;
}
if (regions_for_old_expansion > 0) {
log_info(gc)("Augmenting old-gen evacuation budget from unexpended young-generation reserve by %zu regions",
regions_for_old_expansion);
add_regions_to_old = regions_for_old_expansion;
size_t budget_supplement = region_size_bytes * regions_for_old_expansion;
size_t supplement_without_waste = (size_t) (((double) budget_supplement) / ShenandoahOldEvacWaste);
_old_evacuation_budget += supplement_without_waste;
_unspent_unfragmented_old_budget += supplement_without_waste;
_old_generation->augment_evacuation_reserve(budget_supplement);
young_generation->set_evacuation_reserve(max_young_cset - budget_supplement);
return add_old_regions_to_cset();
} else {
add_regions_to_old = 0;
return false;
}
}
}
void ShenandoahOldHeuristics::prepare_for_old_collections() {
ShenandoahHeap* heap = ShenandoahHeap::heap();
@@ -415,6 +325,7 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
size_t immediate_garbage = 0;
size_t immediate_regions = 0;
size_t live_data = 0;
RegionData* candidates = _region_data;
for (size_t i = 0; i < num_regions; i++) {
ShenandoahHeapRegion* region = heap->get_region(i);
@@ -433,10 +344,10 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
// else, regions that were promoted in place had 0 old live data at mark start
if (region->is_regular() || region->is_regular_pinned()) {
// Only place regular or pinned regions with live data into the candidate set.
// Pinned regions cannot be evacuated, but we are not actually choosing candidates
// for the collection set here. That happens later during the next young GC cycle,
// by which time, the pinned region may no longer be pinned.
// Only place regular or pinned regions with live data into the candidate set.
// Pinned regions cannot be evacuated, but we are not actually choosing candidates
// for the collection set here. That happens later during the next young GC cycle,
// by which time, the pinned region may no longer be pinned.
if (!region->has_live()) {
assert(!region->is_pinned(), "Pinned region should have live (pinned) objects.");
region->make_trash_immediate();
@@ -503,8 +414,6 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
ShenandoahHeapRegion* r = candidates[i].get_region();
size_t region_garbage = r->garbage();
size_t region_free = r->free();
r->capture_mixed_candidate_garbage();
candidates_garbage += region_garbage;
unfragmented += region_free;
}
@@ -547,8 +456,6 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
r->index(), ShenandoahHeapRegion::region_state_to_string(r->state()));
const size_t region_garbage = r->garbage();
const size_t region_free = r->free();
r->capture_mixed_candidate_garbage();
candidates_garbage += region_garbage;
unfragmented += region_free;
defrag_count++;
@@ -639,7 +546,6 @@ unsigned int ShenandoahOldHeuristics::get_coalesce_and_fill_candidates(Shenandoa
void ShenandoahOldHeuristics::abandon_collection_candidates() {
_last_old_collection_candidate = 0;
_next_old_collection_candidate = 0;
_live_bytes_in_unprocessed_candidates = 0;
_last_old_region = 0;
}
@@ -884,9 +790,8 @@ bool ShenandoahOldHeuristics::is_experimental() {
return true;
}
size_t ShenandoahOldHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
ShenandoahHeuristics::RegionData* data,
size_t data_size, size_t free) {
void ShenandoahOldHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
ShenandoahHeuristics::RegionData* data,
size_t data_size, size_t free) {
ShouldNotReachHere();
return 0;
}

View File

@@ -102,30 +102,6 @@ private:
size_t _fragmentation_first_old_region;
size_t _fragmentation_last_old_region;
// State variables involved in construction of a mixed-evacuation collection set. These variables are initialized
// when client code invokes prime_collection_set(). They are consulted, and sometimes modified, when client code
// calls top_off_collection_set() to possibly expand the number of old-gen regions in a mixed evacuation cset, and by
// finalize_mixed_evacs(), which prepares the way for mixed evacuations to begin.
ShenandoahCollectionSet* _mixed_evac_cset;
size_t _evacuated_old_bytes;
size_t _collected_old_bytes;
size_t _included_old_regions;
size_t _old_evacuation_reserve;
size_t _old_evacuation_budget;
// This represents the amount of memory that can be evacuated from old into initially empty regions during a mixed evacuation.
// This is the total amount of unfragmented free memory in old divided by ShenandoahOldEvacWaste.
size_t _unspent_unfragmented_old_budget;
// This represents the amount of memory that can be evacuated from old into initially non-empty regions during a mixed
// evacuation. This is the total amount of initially fragmented free memory in old divided by ShenandoahOldEvacWaste.
size_t _unspent_fragmented_old_budget;
// If there is more available memory in old than is required by the intended mixed evacuation, the amount of excess
// memory is represented by _excess_fragmented_old. To convert this value into a promotion budget, multiply by
// ShenandoahOldEvacWaste and divide by ShenandoahPromoWaste.
size_t _excess_fragmented_old_budget;
// The value of command-line argument ShenandoahOldGarbageThreshold represents the percent of garbage that must
// be present within an old-generation region before that region is considered a good candidate for inclusion in
// the collection set under normal circumstances. For our purposes, normal circustances are when the memory consumed
@@ -155,15 +131,7 @@ private:
void set_trigger_if_old_is_overgrown();
protected:
size_t
choose_collection_set_from_regiondata(ShenandoahCollectionSet* set, RegionData* data, size_t data_size, size_t free) override;
// This internal helper routine adds as many mixed evacuation candidate regions as fit within the old-gen evacuation budget
// to the collection set. This may be called twice to prepare for any given mixed evacuation cycle, the first time with
// a conservative old evacuation budget, and the second time with a larger more aggressive old evacuation budget. Returns
// true iff we need to finalize mixed evacs. (If no regions are added to the collection set, there is no need to finalize
// mixed evacuations.)
bool add_old_regions_to_cset();
void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set, RegionData* data, size_t data_size, size_t free) override;
public:
explicit ShenandoahOldHeuristics(ShenandoahOldGeneration* generation, ShenandoahGenerationalHeap* gen_heap);
@@ -171,22 +139,8 @@ public:
// Prepare for evacuation of old-gen regions by capturing the mark results of a recently completed concurrent mark pass.
void prepare_for_old_collections();
// Initialize instance variables to support the preparation of a mixed-evacuation collection set. Adds as many
// old candidate regions into the collection set as can fit within the iniital conservative old evacuation budget.
// Returns true iff we need to finalize mixed evacs.
bool prime_collection_set(ShenandoahCollectionSet* collection_set);
// If young evacuation did not consume all of its available evacuation reserve, add as many additional mixed-
// evacuation candidate regions into the collection set as will fit within this excess repurposed reserved.
// Returns true iff we need to finalize mixed evacs. Upon return, the var parameter regions_to_xfer holds the
// number of regions to transfer from young to old.
bool top_off_collection_set(size_t &add_regions_to_old);
// Having added all eligible mixed-evacuation candidates to the collection set, this function updates the total count
// of how much old-gen memory remains to be evacuated and adjusts the representation of old-gen regions that remain to
// be evacuated, giving special attention to regions that are currently pinned. It outputs relevant log messages and
// returns true iff the collection set holds at least one unpinned mixed evacuation candidate.
bool finalize_mixed_evacs();
// Return true iff the collection set is primed with at least one old-gen region.
bool prime_collection_set(ShenandoahCollectionSet* set);
// How many old-collection candidates have not yet been processed?
uint unprocessed_old_collection_candidates() const;

View File

@@ -50,9 +50,9 @@ bool ShenandoahPassiveHeuristics::should_degenerate_cycle() {
return ShenandoahDegeneratedGC;
}
size_t ShenandoahPassiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
void ShenandoahPassiveHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
assert(ShenandoahDegeneratedGC, "This path is only taken for Degenerated GC");
// Do not select too large CSet that would overflow the available free space.
@@ -76,5 +76,4 @@ size_t ShenandoahPassiveHeuristics::choose_collection_set_from_regiondata(Shenan
cset->add_region(r);
}
}
return 0;
}

View File

@@ -46,9 +46,9 @@ public:
virtual bool should_degenerate_cycle();
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
RegionData* data, size_t data_size,
size_t free);
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
RegionData* data, size_t data_size,
size_t free);
virtual const char* name() { return "Passive"; }
virtual bool is_diagnostic() { return true; }

View File

@@ -59,9 +59,9 @@ bool ShenandoahStaticHeuristics::should_start_gc() {
return ShenandoahHeuristics::should_start_gc();
}
size_t ShenandoahStaticHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free) {
void ShenandoahStaticHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free) {
size_t threshold = ShenandoahHeapRegion::region_size_bytes() * ShenandoahGarbageThreshold / 100;
for (size_t idx = 0; idx < size; idx++) {
@@ -70,5 +70,4 @@ size_t ShenandoahStaticHeuristics::choose_collection_set_from_regiondata(Shenand
cset->add_region(r);
}
}
return 0;
}

View File

@@ -40,9 +40,9 @@ public:
virtual bool should_start_gc();
virtual size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free);
virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t free);
virtual const char* name() { return "Static"; }
virtual bool is_diagnostic() { return false; }

View File

@@ -33,11 +33,11 @@
#include "utilities/quickSort.hpp"
ShenandoahYoungHeuristics::ShenandoahYoungHeuristics(ShenandoahYoungGeneration* generation)
: ShenandoahGenerationalHeuristics(generation) {
: ShenandoahGenerationalHeuristics(generation) {
}
size_t ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
void ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) {
// See comments in ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata():
@@ -48,8 +48,6 @@ size_t ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(Shenando
// array before younger regions that typically contain more garbage. This is one reason why,
// for example, we continue examining regions even after rejecting a region that has
// more live data than we can evacuate.
ShenandoahGenerationalHeap* heap = ShenandoahGenerationalHeap::heap();
bool need_to_finalize_mixed = heap->old_generation()->heuristics()->prime_collection_set(cset);
// Better select garbage-first regions
QuickSort::sort<RegionData>(data, (int) size, compare_by_garbage);
@@ -57,17 +55,6 @@ size_t ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(Shenando
size_t cur_young_garbage = add_preselected_regions_to_collection_set(cset, data, size);
choose_young_collection_set(cset, data, size, actual_free, cur_young_garbage);
// Especially when young-gen trigger is expedited in order to finish mixed evacuations, there may not be
// enough consolidated garbage to make effective use of young-gen evacuation reserve. If there is still
// young-gen reserve available following selection of the young-gen collection set, see if we can use
// this memory to expand the old-gen evacuation collection set.
size_t add_regions_to_old;
need_to_finalize_mixed |= heap->old_generation()->heuristics()->top_off_collection_set(add_regions_to_old);
if (need_to_finalize_mixed) {
heap->old_generation()->heuristics()->finalize_mixed_evacs();
}
return add_regions_to_old;
}
void ShenandoahYoungHeuristics::choose_young_collection_set(ShenandoahCollectionSet* cset,

View File

@@ -38,9 +38,9 @@ public:
explicit ShenandoahYoungHeuristics(ShenandoahYoungGeneration* generation);
size_t choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
RegionData* data, size_t size,
size_t actual_free) override;
bool should_start_gc() override;

View File

@@ -50,8 +50,6 @@ ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedS
_region_count(0),
_old_garbage(0),
_preselected_regions(nullptr),
_young_available_bytes_collected(0),
_old_available_bytes_collected(0),
_current_index(0) {
// The collection set map is reserved to cover the entire heap *and* zero addresses.
@@ -106,7 +104,6 @@ void ShenandoahCollectionSet::add_region(ShenandoahHeapRegion* r) {
}
} else if (r->is_old()) {
_old_bytes_to_evacuate += live;
_old_available_bytes_collected += free;
_old_garbage += garbage;
}
@@ -143,7 +140,6 @@ void ShenandoahCollectionSet::clear() {
_old_bytes_to_evacuate = 0;
_young_available_bytes_collected = 0;
_old_available_bytes_collected = 0;
_has_old_regions = false;
}

View File

@@ -75,10 +75,6 @@ private:
// should be subtracted from what's available.
size_t _young_available_bytes_collected;
// When a region having memory available to be allocated is added to the collection set, the region's available memory
// should be subtracted from what's available.
size_t _old_available_bytes_collected;
shenandoah_padding(0);
volatile size_t _current_index;
shenandoah_padding(1);
@@ -125,9 +121,6 @@ public:
// Returns the amount of free bytes in young regions in the collection set.
size_t get_young_available_bytes_collected() const { return _young_available_bytes_collected; }
// Returns the amount of free bytes in old regions in the collection set.
size_t get_old_available_bytes_collected() const { return _old_available_bytes_collected; }
// Returns the amount of garbage in old regions in the collection set.
inline size_t get_old_garbage() const;

View File

@@ -204,8 +204,9 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
return false;
}
// Perform update-refs phase.
entry_concurrent_update_refs_prepare(heap);
// Perform update-refs phase.
if (ShenandoahVerify) {
vmop_entry_init_update_refs();
}
@@ -226,7 +227,6 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
// Update references freed up collection set, kick the cleanup to reclaim the space.
entry_cleanup_complete();
} else {
_abbreviated = true;
if (!entry_final_roots()) {
assert(_degen_point != _degenerated_unset, "Need to know where to start degenerated cycle");
return false;
@@ -235,6 +235,7 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
if (VerifyAfterGC) {
vmop_entry_verify_final_roots();
}
_abbreviated = true;
}
// We defer generation resizing actions until after cset regions have been recycled. We do this even following an
@@ -281,6 +282,7 @@ bool ShenandoahConcurrentGC::complete_abbreviated_cycle() {
return true;
}
void ShenandoahConcurrentGC::vmop_entry_init_mark() {
ShenandoahHeap* const heap = ShenandoahHeap::heap();
TraceCollectorStats tcs(heap->monitoring_support()->stw_collection_counters());
@@ -534,12 +536,6 @@ void ShenandoahConcurrentGC::entry_cleanup_early() {
// This phase does not use workers, no need for setup
heap->try_inject_alloc_failure();
op_cleanup_early();
if (!heap->is_evacuation_in_progress()) {
// This is an abbreviated cycle. Rebuild the freeset in order to establish reserves for the next GC cycle. Doing
// the rebuild ASAP also expedites availability of immediate trash, reducing the likelihood that we will degenerate
// during promote-in-place processing.
heap->rebuild_free_set(true /*concurrent*/);
}
}
void ShenandoahConcurrentGC::entry_evacuate() {

View File

@@ -326,7 +326,7 @@ void ShenandoahRegionPartitions::initialize_old_collector() {
}
void ShenandoahRegionPartitions::make_all_regions_unavailable() {
shenandoah_assert_heaplocked_or_safepoint();
shenandoah_assert_heaplocked();
for (size_t partition_id = 0; partition_id < IntNumPartitions; partition_id++) {
_membership[partition_id].clear_all();
_leftmosts[partition_id] = _max;
@@ -439,13 +439,6 @@ void ShenandoahRegionPartitions::set_capacity_of(ShenandoahFreeSetPartitionId wh
_available[int(which_partition)] = value - _used[int(which_partition)];
}
void ShenandoahRegionPartitions::set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
shenandoah_assert_heaplocked();
assert (which_partition < NumPartitions, "selected free set must be valid");
_used[int(which_partition)] = value;
_available[int(which_partition)] = _capacity[int(which_partition)] - value;
}
void ShenandoahRegionPartitions::increase_capacity(ShenandoahFreeSetPartitionId which_partition, size_t bytes) {
shenandoah_assert_heaplocked();
@@ -907,7 +900,7 @@ idx_t ShenandoahRegionPartitions::rightmost_empty(ShenandoahFreeSetPartitionId w
#ifdef ASSERT
void ShenandoahRegionPartitions::assert_bounds() {
void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
size_t capacities[UIntNumPartitions];
size_t used[UIntNumPartitions];
@@ -943,7 +936,7 @@ void ShenandoahRegionPartitions::assert_bounds() {
switch (partition) {
case ShenandoahFreeSetPartitionId::NotFree:
{
assert(capacity != _region_size_bytes, "Should not be retired if empty");
assert(!validate_totals || (capacity != _region_size_bytes), "Should not be retired if empty");
ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(i);
if (r->is_humongous()) {
if (r->is_old()) {
@@ -983,12 +976,12 @@ void ShenandoahRegionPartitions::assert_bounds() {
case ShenandoahFreeSetPartitionId::Collector:
case ShenandoahFreeSetPartitionId::OldCollector:
{
ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(i);
assert(capacity > 0, "free regions must have allocation capacity");
bool is_empty = (capacity == _region_size_bytes);
regions[int(partition)]++;
used[int(partition)] += _region_size_bytes - capacity;
capacities[int(partition)] += _region_size_bytes;
if (i < leftmosts[int(partition)]) {
leftmosts[int(partition)] = i;
}
@@ -1027,20 +1020,20 @@ void ShenandoahRegionPartitions::assert_bounds() {
idx_t beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
idx_t end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Mutator),
"Mutator free region before the leftmost: %zd, bound %zd",
"Mutator free regions before the leftmost: %zd, bound %zd",
beg_off, leftmost(ShenandoahFreeSetPartitionId::Mutator));
assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Mutator),
"Mutator free region past the rightmost: %zd, bound %zd",
"Mutator free regions past the rightmost: %zd, bound %zd",
end_off, rightmost(ShenandoahFreeSetPartitionId::Mutator));
beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
"free empty region (%zd) before the leftmost bound %zd",
beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)]);
assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
"free empty region (%zd) past the rightmost bound %zd",
end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)]);
assert (beg_off >= leftmost_empty(ShenandoahFreeSetPartitionId::Mutator),
"Mutator free empty regions before the leftmost: %zd, bound %zd",
beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Mutator));
assert (end_off <= rightmost_empty(ShenandoahFreeSetPartitionId::Mutator),
"Mutator free empty regions past the rightmost: %zd, bound %zd",
end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
// Performance invariants. Failing these would not break the free partition, but performance would suffer.
assert (leftmost(ShenandoahFreeSetPartitionId::Collector) <= _max, "leftmost in bounds: %zd < %zd",
@@ -1060,20 +1053,20 @@ void ShenandoahRegionPartitions::assert_bounds() {
beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Collector),
"Collector free region before the leftmost: %zd, bound %zd",
"Collector free regions before the leftmost: %zd, bound %zd",
beg_off, leftmost(ShenandoahFreeSetPartitionId::Collector));
assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Collector),
"Collector free region past the rightmost: %zd, bound %zd",
"Collector free regions past the rightmost: %zd, bound %zd",
end_off, rightmost(ShenandoahFreeSetPartitionId::Collector));
beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector free empty region before the leftmost: %zd, bound %zd",
beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
"Collector free empty regions before the leftmost: %zd, bound %zd",
beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Collector));
assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector free empty region past the rightmost: %zd, bound %zd",
end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
"Collector free empty regions past the rightmost: %zd, bound %zd",
end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Collector));
// Performance invariants. Failing these would not break the free partition, but performance would suffer.
assert (leftmost(ShenandoahFreeSetPartitionId::OldCollector) <= _max, "OldCollector leftmost in bounds: %zd < %zd",
@@ -1090,109 +1083,106 @@ void ShenandoahRegionPartitions::assert_bounds() {
ShenandoahFreeSetPartitionId::OldCollector),
"OldCollector rightmost region should be free: %zd", rightmost(ShenandoahFreeSetPartitionId::OldCollector));
// Concurrent recycling of trash recycles a region (changing its state from is_trash to is_empty without the heap lock),
// If OldCollector partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
// Likewise for empty region partitions.
beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
end_off = rightmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::OldCollector), "free regions before the leftmost: %zd, bound %zd",
assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::OldCollector),
"OldCollector free regions before the leftmost: %zd, bound %zd",
beg_off, leftmost(ShenandoahFreeSetPartitionId::OldCollector));
assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::OldCollector), "free regions past the rightmost: %zd, bound %zd",
assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::OldCollector),
"OldCollector free regions past the rightmost: %zd, bound %zd",
end_off, rightmost(ShenandoahFreeSetPartitionId::OldCollector));
beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
"free empty region (%zd) before the leftmost bound %zd, region %s trash",
beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
((beg_off >= _max)? "out of bounds is not":
(ShenandoahHeap::heap()->get_region(_leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)])->is_trash()?
"is": "is not")));
"OldCollector free empty regions before the leftmost: %zd, bound %zd",
beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::OldCollector));
assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
"free empty region (%zd) past the rightmost bound %zd, region %s trash",
end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
((end_off < 0)? "out of bounds is not" :
(ShenandoahHeap::heap()->get_region(_rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)])->is_trash()?
"is": "is not")));
"OldCollector free empty regions past the rightmost: %zd, bound %zd",
end_off, rightmost_empty(ShenandoahFreeSetPartitionId::OldCollector));
// young_retired_regions need to be added to either Mutator or Collector partitions, 100% used.
// Give enough of young_retired_regions, young_retired_capacity, young_retired_user
// to the Mutator partition to top it off so that it matches the running totals.
//
// Give any remnants to the Collector partition. After topping off the Collector partition, its values
// should also match running totals.
assert(young_retired_regions * _region_size_bytes == young_retired_capacity, "sanity");
assert(young_retired_capacity == young_retired_used, "sanity");
if (validate_totals) {
// young_retired_regions need to be added to either Mutator or Collector partitions, 100% used.
// Give enough of young_retired_regions, young_retired_capacity, young_retired_user
// to the Mutator partition to top it off so that it matches the running totals.
//
// Give any remnants to the Collector partition. After topping off the Collector partition, its values
// should also match running totals.
assert(capacities[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector capacities must match (%zu != %zu)",
capacities[int(ShenandoahFreeSetPartitionId::OldCollector)],
_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]);
assert(used[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] / _region_size_bytes, "Old collector regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]
>= _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] - _used[int(ShenandoahFreeSetPartitionId::OldCollector)]),
"Old Collector available must equal capacity minus used");
assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector humongous waste must match");
assert(young_retired_regions * _region_size_bytes == young_retired_capacity, "sanity");
assert(young_retired_capacity == young_retired_used, "sanity");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= capacities[int(ShenandoahFreeSetPartitionId::Mutator)],
"Capacity total must be >= counted tally");
size_t mutator_capacity_shortfall =
_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - capacities[int(ShenandoahFreeSetPartitionId::Mutator)];
assert(mutator_capacity_shortfall <= young_retired_capacity, "sanity");
capacities[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_capacity_shortfall;
young_retired_capacity -= mutator_capacity_shortfall;
capacities[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_capacity;
assert(_used[int(ShenandoahFreeSetPartitionId::Mutator)] >= used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Used total must be >= counted tally");
size_t mutator_used_shortfall =
_used[int(ShenandoahFreeSetPartitionId::Mutator)] - used[int(ShenandoahFreeSetPartitionId::Mutator)];
assert(mutator_used_shortfall <= young_retired_used, "sanity");
used[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_used_shortfall;
young_retired_used -= mutator_used_shortfall;
used[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_used;
assert(capacities[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector capacities must match");
assert(used[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::OldCollector)]
== _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] / _region_size_bytes, "Old collector regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]
>= _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] - _used[int(ShenandoahFreeSetPartitionId::OldCollector)]),
"Old Collector available must equal capacity minus used");
assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector humongous waste must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
>= regions[int(ShenandoahFreeSetPartitionId::Mutator)], "Region total must be >= counted tally");
size_t mutator_regions_shortfall = (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
- regions[int(ShenandoahFreeSetPartitionId::Mutator)]);
assert(mutator_regions_shortfall <= young_retired_regions, "sanity");
regions[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_regions_shortfall;
young_retired_regions -= mutator_regions_shortfall;
regions[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_regions;
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= capacities[int(ShenandoahFreeSetPartitionId::Mutator)],
"Capacity total must be >= counted tally");
size_t mutator_capacity_shortfall =
_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - capacities[int(ShenandoahFreeSetPartitionId::Mutator)];
assert(mutator_capacity_shortfall <= young_retired_capacity, "sanity");
capacities[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_capacity_shortfall;
young_retired_capacity -= mutator_capacity_shortfall;
capacities[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_capacity;
assert(capacities[int(ShenandoahFreeSetPartitionId::Collector)] == _capacity[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector capacities must match");
assert(used[int(ShenandoahFreeSetPartitionId::Collector)] == _used[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::Collector)]
== _capacity[int(ShenandoahFreeSetPartitionId::Collector)] / _region_size_bytes, "Collector regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] >= _used[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector Capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::Collector)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] - _used[int(ShenandoahFreeSetPartitionId::Collector)]),
"Collector Available must equal capacity minus used");
assert(capacities[int(ShenandoahFreeSetPartitionId::Mutator)] == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator capacities must match");
assert(used[int(ShenandoahFreeSetPartitionId::Mutator)] == _used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::Mutator)]
== _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes, "Mutator regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= _used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::Mutator)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - _used[int(ShenandoahFreeSetPartitionId::Mutator)]),
"Mutator available must equal capacity minus used");
assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::Mutator)] == young_humongous_waste,
"Mutator humongous waste must match");
assert(_used[int(ShenandoahFreeSetPartitionId::Mutator)] >= used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Used total must be >= counted tally");
size_t mutator_used_shortfall =
_used[int(ShenandoahFreeSetPartitionId::Mutator)] - used[int(ShenandoahFreeSetPartitionId::Mutator)];
assert(mutator_used_shortfall <= young_retired_used, "sanity");
used[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_used_shortfall;
young_retired_used -= mutator_used_shortfall;
used[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_used;
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
>= regions[int(ShenandoahFreeSetPartitionId::Mutator)], "Region total must be >= counted tally");
size_t mutator_regions_shortfall = (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
- regions[int(ShenandoahFreeSetPartitionId::Mutator)]);
assert(mutator_regions_shortfall <= young_retired_regions, "sanity");
regions[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_regions_shortfall;
young_retired_regions -= mutator_regions_shortfall;
regions[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_regions;
assert(capacities[int(ShenandoahFreeSetPartitionId::Collector)] == _capacity[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector capacities must match");
assert(used[int(ShenandoahFreeSetPartitionId::Collector)] == _used[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::Collector)]
== _capacity[int(ShenandoahFreeSetPartitionId::Collector)] / _region_size_bytes, "Collector regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] >= _used[int(ShenandoahFreeSetPartitionId::Collector)],
"Collector Capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::Collector)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] - _used[int(ShenandoahFreeSetPartitionId::Collector)]),
"Collector Available must equal capacity minus used");
assert(capacities[int(ShenandoahFreeSetPartitionId::Mutator)] == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator capacities must match");
assert(used[int(ShenandoahFreeSetPartitionId::Mutator)] == _used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator used must match");
assert(regions[int(ShenandoahFreeSetPartitionId::Mutator)]
== _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes, "Mutator regions must match");
assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= _used[int(ShenandoahFreeSetPartitionId::Mutator)],
"Mutator capacity must be >= used");
assert(_available[int(ShenandoahFreeSetPartitionId::Mutator)] ==
(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - _used[int(ShenandoahFreeSetPartitionId::Mutator)]),
"Mutator available must equal capacity minus used");
assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::Mutator)] == young_humongous_waste,
"Mutator humongous waste must match");
}
}
#endif
@@ -1216,36 +1206,6 @@ ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
clear_internal();
}
void ShenandoahFreeSet::move_unaffiliated_regions_from_collector_to_old_collector(ssize_t count) {
shenandoah_assert_heaplocked();
size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
size_t old_capacity = _partitions.get_capacity(ShenandoahFreeSetPartitionId::OldCollector);
size_t collector_capacity = _partitions.get_capacity(ShenandoahFreeSetPartitionId::Collector);
if (count > 0) {
size_t ucount = count;
size_t bytes_moved = ucount * region_size_bytes;
assert(collector_capacity >= bytes_moved, "Cannot transfer");
assert(_partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector) >= ucount,
"Cannot transfer %zu of %zu", ucount, _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector));
_partitions.decrease_empty_region_counts(ShenandoahFreeSetPartitionId::Collector, ucount);
_partitions.set_capacity_of(ShenandoahFreeSetPartitionId::Collector, collector_capacity - bytes_moved);
_partitions.set_capacity_of(ShenandoahFreeSetPartitionId::OldCollector, old_capacity + bytes_moved);
_partitions.increase_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector, ucount);
} else if (count < 0) {
size_t ucount = -count;
size_t bytes_moved = ucount * region_size_bytes;
assert(old_capacity >= bytes_moved, "Cannot transfer");
assert(_partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector) >= ucount,
"Cannot transfer %zu of %zu", ucount, _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector));
_partitions.decrease_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector, ucount);
_partitions.set_capacity_of(ShenandoahFreeSetPartitionId::OldCollector, old_capacity - bytes_moved);
_partitions.set_capacity_of(ShenandoahFreeSetPartitionId::Collector, collector_capacity + bytes_moved);
_partitions.increase_empty_region_counts(ShenandoahFreeSetPartitionId::Collector, ucount);
}
// else, do nothing
}
// was pip_pad_bytes
void ShenandoahFreeSet::add_promoted_in_place_region_to_old_collector(ShenandoahHeapRegion* region) {
shenandoah_assert_heaplocked();
@@ -1301,7 +1261,7 @@ void ShenandoahFreeSet::add_promoted_in_place_region_to_old_collector(Shenandoah
/* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ true>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
}
template<typename Iter>
@@ -1536,12 +1496,9 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
return nullptr;
}
HeapWord* result = nullptr;
// We must call try_recycle_under_lock() even if !r->is_trash(). The reason is that if r is being recycled at this
// moment by a GC worker thread, it may appear to be not trash even though it has not yet been fully recycled. If
// we proceed without waiting for the worker to finish recycling the region, the worker thread may overwrite the
// region's affiliation with FREE after we set the region's affiliation to req.afiliation() below
r->try_recycle_under_lock();
in_new_region = r->is_empty();
if (in_new_region) {
log_debug(gc, free)("Using new region (%zu) for %s (" PTR_FORMAT ").",
r->index(), req.type_string(), p2i(&req));
@@ -1711,7 +1668,7 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
default:
assert(false, "won't happen");
}
_partitions.assert_bounds();
_partitions.assert_bounds(true);
return result;
}
@@ -1842,7 +1799,6 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
increase_bytes_allocated(waste_bytes);
}
}
_partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, total_used);
increase_bytes_allocated(total_used);
req.set_actual_size(words_size);
@@ -1863,16 +1819,14 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
/* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ false,
/* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
/* UnaffiliatedChangesAreYoungNeutral */ false>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
return _heap->get_region(beg)->bottom();
}
class ShenandoahRecycleTrashedRegionClosure final : public ShenandoahHeapRegionClosure {
public:
void heap_region_do(ShenandoahHeapRegion* r) {
if (r->is_trash()) {
r->try_recycle();
}
r->try_recycle();
}
bool is_thread_safe() {
@@ -1907,7 +1861,7 @@ bool ShenandoahFreeSet::transfer_one_region_from_mutator_to_old_collector(size_t
/* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ false>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
return true;
} else {
return false;
@@ -1960,7 +1914,7 @@ bool ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
/* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ false>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
// 4. Do not adjust capacities for generations, we just swapped the regions that have already
// been accounted for. However, we should adjust the evacuation reserves as those may have changed.
shenandoah_assert_heaplocked();
@@ -1991,7 +1945,7 @@ void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
/* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ false,
/* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ true>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
// We do not ensure that the region is no longer trash, relying on try_allocate_in(), which always comes next,
// to recycle trash before attempting to allocate anything in the region.
}
@@ -2071,23 +2025,16 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
for (size_t idx = 0; idx < num_regions; idx++) {
ShenandoahHeapRegion* region = _heap->get_region(idx);
if (region->is_trash()) {
// Trashed regions represent regions that had been in the collection set (or may have been identified as immediate garbage)
// but have not yet been "cleaned up". The cset regions are not "trashed" until we have finished update refs.
// Trashed regions represent immediate garbage identified by final mark and regions that had been in the collection
// partition but have not yet been "cleaned up" following update refs.
if (region->is_old()) {
// We're going to place this region into the Mutator set. We increment old_trashed_regions because this count represents
// regions that the old generation is entitled to without any transfer from young. We do not place this region into
// the OldCollector partition at this time. Instead, we let reserve_regions() decide whether to place this region
// into the OldCollector partition. Deferring the decision allows reserve_regions() to more effectively pack the
// OldCollector regions into high-address memory. We do not adjust capacities of old and young generations at this
// time. At the end of finish_rebuild(), the capacities are adjusted based on the results of reserve_regions().
old_trashed_regions++;
} else {
assert(region->is_young(), "Trashed region should be old or young");
young_trashed_regions++;
}
} else if (region->is_old()) {
// We count humongous and regular regions as "old regions". We do not count trashed regions that are old. Those
// are counted (above) as old_trashed_regions.
// count both humongous and regular regions, but don't count trash (cset) regions.
old_region_count++;
if (first_old_region > idx) {
first_old_region = idx;
@@ -2101,7 +2048,7 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
size_t ac = alloc_capacity(region);
if (ac >= PLAB::min_size() * HeapWordSize) {
if (region->is_trash() || !region->is_old()) {
// Both young and old (possibly immediately) collected regions (trashed) are placed into the Mutator set
// Both young and old collected regions (trashed) are placed into the Mutator set
_partitions.raw_assign_membership(idx, ShenandoahFreeSetPartitionId::Mutator);
if (idx < mutator_leftmost) {
mutator_leftmost = idx;
@@ -2164,19 +2111,10 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
assert(_partitions.membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Region should have been retired");
size_t humongous_waste_bytes = 0;
if (region->is_humongous_start()) {
// Since rebuild does not necessarily happen at a safepoint, a newly allocated humongous object may not have been
// fully initialized. Therefore, we cannot safely consult its header.
ShenandoahHeapRegion* last_of_humongous_continuation = region;
size_t next_idx;
for (next_idx = idx + 1; next_idx < num_regions; next_idx++) {
ShenandoahHeapRegion* humongous_cont_candidate = _heap->get_region(next_idx);
if (!humongous_cont_candidate->is_humongous_continuation()) {
break;
}
last_of_humongous_continuation = humongous_cont_candidate;
}
// For humongous regions, used() is established while holding the global heap lock so it is reliable here
humongous_waste_bytes = ShenandoahHeapRegion::region_size_bytes() - last_of_humongous_continuation->used();
oop obj = cast_to_oop(region->bottom());
size_t byte_size = obj->size() * HeapWordSize;
size_t region_span = ShenandoahHeapRegion::required_regions(byte_size);
humongous_waste_bytes = region_span * ShenandoahHeapRegion::region_size_bytes() - byte_size;
}
if (region->is_old()) {
old_collector_used += region_size_bytes;
@@ -2245,7 +2183,7 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
/* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
/* UnaffiliatedChangesAreYoungNeutral */ false>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
#ifdef ASSERT
if (_heap->mode()->is_generational()) {
assert(young_affiliated_regions() == _heap->young_generation()->get_affiliated_region_count(), "sanity");
@@ -2283,7 +2221,7 @@ void ShenandoahFreeSet::transfer_humongous_regions_from_mutator_to_old_collector
/* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ true>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
// global_used is unaffected by this transfer
// No need to adjust ranges because humongous regions are not allocatable
@@ -2365,7 +2303,7 @@ void ShenandoahFreeSet::transfer_empty_regions_from_to(ShenandoahFreeSetPartitio
/* UnaffiliatedChangesAreYoungNeutral */ true>();
}
}
_partitions.assert_bounds();
_partitions.assert_bounds(true);
}
// Returns number of regions transferred, adds transferred bytes to var argument bytes_transferred
@@ -2432,7 +2370,7 @@ size_t ShenandoahFreeSet::transfer_empty_regions_from_collector_set_to_mutator_s
/* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ true>();
}
_partitions.assert_bounds();
_partitions.assert_bounds(true);
return transferred_regions;
}
@@ -2507,7 +2445,7 @@ transfer_non_empty_regions_from_collector_set_to_mutator_set(ShenandoahFreeSetPa
/* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
/* UnaffiliatedChangesAreYoungNeutral */ true>();
}
_partitions.assert_bounds();
_partitions.assert_bounds(true);
return transferred_regions;
}
@@ -2569,13 +2507,14 @@ void ShenandoahFreeSet::prepare_to_rebuild(size_t &young_trashed_regions, size_t
first_old_region, last_old_region, old_region_count);
}
void ShenandoahFreeSet::finish_rebuild(size_t young_cset_regions, size_t old_cset_regions, size_t old_region_count) {
void ShenandoahFreeSet::finish_rebuild(size_t young_trashed_regions, size_t old_trashed_regions, size_t old_region_count,
bool have_evacuation_reserves) {
shenandoah_assert_heaplocked();
size_t young_reserve(0), old_reserve(0);
if (_heap->mode()->is_generational()) {
compute_young_and_old_reserves(young_cset_regions, old_cset_regions, young_reserve, old_reserve);
compute_young_and_old_reserves(young_trashed_regions, old_trashed_regions, have_evacuation_reserves,
young_reserve, old_reserve);
} else {
young_reserve = (_heap->max_capacity() / 100) * ShenandoahEvacReserve;
old_reserve = 0;
@@ -2592,41 +2531,8 @@ void ShenandoahFreeSet::finish_rebuild(size_t young_cset_regions, size_t old_cse
// Release the rebuild lock now. What remains in this function is read-only
rebuild_lock()->unlock();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
log_status();
if (_heap->mode()->is_generational()) {
// Clear the region balance until it is adjusted in preparation for a subsequent GC cycle.
_heap->old_generation()->set_region_balance(0);
}
}
// Reduce old reserve (when there are insufficient resources to satisfy the original request).
void ShenandoahFreeSet::reduce_old_reserve(size_t adjusted_old_reserve, size_t requested_old_reserve) {
ShenandoahOldGeneration* const old_generation = _heap->old_generation();
size_t requested_promoted_reserve = old_generation->get_promoted_reserve();
size_t requested_old_evac_reserve = old_generation->get_evacuation_reserve();
assert(adjusted_old_reserve < requested_old_reserve, "Only allow reduction");
assert(requested_promoted_reserve + requested_old_evac_reserve >= adjusted_old_reserve, "Sanity");
size_t delta = requested_old_reserve - adjusted_old_reserve;
if (requested_promoted_reserve >= delta) {
requested_promoted_reserve -= delta;
old_generation->set_promoted_reserve(requested_promoted_reserve);
} else {
delta -= requested_promoted_reserve;
requested_promoted_reserve = 0;
requested_old_evac_reserve -= delta;
old_generation->set_promoted_reserve(requested_promoted_reserve);
old_generation->set_evacuation_reserve(requested_old_evac_reserve);
}
}
// Reduce young reserve (when there are insufficient resources to satisfy the original request).
void ShenandoahFreeSet::reduce_young_reserve(size_t adjusted_young_reserve, size_t requested_young_reserve) {
ShenandoahYoungGeneration* const young_generation = _heap->young_generation();
assert(adjusted_young_reserve < requested_young_reserve, "Only allow reduction");
young_generation->set_evacuation_reserve(adjusted_young_reserve);
}
/**
@@ -2643,6 +2549,7 @@ void ShenandoahFreeSet::reduce_young_reserve(size_t adjusted_young_reserve, size
* this value should computed by ShenandoahGenerationalHeap::compute_old_generation_balance().
*/
void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regions, size_t old_trashed_regions,
bool have_evacuation_reserves,
size_t& young_reserve_result, size_t& old_reserve_result) const {
shenandoah_assert_generational();
shenandoah_assert_heaplocked();
@@ -2659,15 +2566,6 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
old_available += old_trashed_regions * region_size_bytes;
young_unaffiliated_regions += young_trashed_regions;
assert(young_capacity >= young_generation->used(),
"Young capacity (%zu) must exceed used (%zu)", young_capacity, young_generation->used());
size_t young_available = young_capacity - young_generation->used();
young_available += young_trashed_regions * region_size_bytes;
assert(young_available >= young_unaffiliated_regions * region_size_bytes, "sanity");
assert(old_available >= old_unaffiliated_regions * region_size_bytes, "sanity");
// Consult old-region balance to make adjustments to current generation capacities and availability.
// The generation region transfers take place after we rebuild. old_region_balance represents number of regions
// to transfer from old to young.
@@ -2687,7 +2585,6 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
ssize_t xfer_bytes = old_region_balance * checked_cast<ssize_t>(region_size_bytes);
old_available -= xfer_bytes;
old_unaffiliated_regions -= old_region_balance;
young_available += xfer_bytes;
young_capacity += xfer_bytes;
young_unaffiliated_regions += old_region_balance;
}
@@ -2696,22 +2593,41 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
// promotions and evacuations. The partition between which old memory is reserved for evacuation and
// which is reserved for promotion is enforced using thread-local variables that prescribe intentions for
// each PLAB's available memory.
const size_t promoted_reserve = old_generation->get_promoted_reserve();
const size_t old_evac_reserve = old_generation->get_evacuation_reserve();
young_reserve_result = young_generation->get_evacuation_reserve();
old_reserve_result = promoted_reserve + old_evac_reserve;
assert(old_reserve_result + young_reserve_result <= old_available + young_available,
"Cannot reserve (%zu + %zu + %zu) more than is available: %zu + %zu",
promoted_reserve, old_evac_reserve, young_reserve_result, old_available, young_available);
if (have_evacuation_reserves) {
// We are rebuilding at the end of final mark, having already established evacuation budgets for this GC pass.
const size_t promoted_reserve = old_generation->get_promoted_reserve();
const size_t old_evac_reserve = old_generation->get_evacuation_reserve();
young_reserve_result = young_generation->get_evacuation_reserve();
old_reserve_result = promoted_reserve + old_evac_reserve;
if (old_reserve_result > old_available) {
// Try to transfer memory from young to old.
size_t old_deficit = old_reserve_result - old_available;
size_t old_region_deficit = (old_deficit + region_size_bytes - 1) / region_size_bytes;
if (young_unaffiliated_regions < old_region_deficit) {
old_region_deficit = young_unaffiliated_regions;
}
young_unaffiliated_regions -= old_region_deficit;
old_unaffiliated_regions += old_region_deficit;
old_region_balance -= old_region_deficit;
old_generation->set_region_balance(old_region_balance);
}
} else {
// We are rebuilding at end of GC, so we set aside budgets specified on command line (or defaults)
young_reserve_result = (young_capacity * ShenandoahEvacReserve) / 100;
// The auto-sizer has already made old-gen large enough to hold all anticipated evacuations and promotions.
// Affiliated old-gen regions are already in the OldCollector free set. Add in the relevant number of
// unaffiliated regions.
old_reserve_result = old_available;
}
// Old available regions that have less than PLAB::min_size() of available memory are not placed into the OldCollector
// free set. Because of this, old_available may not have enough memory to represent the intended reserve. Adjust
// the reserve downward to account for this possibility. This loss is part of the reason why the original budget
// was adjusted with ShenandoahOldEvacWaste and ShenandoahOldPromoWaste multipliers.
if (old_reserve_result >
_partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes) {
_partitions.capacity_of(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes) {
old_reserve_result =
_partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes;
_partitions.capacity_of(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes;
}
if (young_reserve_result > young_unaffiliated_regions * region_size_bytes) {
@@ -2875,17 +2791,19 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
ShenandoahFreeSetPartitionId p = _partitions.membership(idx);
size_t ac = alloc_capacity(r);
assert(ac != region_size_bytes, "Empty regions should be in Mutator partion at entry to reserve_regions");
assert(p != ShenandoahFreeSetPartitionId::Collector, "Collector regions must be converted from Mutator regions");
if (p == ShenandoahFreeSetPartitionId::OldCollector) {
assert(!r->is_empty(), "Empty regions should be in Mutator partition at entry to reserve_regions");
old_used_regions++;
old_used_bytes = region_size_bytes - ac;
// This region is within the range for OldCollector partition, as established by find_regions_with_alloc_capacity()
assert((_partitions.leftmost(ShenandoahFreeSetPartitionId::OldCollector) <= idx) &&
(_partitions.rightmost(ShenandoahFreeSetPartitionId::OldCollector) >= idx),
"find_regions_with_alloc_capacity() should have established this is in range");
} else {
assert(p == ShenandoahFreeSetPartitionId::NotFree, "sanity");
if (p == ShenandoahFreeSetPartitionId::Collector) {
if (ac != region_size_bytes) {
young_used_regions++;
young_used_bytes = region_size_bytes - ac;
}
// else, unaffiliated region has no used
} else if (p == ShenandoahFreeSetPartitionId::OldCollector) {
if (ac != region_size_bytes) {
old_used_regions++;
old_used_bytes = region_size_bytes - ac;
}
// else, unaffiliated region has no used
} else if (p == ShenandoahFreeSetPartitionId::NotFree) {
// This region has been retired
if (r->is_old()) {
old_used_regions++;
@@ -2895,6 +2813,21 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
young_used_regions++;
young_used_bytes += region_size_bytes - ac;
}
} else {
assert(p == ShenandoahFreeSetPartitionId::OldCollector, "Not mutator and not NotFree, so must be OldCollector");
assert(!r->is_empty(), "Empty regions should be in Mutator partition at entry to reserve_regions");
if (idx < old_collector_low_idx) {
old_collector_low_idx = idx;
}
if (idx > old_collector_high_idx) {
old_collector_high_idx = idx;
}
if (idx < old_collector_empty_low_idx) {
old_collector_empty_low_idx = idx;
}
if (idx > old_collector_empty_high_idx) {
old_collector_empty_high_idx = idx;
}
}
}
}
@@ -2923,14 +2856,14 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
_partitions.increase_used(ShenandoahFreeSetPartitionId::OldCollector, used_to_old_collector);
}
_partitions.establish_interval(ShenandoahFreeSetPartitionId::Mutator,
mutator_low_idx, mutator_high_idx, mutator_empty_low_idx, mutator_empty_high_idx);
_partitions.establish_interval(ShenandoahFreeSetPartitionId::Collector,
collector_low_idx, collector_high_idx, collector_empty_low_idx, collector_empty_high_idx);
_partitions.expand_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::Collector,
collector_low_idx, collector_high_idx,
collector_empty_low_idx, collector_empty_high_idx);
_partitions.expand_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::OldCollector,
old_collector_low_idx, old_collector_high_idx,
old_collector_empty_low_idx, old_collector_empty_high_idx);
_partitions.establish_interval(ShenandoahFreeSetPartitionId::Mutator,
mutator_low_idx, mutator_high_idx, mutator_empty_low_idx, mutator_empty_high_idx);
recompute_total_used</* UsedByMutatorChanged */ true,
/* UsedByCollectorChanged */ true, /* UsedByOldCollectorChanged */ true>();
@@ -2939,22 +2872,17 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
/* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
/* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
/* UnaffiliatedChangesAreYoungNeutral */ false>();
_partitions.assert_bounds();
_partitions.assert_bounds(true);
if (LogTarget(Info, gc, free)::is_enabled()) {
size_t old_reserve = _partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector);
if (old_reserve < to_reserve_old) {
log_info(gc, free)("Wanted " PROPERFMT " for old reserve, but only reserved: " PROPERFMT,
PROPERFMTARGS(to_reserve_old), PROPERFMTARGS(old_reserve));
assert(_heap->mode()->is_generational(), "to_old_reserve > 0 implies generational mode");
reduce_old_reserve(old_reserve, to_reserve_old);
}
size_t reserve = _partitions.available_in(ShenandoahFreeSetPartitionId::Collector);
if (reserve < to_reserve) {
if (_heap->mode()->is_generational()) {
reduce_young_reserve(reserve, to_reserve);
}
log_info(gc, free)("Wanted " PROPERFMT " for young reserve, but only reserved: " PROPERFMT,
PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
}
}
}

View File

@@ -224,10 +224,6 @@ public:
void transfer_used_capacity_from_to(ShenandoahFreeSetPartitionId from_partition, ShenandoahFreeSetPartitionId to_partition,
size_t regions);
// For recycled region r in the OldCollector partition but possibly not within the interval for empty OldCollector regions,
// expand the empty interval to include this region.
inline void adjust_interval_for_recycled_old_region_under_lock(ShenandoahHeapRegion* r);
const char* partition_membership_name(idx_t idx) const;
// Return the index of the next available region >= start_index, or maximum_regions if not found.
@@ -377,7 +373,12 @@ public:
inline void set_capacity_of(ShenandoahFreeSetPartitionId which_partition, size_t value);
inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value);
inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
shenandoah_assert_heaplocked();
assert (which_partition < NumPartitions, "selected free set must be valid");
_used[int(which_partition)] = value;
_available[int(which_partition)] = _capacity[int(which_partition)] - value;
}
inline size_t count(ShenandoahFreeSetPartitionId which_partition) const { return _region_counts[int(which_partition)]; }
@@ -401,7 +402,7 @@ public:
// idx >= leftmost &&
// idx <= rightmost
// }
void assert_bounds() NOT_DEBUG_RETURN;
void assert_bounds(bool validate_totals) NOT_DEBUG_RETURN;
};
// Publicly, ShenandoahFreeSet represents memory that is available to mutator threads. The public capacity(), used(),
@@ -633,11 +634,7 @@ private:
void establish_old_collector_alloc_bias();
size_t get_usable_free_words(size_t free_bytes) const;
void reduce_young_reserve(size_t adjusted_young_reserve, size_t requested_young_reserve);
void reduce_old_reserve(size_t adjusted_old_reserve, size_t requested_old_reserve);
void log_freeset_stats(ShenandoahFreeSetPartitionId partition_id, LogStream& ls);
// log status, assuming lock has already been acquired by the caller.
void log_status();
@@ -688,46 +685,35 @@ public:
return _total_global_used;
}
// A negative argument results in moving from old_collector to collector
void move_unaffiliated_regions_from_collector_to_old_collector(ssize_t regions);
inline size_t global_unaffiliated_regions() {
size_t global_unaffiliated_regions() {
return _global_unaffiliated_regions;
}
inline size_t young_unaffiliated_regions() {
size_t young_unaffiliated_regions() {
return _young_unaffiliated_regions;
}
inline size_t collector_unaffiliated_regions() {
return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector);
}
inline size_t old_collector_unaffiliated_regions() {
size_t old_unaffiliated_regions() {
return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector);
}
inline size_t old_unaffiliated_regions() {
return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector);
}
inline size_t young_affiliated_regions() {
size_t young_affiliated_regions() {
return _young_affiliated_regions;
}
inline size_t old_affiliated_regions() {
size_t old_affiliated_regions() {
return _old_affiliated_regions;
}
inline size_t global_affiliated_regions() {
size_t global_affiliated_regions() {
return _global_affiliated_regions;
}
inline size_t total_young_regions() {
size_t total_young_regions() {
return _total_young_regions;
}
inline size_t total_old_regions() {
size_t total_old_regions() {
return _partitions.get_capacity(ShenandoahFreeSetPartitionId::OldCollector) / ShenandoahHeapRegion::region_size_bytes();
}
@@ -739,27 +725,36 @@ public:
// Examine the existing free set representation, capturing the current state into var arguments:
//
// young_trashed_regions is the number of trashed regions (immediate garbage at final mark, cset regions after update refs)
// old_trashed_regions is the number of trashed regions
// (immediate garbage at final old mark, cset regions after update refs for mixed evac)
// young_cset_regions is the number of regions currently in the young cset if we are starting to evacuate, or zero
// old_cset_regions is the number of regions currently in the old cset if we are starting a mixed evacuation, or zero
// first_old_region is the index of the first region that is part of the OldCollector set
// last_old_region is the index of the last region that is part of the OldCollector set
// old_region_count is the number of regions in the OldCollector set that have memory available to be allocated
void prepare_to_rebuild(size_t &young_trashed_regions, size_t &old_trashed_regions,
void prepare_to_rebuild(size_t &young_cset_regions, size_t &old_cset_regions,
size_t &first_old_region, size_t &last_old_region, size_t &old_region_count);
// At the end of final mark, but before we begin evacuating, heuristics calculate how much memory is required to
// hold the results of evacuating to young-gen and to old-gen. These quantities, stored in reserves for their
// respective generations, are consulted prior to rebuilding the free set (ShenandoahFreeSet) in preparation for
// evacuation. When the free set is rebuilt, we make sure to reserve sufficient memory in the collector and
// old_collector sets to hold evacuations. Likewise, at the end of update refs, we rebuild the free set in order
// to set aside reserves to be consumed during the next GC cycle.
// hold the results of evacuating to young-gen and to old-gen, and have_evacuation_reserves should be true.
// These quantities, stored as reserves for their respective generations, are consulted prior to rebuilding
// the free set (ShenandoahFreeSet) in preparation for evacuation. When the free set is rebuilt, we make sure
// to reserve sufficient memory in the collector and old_collector sets to hold evacuations.
//
// young_trashed_regions is the number of trashed regions (immediate garbage at final mark, cset regions after update refs)
// old_trashed_regions is the number of trashed regions
// (immediate garbage at final old mark, cset regions after update refs for mixed evac)
// We also rebuild the free set at the end of GC, as we prepare to idle GC until the next trigger. In this case,
// have_evacuation_reserves is false because we don't yet know how much memory will need to be evacuated in the
// next GC cycle. When have_evacuation_reserves is false, the free set rebuild operation reserves for the collector
// and old_collector sets based on alternative mechanisms, such as ShenandoahEvacReserve, ShenandoahOldEvacReserve, and
// ShenandoahOldCompactionReserve. In a future planned enhancement, the reserve for old_collector set when the
// evacuation reserves are unknown, is based in part on anticipated promotion as determined by analysis of live data
// found during the previous GC pass which is one less than the current tenure age.
//
// young_cset_regions is the number of regions currently in the young cset if we are starting to evacuate, or zero
// old_cset_regions is the number of regions currently in the old cset if we are starting a mixed evacuation, or zero
// num_old_regions is the number of old-gen regions that have available memory for further allocations (excluding old cset)
void finish_rebuild(size_t young_trashed_regions, size_t old_trashed_regions, size_t num_old_regions);
// have_evacuation_reserves is true iff the desired values of young-gen and old-gen evacuation reserves and old-gen
// promotion reserve have been precomputed (and can be obtained by invoking
// <generation>->get_evacuation_reserve() or old_gen->get_promoted_reserve()
void finish_rebuild(size_t young_cset_regions, size_t old_cset_regions, size_t num_old_regions,
bool have_evacuation_reserves = false);
// When a region is promoted in place, we add the region's available memory if it is greater than plab_min_size()
// into the old collector partition by invoking this method.
@@ -811,18 +806,9 @@ public:
return _partitions.available_in_locked_for_rebuild(ShenandoahFreeSetPartitionId::Mutator);
}
// Use this version of available() if the heap lock is held.
inline size_t available_locked() const {
return _partitions.available_in(ShenandoahFreeSetPartitionId::Mutator);
}
inline size_t total_humongous_waste() const { return _total_humongous_waste; }
inline size_t humongous_waste_in_mutator() const {
return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::Mutator);
}
inline size_t humongous_waste_in_old() const {
return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::OldCollector);
}
inline size_t humongous_waste_in_mutator() const { return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::Mutator); }
inline size_t humongous_waste_in_old() const { return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::OldCollector); }
void decrease_humongous_waste_for_regular_bypass(ShenandoahHeapRegion* r, size_t waste);
@@ -888,7 +874,7 @@ public:
// Reserve space for evacuations, with regions reserved for old evacuations placed to the right
// of regions reserved of young evacuations.
void compute_young_and_old_reserves(size_t young_cset_regions, size_t old_cset_regions,
void compute_young_and_old_reserves(size_t young_cset_regions, size_t old_cset_regions, bool have_evacuation_reserves,
size_t &young_reserve_result, size_t &old_reserve_result) const;
};

View File

@@ -522,7 +522,6 @@ public:
void heap_region_do(ShenandoahHeapRegion* r) override {
if (r->is_trash()) {
r->try_recycle_under_lock();
// No need to adjust_interval_for_recycled_old_region. That will be taken care of during freeset rebuild.
}
if (r->is_cset()) {
// Leave affiliation unchanged
@@ -967,7 +966,6 @@ public:
if (r->is_trash()) {
live = 0;
r->try_recycle_under_lock();
// No need to adjust_interval_for_recycled_old_region. That will be taken care of during freeset rebuild.
} else {
if (r->is_old()) {
ShenandoahGenerationalFullGC::account_for_region(r, _old_regions, _old_usage, _old_humongous_waste);
@@ -1115,16 +1113,16 @@ void ShenandoahFullGC::phase5_epilog() {
ShenandoahPostCompactClosure post_compact;
heap->heap_region_iterate(&post_compact);
heap->collection_set()->clear();
size_t young_cset_regions, old_cset_regions, first_old, last_old, num_old;
ShenandoahFreeSet* free_set = heap->free_set();
{
ShenandoahFreeSet* free_set = heap->free_set();
size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
// We also do not expand old generation size following Full GC because we have scrambled age populations and
// no longer have objects separated by age into distinct regions.
if (heap->mode()->is_generational()) {
ShenandoahGenerationalFullGC::compute_balances();
}
free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
free_set->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
}
// Set mark incomplete because the marking bitmaps have been reset except pinned regions.
_generation->set_mark_incomplete();

View File

@@ -250,7 +250,6 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
ShenandoahOldGeneration* const old_generation = heap->old_generation();
ShenandoahYoungGeneration* const young_generation = heap->young_generation();
const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
// During initialization and phase changes, it is more likely that fewer objects die young and old-gen
// memory is not yet full (or is in the process of being replaced). During these times especially, it
@@ -264,15 +263,15 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
// First priority is to reclaim the easy garbage out of young-gen.
// maximum_young_evacuation_reserve is upper bound on memory to be evacuated into young Collector Reserve. This is
// bounded at the end of previous GC cycle, based on available memory and balancing of evacuation to old and young.
size_t maximum_young_evacuation_reserve = young_generation->get_evacuation_reserve();
// maximum_young_evacuation_reserve is upper bound on memory to be evacuated out of young
const size_t maximum_young_evacuation_reserve = (young_generation->max_capacity() * ShenandoahEvacReserve) / 100;
size_t young_evacuation_reserve = MIN2(maximum_young_evacuation_reserve, young_generation->available_with_reserve());
// maximum_old_evacuation_reserve is an upper bound on memory evacuated from old and evacuated to old (promoted),
// clamped by the old generation space available.
//
// Here's the algebra.
// Let SOEP = ShenandoahOldEvacPercent,
// Let SOEP = ShenandoahOldEvacRatioPercent,
// OE = old evac,
// YE = young evac, and
// TE = total evac = OE + YE
@@ -284,14 +283,12 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
// => OE = YE*SOEP/(100-SOEP)
// We have to be careful in the event that SOEP is set to 100 by the user.
assert(ShenandoahOldEvacPercent <= 100, "Error");
assert(ShenandoahOldEvacRatioPercent <= 100, "Error");
const size_t old_available = old_generation->available();
const size_t maximum_old_evacuation_reserve = (ShenandoahOldEvacPercent == 100) ?
old_available : MIN2((maximum_young_evacuation_reserve * ShenandoahOldEvacPercent) / (100 - ShenandoahOldEvacPercent),
const size_t maximum_old_evacuation_reserve = (ShenandoahOldEvacRatioPercent == 100) ?
old_available : MIN2((maximum_young_evacuation_reserve * ShenandoahOldEvacRatioPercent) / (100 - ShenandoahOldEvacRatioPercent),
old_available);
// In some cases, maximum_old_reserve < old_available (when limited by ShenandoahOldEvacPercent)
// This limit affects mixed evacuations, but does not affect promotions.
// Second priority is to reclaim garbage out of old-gen if there are old-gen collection candidates. Third priority
// is to promote as much as we have room to promote. However, if old-gen memory is in short supply, this means young
@@ -308,8 +305,10 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
// evacuation and update-refs, we give emphasis to reclaiming garbage first, wherever that garbage is found.
// Global GC will adjust generation sizes to accommodate the collection set it chooses.
// Use remnant of old_available to hold promotions.
old_promo_reserve = old_available - maximum_old_evacuation_reserve;
// Set old_promo_reserve to enforce that no regions are preselected for promotion. Such regions typically
// have relatively high memory utilization. We still call select_aged_regions() because this will prepare for
// promotions in place, if relevant.
old_promo_reserve = 0;
// Dedicate all available old memory to old_evacuation reserve. This may be small, because old-gen is only
// expanded based on an existing mixed evacuation workload at the end of the previous GC cycle. We'll expand
@@ -320,48 +319,43 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
// mixed evacuation, reserve all of this memory for compaction of old-gen and do not promote. Prioritize compaction
// over promotion in order to defragment OLD so that it will be better prepared to efficiently receive promoted memory.
old_evacuation_reserve = maximum_old_evacuation_reserve;
old_promo_reserve = old_available - maximum_old_evacuation_reserve;
old_promo_reserve = 0;
} else {
// Make all old-evacuation memory for promotion, but if we can't use it all for promotion, we'll allow some evacuation.
old_evacuation_reserve = old_available - maximum_old_evacuation_reserve;
old_evacuation_reserve = 0;
old_promo_reserve = maximum_old_evacuation_reserve;
}
assert(old_evacuation_reserve <= old_available, "Error");
// We see too many old-evacuation failures if we force ourselves to evacuate into regions that are not initially empty.
// So we limit the old-evacuation reserve to unfragmented memory. Even so, old-evacuation is free to fill in nooks and
// crannies within existing partially used regions and it generally tries to do so.
const size_t old_free_unfragmented = old_generation->free_unaffiliated_regions() * region_size_bytes;
const size_t old_free_unfragmented = old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
if (old_evacuation_reserve > old_free_unfragmented) {
const size_t delta = old_evacuation_reserve - old_free_unfragmented;
old_evacuation_reserve -= delta;
// Let promo consume fragments of old-gen memory
old_promo_reserve += delta;
// Let promo consume fragments of old-gen memory if not global
if (!is_global()) {
old_promo_reserve += delta;
}
}
// If is_global(), we let garbage-first heuristic determine cset membership. Otherwise, we give priority
// to tenurable regions by preselecting regions for promotion by evacuation (obtaining the live data to seed promoted_reserve).
// This also identifies regions that will be promoted in place. These use the tenuring threshold.
const size_t consumed_by_advance_promotion = select_aged_regions(is_global()? 0: old_promo_reserve);
assert(consumed_by_advance_promotion <= old_promo_reserve, "Do not promote more than budgeted");
// The young evacuation reserve can be no larger than young_unaffiliated. Planning to evacuate into partially consumed
// young regions is doomed to failure if any of those partially consumed regions is selected for the collection set.
size_t young_unaffiliated = young_generation->free_unaffiliated_regions() * region_size_bytes;
// Preselect regions for promotion by evacuation (obtaining the live data to seed promoted_reserve),
// and identify regions that will promote in place. These use the tenuring threshold.
const size_t consumed_by_advance_promotion = select_aged_regions(old_promo_reserve);
assert(consumed_by_advance_promotion <= maximum_old_evacuation_reserve, "Cannot promote more than available old-gen memory");
// If any regions have been selected for promotion in place, this has the effect of decreasing available within mutator
// and collector partitions, due to padding of remnant memory within each promoted in place region. This will affect
// young_evacuation_reserve but not old_evacuation_reserve or consumed_by_advance_promotion. So recompute.
size_t young_evacuation_reserve = MIN2(maximum_young_evacuation_reserve, young_unaffiliated);
young_evacuation_reserve = MIN2(young_evacuation_reserve, young_generation->available_with_reserve());
// Note that unused old_promo_reserve might not be entirely consumed_by_advance_promotion. Do not transfer this
// to old_evacuation_reserve because this memory is likely very fragmented, and we do not want to increase the likelihood
// of old evacuation failure. Leave this memory in the promoted reserve as it may be targeted by opportunistic
// promotions (found during evacuation of young regions).
// of old evacuation failure.
young_generation->set_evacuation_reserve(young_evacuation_reserve);
old_generation->set_evacuation_reserve(old_evacuation_reserve);
old_generation->set_promoted_reserve(old_promo_reserve);
old_generation->set_promoted_reserve(consumed_by_advance_promotion);
// There is no need to expand OLD because all memory used here was set aside at end of previous GC, except in the
// case of a GLOBAL gc. During choose_collection_set() of GLOBAL, old will be expanded on demand.
@@ -369,8 +363,8 @@ void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap
// Having chosen the collection set, adjust the budgets for generational mode based on its composition. Note
// that young_generation->available() now knows about recently discovered immediate garbage.
void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
ShenandoahCollectionSet* const collection_set, size_t add_regions_to_old) {
//
void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap, ShenandoahCollectionSet* const collection_set) {
shenandoah_assert_generational();
// We may find that old_evacuation_reserve and/or loaned_for_young_evacuation are not fully consumed, in which case we may
// be able to increase regions_available_to_loan
@@ -404,8 +398,7 @@ void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
// Leave old_evac_reserve as previously configured
} else if (old_evacuated_committed < old_evacuation_reserve) {
// This happens if the old-gen collection consumes less than full budget.
log_debug(gc, cset)("Shrinking old evac reserve to match old_evac_commited: " PROPERFMT,
PROPERFMTARGS(old_evacuated_committed));
log_debug(gc, cset)("Shrinking old evac reserve to match old_evac_commited: " PROPERFMT, PROPERFMTARGS(old_evacuated_committed));
old_evacuation_reserve = old_evacuated_committed;
old_generation->set_evacuation_reserve(old_evacuation_reserve);
}
@@ -416,17 +409,11 @@ void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
size_t young_evacuated = collection_set->get_live_bytes_in_untenurable_regions();
size_t young_evacuated_reserve_used = (size_t) (ShenandoahEvacWaste * double(young_evacuated));
size_t total_young_available = young_generation->available_with_reserve() - add_regions_to_old * region_size_bytes;;
assert(young_evacuated_reserve_used <= total_young_available, "Cannot evacuate (%zu) more than is available in young (%zu)",
young_evacuated_reserve_used, total_young_available);
size_t total_young_available = young_generation->available_with_reserve();
assert(young_evacuated_reserve_used <= total_young_available, "Cannot evacuate more than is available in young");
young_generation->set_evacuation_reserve(young_evacuated_reserve_used);
// We have not yet rebuilt the free set. Some of the memory that is thought to be avaiable within old may no
// longer be available if that memory had been free within regions that were selected for the collection set.
// Make the necessary adjustments to old_available.
size_t old_available =
old_generation->available() + add_regions_to_old * region_size_bytes - collection_set->get_old_available_bytes_collected();
size_t old_available = old_generation->available();
// Now that we've established the collection set, we know how much memory is really required by old-gen for evacuation
// and promotion reserves. Try shrinking OLD now in case that gives us a bit more runway for mutator allocations during
// evac and update phases.
@@ -435,27 +422,21 @@ void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
if (old_available < old_consumed) {
// This can happen due to round-off errors when adding the results of truncated integer arithmetic.
// We've already truncated old_evacuated_committed. Truncate young_advance_promoted_reserve_used here.
assert(young_advance_promoted_reserve_used <= (33 * (old_available - old_evacuated_committed)) / 32,
"Round-off errors should be less than 3.125%%, committed: %zu, reserved: %zu",
young_advance_promoted_reserve_used, old_available - old_evacuated_committed);
if (old_available > old_evacuated_committed) {
young_advance_promoted_reserve_used = old_available - old_evacuated_committed;
} else {
young_advance_promoted_reserve_used = 0;
old_evacuated_committed = old_available;
}
// TODO: reserve for full promotion reserve, not just for advance (preselected) promotion
young_advance_promoted_reserve_used = old_available - old_evacuated_committed;
old_consumed = old_evacuated_committed + young_advance_promoted_reserve_used;
}
assert(old_available >= old_consumed, "Cannot consume (%zu) more than is available (%zu)",
old_consumed, old_available);
size_t excess_old = old_available - old_consumed;
size_t unaffiliated_old_regions = old_generation->free_unaffiliated_regions() + add_regions_to_old;
size_t unaffiliated_old_regions = old_generation->free_unaffiliated_regions();
size_t unaffiliated_old = unaffiliated_old_regions * region_size_bytes;
assert(unaffiliated_old >= old_evacuated_committed, "Do not evacuate (%zu) more than unaffiliated old (%zu)",
old_evacuated_committed, unaffiliated_old);
assert(old_available >= unaffiliated_old,
"Unaffiliated old (%zu is %zu * %zu) is a subset of old available (%zu)",
unaffiliated_old, unaffiliated_old_regions, region_size_bytes, old_available);
// Make sure old_evac_committed is unaffiliated
if (old_evacuated_committed > 0) {
@@ -473,22 +454,20 @@ void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
}
// If we find that OLD has excess regions, give them back to YOUNG now to reduce likelihood we run out of allocation
// runway during evacuation and update-refs. We may make further adjustments to balance.
ssize_t add_regions_to_young = 0;
// runway during evacuation and update-refs.
size_t regions_to_xfer = 0;
if (excess_old > unaffiliated_old) {
// we can give back unaffiliated_old (all of unaffiliated is excess)
if (unaffiliated_old_regions > 0) {
add_regions_to_young = unaffiliated_old_regions;
regions_to_xfer = unaffiliated_old_regions;
}
} else if (unaffiliated_old_regions > 0) {
// excess_old < unaffiliated old: we can give back MIN(excess_old/region_size_bytes, unaffiliated_old_regions)
size_t excess_regions = excess_old / region_size_bytes;
add_regions_to_young = MIN2(excess_regions, unaffiliated_old_regions);
regions_to_xfer = MIN2(excess_regions, unaffiliated_old_regions);
}
if (add_regions_to_young > 0) {
assert(excess_old >= add_regions_to_young * region_size_bytes, "Cannot xfer more than excess old");
excess_old -= add_regions_to_young * region_size_bytes;
if (regions_to_xfer > 0) {
excess_old -= regions_to_xfer * region_size_bytes;
log_debug(gc, ergo)("Before start of evacuation, total_promotion reserve is young_advance_promoted_reserve: %zu "
"plus excess: old: %zu", young_advance_promoted_reserve_used, excess_old);
}
@@ -496,7 +475,6 @@ void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap,
// Add in the excess_old memory to hold unanticipated promotions, if any. If there are more unanticipated
// promotions than fit in reserved memory, they will be deferred until a future GC pass.
size_t total_promotion_reserve = young_advance_promoted_reserve_used + excess_old;
old_generation->set_promoted_reserve(total_promotion_reserve);
old_generation->reset_promoted_expended();
}
@@ -804,13 +782,17 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
ShenandoahCollectionSetPreselector preselector(collection_set, heap->num_regions());
// Find the amount that will be promoted, regions that will be promoted in
// place, and preselected older regions that will be promoted by evacuation.
// place, and preselect older regions that will be promoted by evacuation.
compute_evacuation_budgets(heap);
// Choose the collection set, including the regions preselected above for promotion into the old generation.
size_t add_regions_to_old = _heuristics->choose_collection_set(collection_set);
// Even if collection_set->is_empty(), we want to adjust budgets, making reserves available to mutator.
adjust_evacuation_budgets(heap, collection_set, add_regions_to_old);
// Choose the collection set, including the regions preselected above for
// promotion into the old generation.
_heuristics->choose_collection_set(collection_set);
if (!collection_set->is_empty()) {
// only make use of evacuation budgets when we are evacuating
adjust_evacuation_budgets(heap, collection_set);
}
if (is_global()) {
// We have just chosen a collection set for a global cycle. The mark bitmap covering old regions is complete, so
// the remembered set scan can use that to avoid walking into garbage. When the next old mark begins, we will
@@ -834,16 +816,17 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
ShenandoahPhaseTimings::degen_gc_final_rebuild_freeset);
ShenandoahHeapLocker locker(heap->lock());
// We are preparing for evacuation.
size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
_free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
// We are preparing for evacuation. At this time, we ignore cset region tallies.
size_t young_cset_regions, old_cset_regions, first_old, last_old, num_old;
_free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
if (heap->mode()->is_generational()) {
ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
size_t allocation_runway =
gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trashed_regions);
gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
gen_heap->compute_old_generation_balance(young_cset_regions, old_cset_regions);
}
_free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
// Free set construction uses reserve quantities, because they are known to be valid here
_free_set->finish_rebuild(young_cset_regions, old_cset_regions, num_old, true);
}
}

View File

@@ -63,10 +63,9 @@ private:
// Compute evacuation budgets prior to choosing collection set.
void compute_evacuation_budgets(ShenandoahHeap* heap);
// Adjust evacuation budgets after choosing collection set. The argument regions_to_xfer represents regions to be
// transfered to old based on decisions made in top_off_collection_set()
// Adjust evacuation budgets after choosing collection set.
void adjust_evacuation_budgets(ShenandoahHeap* heap,
ShenandoahCollectionSet* collection_set, size_t regions_to_xfer);
ShenandoahCollectionSet* collection_set);
// Preselect for possible inclusion into the collection set exactly the most
// garbage-dense regions, including those that satisfy criteria 1 & 2 below,
@@ -145,22 +144,6 @@ private:
virtual void prepare_gc();
// Called during final mark, chooses collection set, rebuilds free set.
// Upon return from prepare_regions_and_collection_set(), certain parameters have been established to govern the
// evacuation efforts that are about to begin. In particular:
//
// old_generation->get_promoted_reserve() represents the amount of memory within old-gen's available memory that has
// been set aside to hold objects promoted from young-gen memory. This represents an estimated percentage
// of the live young-gen memory within the collection set. If there is more data ready to be promoted than
// can fit within this reserve, the promotion of some objects will be deferred until a subsequent evacuation
// pass.
//
// old_generation->get_evacuation_reserve() represents the amount of memory within old-gen's available memory that has been
// set aside to hold objects evacuated from the old-gen collection set.
//
// young_generation->get_evacuation_reserve() represents the amount of memory within young-gen's available memory that has
// been set aside to hold objects evacuated from the young-gen collection set. Conservatively, this value
// equals the entire amount of live young-gen memory within the collection set, even though some of this memory
// will likely be promoted.
virtual void prepare_regions_and_collection_set(bool concurrent);
// Cancel marking (used by Full collect and when cancelling cycle).

View File

@@ -55,6 +55,9 @@ void ShenandoahGenerationalFullGC::prepare() {
// Since we may arrive here from degenerated GC failure of either young or old, establish generation as GLOBAL.
heap->set_active_generation(heap->global_generation());
// No need for old_gen->increase_used() as this was done when plabs were allocated.
heap->reset_generation_reserves();
// Full GC supersedes any marking or coalescing in old generation.
heap->old_generation()->cancel_gc();
}
@@ -153,11 +156,8 @@ void ShenandoahGenerationalFullGC::compute_balances() {
// In case this Full GC resulted from degeneration, clear the tally on anticipated promotion.
heap->old_generation()->set_promotion_potential(0);
// Invoke this in case we are able to transfer memory from OLD to YOUNG
size_t allocation_runway =
heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(0L);
heap->compute_old_generation_balance(allocation_runway, 0, 0);
// Invoke this in case we are able to transfer memory from OLD to YOUNG.
heap->compute_old_generation_balance(0, 0);
}
ShenandoahPrepareForGenerationalCompactionObjectClosure::ShenandoahPrepareForGenerationalCompactionObjectClosure(PreservedMarks* preserved_marks,

View File

@@ -299,9 +299,9 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint
alloc_from_lab = false;
}
// else, we leave copy equal to nullptr, signaling a promotion failure below if appropriate.
// We choose not to promote objects smaller than size_threshold by way of shared allocations as this is too
// We choose not to promote objects smaller than PLAB::min_size() by way of shared allocations, as this is too
// costly. Instead, we'll simply "evacuate" to young-gen memory (using a GCLAB) and will promote in a future
// evacuation pass. This condition is denoted by: is_promotion && has_plab && (size <= size_threshhold).
// evacuation pass. This condition is denoted by: is_promotion && has_plab && (size <= PLAB::min_size())
}
#ifdef ASSERT
}
@@ -576,18 +576,19 @@ void ShenandoahGenerationalHeap::retire_plab(PLAB* plab) {
// Make sure old-generation is large enough, but no larger than is necessary, to hold mixed evacuations
// and promotions, if we anticipate either. Any deficit is provided by the young generation, subject to
// mutator_xfer_limit, and any surplus is transferred to the young generation. mutator_xfer_limit is
// the maximum we're able to transfer from young to old. This is called at the end of GC, as we prepare
// for the idle span that precedes the next GC.
void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t mutator_xfer_limit,
size_t old_trashed_regions, size_t young_trashed_regions) {
shenandoah_assert_heaplocked();
// xfer_limit, and any surplus is transferred to the young generation.
//
// xfer_limit is the maximum we're able to transfer from young to old based on either:
// 1. an assumption that we will be able to replenish memory "borrowed" from young at the end of collection, or
// 2. there is sufficient excess in the allocation runway during GC idle cycles
void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t old_xfer_limit, size_t old_cset_regions) {
// We can limit the old reserve to the size of anticipated promotions:
// max_old_reserve is an upper bound on memory evacuated from old and promoted to old,
// clamped by the old generation space available.
//
// Here's the algebra.
// Let SOEP = ShenandoahOldEvacPercent,
// Let SOEP = ShenandoahOldEvacRatioPercent,
// OE = old evac,
// YE = young evac, and
// TE = total evac = OE + YE
@@ -599,171 +600,81 @@ void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t mutator_x
// => OE = YE*SOEP/(100-SOEP)
// We have to be careful in the event that SOEP is set to 100 by the user.
assert(ShenandoahOldEvacPercent <= 100, "Error");
assert(ShenandoahOldEvacRatioPercent <= 100, "Error");
const size_t old_available = old_generation()->available();
// The free set will reserve this amount of memory to hold young evacuations
const size_t young_reserve = (young_generation()->max_capacity() * ShenandoahEvacReserve) / 100;
// In the case that ShenandoahOldEvacRatioPercent equals 100, max_old_reserve is limited only by xfer_limit.
const double bound_on_old_reserve = old_available + old_xfer_limit + young_reserve;
const double max_old_reserve = ((ShenandoahOldEvacRatioPercent == 100)? bound_on_old_reserve:
MIN2(double(young_reserve * ShenandoahOldEvacRatioPercent)
/ double(100 - ShenandoahOldEvacRatioPercent), bound_on_old_reserve));
const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
ShenandoahOldGeneration* old_gen = old_generation();
size_t old_capacity = old_gen->max_capacity();
size_t old_usage = old_gen->used(); // includes humongous waste
size_t old_available = ((old_capacity >= old_usage)? old_capacity - old_usage: 0) + old_trashed_regions * region_size_bytes;
ShenandoahYoungGeneration* young_gen = young_generation();
size_t young_capacity = young_gen->max_capacity();
size_t young_usage = young_gen->used(); // includes humongous waste
size_t young_available = ((young_capacity >= young_usage)? young_capacity - young_usage: 0);
size_t freeset_available = free_set()->available_locked();
if (young_available > freeset_available) {
young_available = freeset_available;
}
young_available += young_trashed_regions * region_size_bytes;
// The free set will reserve this amount of memory to hold young evacuations (initialized to the ideal reserve)
size_t young_reserve = (young_generation()->max_capacity() * ShenandoahEvacReserve) / 100;
// If ShenandoahOldEvacPercent equals 100, max_old_reserve is limited only by mutator_xfer_limit and young_reserve
const size_t bound_on_old_reserve = ((old_available + mutator_xfer_limit + young_reserve) * ShenandoahOldEvacPercent) / 100;
size_t proposed_max_old = ((ShenandoahOldEvacPercent == 100)?
bound_on_old_reserve:
MIN2((young_reserve * ShenandoahOldEvacPercent) / (100 - ShenandoahOldEvacPercent),
bound_on_old_reserve));
if (young_reserve > young_available) {
young_reserve = young_available;
}
// Decide how much old space we should reserve for a mixed collection
size_t reserve_for_mixed = 0;
const size_t old_fragmented_available =
old_available - (old_generation()->free_unaffiliated_regions() + old_trashed_regions) * region_size_bytes;
if (old_fragmented_available > proposed_max_old) {
// After we've promoted regions in place, there may be an abundance of old-fragmented available memory,
// even more than the desired percentage for old reserve. We cannot transfer these fragmented regions back
// to young. Instead we make the best of the situation by using this fragmented memory for both promotions
// and evacuations.
proposed_max_old = old_fragmented_available;
}
size_t reserve_for_promo = old_fragmented_available;
const size_t max_old_reserve = proposed_max_old;
const size_t mixed_candidate_live_memory = old_generation()->unprocessed_collection_candidates_live_memory();
const bool doing_mixed = (mixed_candidate_live_memory > 0);
if (doing_mixed) {
double reserve_for_mixed = 0;
if (old_generation()->has_unprocessed_collection_candidates()) {
// We want this much memory to be unfragmented in order to reliably evacuate old. This is conservative because we
// may not evacuate the entirety of unprocessed candidates in a single mixed evacuation.
const size_t max_evac_need = (size_t) (mixed_candidate_live_memory * ShenandoahOldEvacWaste);
const double max_evac_need =
(double(old_generation()->unprocessed_collection_candidates_live_memory()) * ShenandoahOldEvacWaste);
assert(old_available >= old_generation()->free_unaffiliated_regions() * region_size_bytes,
"Unaffiliated available must be less than total available");
// We prefer to evacuate all of mixed into unfragmented memory, and will expand old in order to do so, unless
// we already have too much fragmented available memory in old.
reserve_for_mixed = max_evac_need;
if (reserve_for_mixed + reserve_for_promo > max_old_reserve) {
// In this case, we'll allow old-evac to target some of the fragmented old memory.
size_t excess_reserves = (reserve_for_mixed + reserve_for_promo) - max_old_reserve;
if (reserve_for_promo > excess_reserves) {
reserve_for_promo -= excess_reserves;
} else {
excess_reserves -= reserve_for_promo;
reserve_for_promo = 0;
reserve_for_mixed -= excess_reserves;
}
const double old_fragmented_available =
double(old_available - old_generation()->free_unaffiliated_regions() * region_size_bytes);
reserve_for_mixed = max_evac_need + old_fragmented_available;
if (reserve_for_mixed > max_old_reserve) {
reserve_for_mixed = max_old_reserve;
}
}
// Decide how much additional space we should reserve for promotions from young. We give priority to mixed evacations
// over promotions.
// Decide how much space we should reserve for promotions from young
size_t reserve_for_promo = 0;
const size_t promo_load = old_generation()->get_promotion_potential();
const bool doing_promotions = promo_load > 0;
if (doing_promotions) {
// We've already set aside all of the fragmented available memory within old-gen to represent old objects
// to be promoted from young generation. promo_load represents the memory that we anticipate to be promoted
// from regions that have reached tenure age. In the ideal, we will always use fragmented old-gen memory
// to hold individually promoted objects and will use unfragmented old-gen memory to represent the old-gen
// evacuation workloa.
// We're promoting and have an estimate of memory to be promoted from aged regions
assert(max_old_reserve >= (reserve_for_mixed + reserve_for_promo), "Sanity");
const size_t available_for_additional_promotions = max_old_reserve - (reserve_for_mixed + reserve_for_promo);
size_t promo_need = (size_t)(promo_load * ShenandoahPromoEvacWaste);
if (promo_need > reserve_for_promo) {
reserve_for_promo += MIN2(promo_need - reserve_for_promo, available_for_additional_promotions);
}
// We've already reserved all the memory required for the promo_load, and possibly more. The excess
// can be consumed by objects promoted from regions that have not yet reached tenure age.
// We're promoting and have a bound on the maximum amount that can be promoted
assert(max_old_reserve >= reserve_for_mixed, "Sanity");
const size_t available_for_promotions = max_old_reserve - reserve_for_mixed;
reserve_for_promo = MIN2((size_t)(promo_load * ShenandoahPromoEvacWaste), available_for_promotions);
}
// This is the total old we want to reserve (initialized to the ideal reserve)
size_t old_reserve = reserve_for_mixed + reserve_for_promo;
// This is the total old we want to ideally reserve
const size_t old_reserve = reserve_for_mixed + reserve_for_promo;
assert(old_reserve <= max_old_reserve, "cannot reserve more than max for old evacuations");
// We now check if the old generation is running a surplus or a deficit.
size_t old_region_deficit = 0;
size_t old_region_surplus = 0;
size_t mutator_region_xfer_limit = mutator_xfer_limit / region_size_bytes;
// align the mutator_xfer_limit on region size
mutator_xfer_limit = mutator_region_xfer_limit * region_size_bytes;
if (old_available >= old_reserve) {
const size_t max_old_available = old_generation()->available() + old_cset_regions * region_size_bytes;
if (max_old_available >= old_reserve) {
// We are running a surplus, so the old region surplus can go to young
const size_t old_surplus = old_available - old_reserve;
old_region_surplus = old_surplus / region_size_bytes;
const size_t unaffiliated_old_regions = old_generation()->free_unaffiliated_regions() + old_trashed_regions;
old_region_surplus = MIN2(old_region_surplus, unaffiliated_old_regions);
const size_t old_surplus = (max_old_available - old_reserve) / region_size_bytes;
const size_t unaffiliated_old_regions = old_generation()->free_unaffiliated_regions() + old_cset_regions;
const size_t old_region_surplus = MIN2(old_surplus, unaffiliated_old_regions);
old_generation()->set_region_balance(checked_cast<ssize_t>(old_region_surplus));
} else if (old_available + mutator_xfer_limit >= old_reserve) {
// Mutator's xfer limit is sufficient to satisfy our need: transfer all memory from there
size_t old_deficit = old_reserve - old_available;
old_region_deficit = (old_deficit + region_size_bytes - 1) / region_size_bytes;
old_generation()->set_region_balance(0 - checked_cast<ssize_t>(old_region_deficit));
} else {
// We'll try to xfer from both mutator excess and from young collector reserve
size_t available_reserves = old_available + young_reserve + mutator_xfer_limit;
size_t old_entitlement = (available_reserves * ShenandoahOldEvacPercent) / 100;
// We are running a deficit which we'd like to fill from young.
// Ignore that this will directly impact young_generation()->max_capacity(),
// indirectly impacting young_reserve and old_reserve. These computations are conservative.
// Note that deficit is rounded up by one region.
const size_t old_need = (old_reserve - max_old_available + region_size_bytes - 1) / region_size_bytes;
const size_t max_old_region_xfer = old_xfer_limit / region_size_bytes;
// Round old_entitlement down to nearest multiple of regions to be transferred to old
size_t entitled_xfer = old_entitlement - old_available;
entitled_xfer = region_size_bytes * (entitled_xfer / region_size_bytes);
size_t unaffiliated_young_regions = young_generation()->free_unaffiliated_regions();
size_t unaffiliated_young_memory = unaffiliated_young_regions * region_size_bytes;
if (entitled_xfer > unaffiliated_young_memory) {
entitled_xfer = unaffiliated_young_memory;
}
old_entitlement = old_available + entitled_xfer;
if (old_entitlement < old_reserve) {
// There's not enough memory to satisfy our desire. Scale back our old-gen intentions.
size_t budget_overrun = old_reserve - old_entitlement;;
if (reserve_for_promo > budget_overrun) {
reserve_for_promo -= budget_overrun;
old_reserve -= budget_overrun;
} else {
budget_overrun -= reserve_for_promo;
reserve_for_promo = 0;
reserve_for_mixed = (reserve_for_mixed > budget_overrun)? reserve_for_mixed - budget_overrun: 0;
old_reserve = reserve_for_promo + reserve_for_mixed;
}
}
// Because of adjustments above, old_reserve may be smaller now than it was when we tested the branch
// condition above: "(old_available + mutator_xfer_limit >= old_reserve)
// Therefore, we do NOT know that: mutator_xfer_limit < old_reserve - old_available
size_t old_deficit = old_reserve - old_available;
old_region_deficit = (old_deficit + region_size_bytes - 1) / region_size_bytes;
// Shrink young_reserve to account for loan to old reserve
const size_t reserve_xfer_regions = old_region_deficit - mutator_region_xfer_limit;
young_reserve -= reserve_xfer_regions * region_size_bytes;
// Round down the regions we can transfer from young to old. If we're running short
// on young-gen memory, we restrict the xfer. Old-gen collection activities will be
// curtailed if the budget is restricted.
const size_t old_region_deficit = MIN2(old_need, max_old_region_xfer);
old_generation()->set_region_balance(0 - checked_cast<ssize_t>(old_region_deficit));
}
}
assert(old_region_deficit == 0 || old_region_surplus == 0, "Only surplus or deficit, never both");
assert(young_reserve + reserve_for_mixed + reserve_for_promo <= old_available + young_available,
"Cannot reserve more memory than is available: %zu + %zu + %zu <= %zu + %zu",
young_reserve, reserve_for_mixed, reserve_for_promo, old_available, young_available);
// deficit/surplus adjustments to generation sizes will precede rebuild
young_generation()->set_evacuation_reserve(young_reserve);
old_generation()->set_evacuation_reserve(reserve_for_mixed);
old_generation()->set_promoted_reserve(reserve_for_promo);
void ShenandoahGenerationalHeap::reset_generation_reserves() {
ShenandoahHeapLocker locker(lock());
young_generation()->set_evacuation_reserve(0);
old_generation()->set_evacuation_reserve(0);
old_generation()->set_promoted_reserve(0);
}
void ShenandoahGenerationalHeap::coalesce_and_fill_old_regions(bool concurrent) {
@@ -1104,6 +1015,10 @@ void ShenandoahGenerationalHeap::final_update_refs_update_region_states() {
void ShenandoahGenerationalHeap::complete_degenerated_cycle() {
shenandoah_assert_heaplocked_or_safepoint();
// In case degeneration interrupted concurrent evacuation or update references, we need to clean up
// transient state. Otherwise, these actions have no effect.
reset_generation_reserves();
if (!old_generation()->is_parsable()) {
ShenandoahGCPhase phase(ShenandoahPhaseTimings::degen_gc_coalesce_and_fill);
coalesce_and_fill_old_regions(false);
@@ -1121,6 +1036,7 @@ void ShenandoahGenerationalHeap::complete_concurrent_cycle() {
// throw off the heuristics.
entry_global_coalesce_and_fill();
}
reset_generation_reserves();
}
void ShenandoahGenerationalHeap::entry_global_coalesce_and_fill() {

View File

@@ -136,7 +136,7 @@ public:
void reset_generation_reserves();
// Computes the optimal size for the old generation, represented as a surplus or deficit of old regions
void compute_old_generation_balance(size_t old_xfer_limit, size_t old_trashed_regions, size_t young_trashed_regions);
void compute_old_generation_balance(size_t old_xfer_limit, size_t old_cset_regions);
// Balances generations, coalesces and fills old regions if necessary
void complete_degenerated_cycle();

View File

@@ -425,29 +425,20 @@ jint ShenandoahHeap::initialize() {
_affiliations[i] = ShenandoahAffiliation::FREE;
}
if (mode()->is_generational()) {
size_t young_reserve = (soft_max_capacity() * ShenandoahEvacReserve) / 100;
young_generation()->set_evacuation_reserve(young_reserve);
old_generation()->set_evacuation_reserve((size_t) 0);
old_generation()->set_promoted_reserve((size_t) 0);
}
_free_set = new ShenandoahFreeSet(this, _num_regions);
post_initialize_heuristics();
// We are initializing free set. We ignore cset region tallies.
size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
_free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
size_t young_cset_regions, old_cset_regions, first_old, last_old, num_old;
_free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
if (mode()->is_generational()) {
ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
// We cannot call
// gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_cset_regions)
// until after the heap is fully initialized. So we make up a safe value here.
size_t allocation_runway = InitialHeapSize / 2;
gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
gen_heap->compute_old_generation_balance(allocation_runway, old_cset_regions);
}
_free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
_free_set->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
}
if (AlwaysPreTouch) {
@@ -2530,10 +2521,13 @@ void ShenandoahHeap::final_update_refs_update_region_states() {
parallel_heap_region_iterate(&cl);
}
void ShenandoahHeap::rebuild_free_set_within_phase() {
void ShenandoahHeap::rebuild_free_set(bool concurrent) {
ShenandoahGCPhase phase(concurrent ?
ShenandoahPhaseTimings::final_update_refs_rebuild_freeset :
ShenandoahPhaseTimings::degen_gc_final_update_refs_rebuild_freeset);
ShenandoahHeapLocker locker(lock());
size_t young_trashed_regions, old_trashed_regions, first_old_region, last_old_region, old_region_count;
_free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old_region, last_old_region, old_region_count);
size_t young_cset_regions, old_cset_regions, first_old_region, last_old_region, old_region_count;
_free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old_region, last_old_region, old_region_count);
// If there are no old regions, first_old_region will be greater than last_old_region
assert((first_old_region > last_old_region) ||
((last_old_region + 1 - first_old_region >= old_region_count) &&
@@ -2552,11 +2546,19 @@ void ShenandoahHeap::rebuild_free_set_within_phase() {
// available for transfer to old. Note that transfer of humongous regions does not impact available.
ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
size_t allocation_runway =
gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trashed_regions);
gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_cset_regions);
gen_heap->compute_old_generation_balance(allocation_runway, old_cset_regions);
// Total old_available may have been expanded to hold anticipated promotions. We trigger if the fragmented available
// memory represents more than 16 regions worth of data. Note that fragmentation may increase when we promote regular
// regions in place when many of these regular regions have an abundant amount of available memory within them.
// Fragmentation will decrease as promote-by-copy consumes the available memory within these partially consumed regions.
//
// We consider old-gen to have excessive fragmentation if more than 12.5% of old-gen is free memory that resides
// within partially consumed regions of memory.
}
// Rebuild free set based on adjusted generation sizes.
_free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, old_region_count);
_free_set->finish_rebuild(young_cset_regions, old_cset_regions, old_region_count);
if (mode()->is_generational()) {
ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
@@ -2565,13 +2567,6 @@ void ShenandoahHeap::rebuild_free_set_within_phase() {
}
}
void ShenandoahHeap::rebuild_free_set(bool concurrent) {
ShenandoahGCPhase phase(concurrent ?
ShenandoahPhaseTimings::final_update_refs_rebuild_freeset :
ShenandoahPhaseTimings::degen_gc_final_update_refs_rebuild_freeset);
rebuild_free_set_within_phase();
}
bool ShenandoahHeap::is_bitmap_slice_committed(ShenandoahHeapRegion* r, bool skip_self) {
size_t slice = r->index() / _bitmap_regions_per_slice;

View File

@@ -481,9 +481,7 @@ private:
void rendezvous_threads(const char* name);
void recycle_trash();
public:
// The following two functions rebuild the free set at the end of GC, in preparation for an idle phase.
void rebuild_free_set(bool concurrent);
void rebuild_free_set_within_phase();
void notify_gc_progress();
void notify_gc_no_progress();
size_t get_gc_no_progress_count() const;

Some files were not shown because too many files have changed in this diff Show More