From d7834c612b30e97b73f63e1e9e9078530a4e8e84 Mon Sep 17 00:00:00 2001 From: Suchismith Roy Date: Mon, 5 May 2025 12:21:26 -0400 Subject: [PATCH 1/6] cpu process load --- .../libmanagement_ext/UnixOperatingSystem.c | 49 ++++++++++++++++++- test/jdk/ProblemList.txt | 34 ++----------- 2 files changed, 52 insertions(+), 31 deletions(-) diff --git a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c index 228c5eb5c14e6..840c744f02675 100644 --- a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c +++ b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c @@ -28,7 +28,15 @@ /* Implement and update https://bugs.openjdk.org/browse/JDK-8030957 */ #include +#include +#include #include "com_sun_management_internal_OperatingSystemImpl.h" +perfstat_process_t prev_stats = {0}; +static unsigned long long prev_timebase = 0; +static int initialized = 0; + +#define HTIC2SEC(x) (((double)(x) * XINTFRAC) / 1000000000.0) + JNIEXPORT jdouble JNICALL Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 @@ -37,11 +45,50 @@ Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 return -1.0; } + + JNIEXPORT jdouble JNICALL Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0 (JNIEnv *env, jobject dummy) { - return -1.0; + perfstat_process_t curr_stats; + perfstat_id_t id; + unsigned long long curr_timebase, timebase_diff; + double user_diff, sys_diff, delta_time; + + + if (perfstat_process(&id, &curr_stats, sizeof(perfstat_process_t), 1) == -1) { + return -1.0; // Unable to get stats + } + if (!initialized) { + // First call: just store and return -1.0 + prev_stats = curr_stats; + prev_timebase = curr_stats.last_timebase; + initialized = 1; + return -1.0; + } + printf("initialised done"); + curr_timebase = curr_stats.last_timebase; + timebase_diff = curr_timebase - prev_timebase; + + if ((long long)timebase_diff <= 0 || XINTFRAC == 0) { + return -1.0; + } + + delta_time = HTIC2SEC(timebase_diff); + + user_diff = (double)(curr_stats.ucpu_time - prev_stats.ucpu_time); + sys_diff = (double)(curr_stats.scpu_time - prev_stats.scpu_time); + + prev_stats = curr_stats; + prev_timebase = curr_timebase; + + double cpu_load = (user_diff + sys_diff) / delta_time; + + return (jdouble)cpu_load; + + + } JNIEXPORT jdouble JNICALL diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 3edf4a9d18e9a..2e43a0c1d270d 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -143,7 +143,6 @@ java/awt/Focus/TestDisabledAutoTransfer.java 8159871 macosx-all,windows-all java/awt/Focus/TestDisabledAutoTransferSwing.java 6962362 windows-all java/awt/Focus/ActivateOnProperAppContextTest.java 8136516 macosx-all java/awt/Focus/FocusPolicyTest.java 7160904 linux-all -java/awt/Graphics/SmallPrimitives.java 8047070 macosx-all,linux-all java/awt/EventQueue/6980209/bug6980209.java 8198615 macosx-all java/awt/EventQueue/PushPopDeadlock/PushPopDeadlock.java 8024034 generic-all java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all @@ -189,9 +188,6 @@ java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all -java/awt/datatransfer/ClipboardPerformanceTest.java 8029022 windows-all -java/awt/datatransfer/HTMLTransferConsoleOutputTest.java 8237254 macosx-all -java/awt/datatransfer/ImageTransferCrashTest.java 8237253 macosx-all java/awt/Toolkit/RealSync/Test.java 6849383 linux-all java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8072110 macosx-all @@ -260,14 +256,7 @@ java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 6849371 macosx-all,linux-all java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java 8165863 macosx-all -java/awt/Clipboard/PasteNullToTextComponentsTest.java 8234140 macosx-all,windows-all -java/awt/Clipboard/NoOwnerNoTargetsTest.java 8234140 macosx-all -java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java 8234140 macosx-all java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all -java/awt/Clipboard/ClipboardSecurity.java 8054809 macosx-all -java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java 8234140 macosx-all -java/awt/Clipboard/ImageTransferTest.java 8030710 generic-all -java/awt/Clipboard/NoDataConversionFailureTest.java 8234140 macosx-all java/awt/Frame/MiscUndecorated/RepaintTest.java 8266244 macosx-aarch64 java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009 macosx-all java/awt/Modal/FileDialog/FileDialogAppModal2Test.java 7186009 macosx-all @@ -452,8 +441,6 @@ java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all -java/awt/ScrollPane/ScrollPositionTest.java 8040070 linux-all -java/awt/ScrollPane/ScrollPaneEventType.java 8296516 macosx-all java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,windows-all,macosx-all @@ -474,7 +461,6 @@ java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed. java/awt/PopupMenu/PopupMenuLocation.java 8259913,8315878 windows-all,macosx-aarch64 java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java 8238720,8324782 windows-all,macosx-all java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java 8238720,8324782 windows-all,macosx-all -java/awt/GridBagLayout/ComponentShortage.java 8355280 windows-all,linux-all java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java 8238720 windows-all # Several tests which fail sometimes on macos11 @@ -485,7 +471,6 @@ java/awt/MenuBar/TestNoScreenMenuBar.java 8265987 macosx-all java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8266283 generic-all java/awt/Graphics2D/DrawString/RotTransText.java 8316878 linux-all -java/awt/Graphics2D/CopyAreaOOB.java 8343106 macosx-aarch64 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java 8257529 windows-x64 java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java 8302787 windows-all java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java 8302787 windows-all @@ -493,6 +478,8 @@ java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemoni java/awt/Window/GetScreenLocation/GetScreenLocationTest.java 8225787 linux-x64 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 8266243 macosx-aarch64 +java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java 8029249 macosx-all +java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java 8029249 macosx-all java/awt/Dialog/ChoiceModalDialogTest.java 8161475 macosx-all java/awt/Dialog/FileDialogUserFilterTest.java 8001142 generic-all @@ -512,8 +499,6 @@ java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 m # Wayland related java/awt/FullScreen/SetFullScreenTest.java 8332155 linux-x64 -sun/java2d/ClassCastExceptionForInvalidSurface.java 8354097 linux-x64 -sun/java2d/GdiRendering/ClipShapeRendering.java 8354097 linux-x64 ############################################################################ @@ -551,8 +536,6 @@ java/io/IO/IO.java 8337935 linux-pp # jdk_management -com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all -com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java 8030957 aix-all java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all java/lang/management/MemoryMXBean/PendingAllGC.sh 8158837 generic-all @@ -691,7 +674,7 @@ javax/swing/JFileChooser/8194044/FileSystemRootTest.java 8327236 windows-all javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all -javax/swing/JFileChooser/bug6798062.java 8146446 windows-all +javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765 macosx-all,linux-all javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all @@ -784,15 +767,12 @@ jdk/jfr/jvm/TestWaste.java 8282427 generic- # jdk_foreign -java/foreign/TestBufferStackStress.java 8350455 macosx-all - ############################################################################ # Client manual tests javax/swing/JFileChooser/6698013/bug6698013.java 8024419 macosx-all javax/swing/JColorChooser/8065098/bug8065098.java 8065647 macosx-all -javax/swing/JTabbedPane/bug4499556.java 8267500 macosx-all -javax/swing/JTabbedPane/bug4666224.java 8144124 macosx-all +javax/swing/JTabbedPane/4666224/bug4666224.java 8144124 macosx-all javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java 8345090 windows-all,linux-all javax/swing/SwingUtilities/TestTextPosInPrint.java 8227025 windows-all javax/swing/JInternalFrame/bug4134077.java 8184985 windows-all @@ -808,14 +788,11 @@ java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all java/awt/Frame/FrameStateTest/FrameStateTest.java 8203920 macosx-all,linux-all java/awt/print/PrinterJob/ScaledText/ScaledText.java 8231226 macosx-all java/awt/print/PrinterJob/PrintTextTest.java 8148334 macosx-all -java/awt/font/GlyphVector/TestGlyphVectorLayout.java 8354987 generic-all java/awt/font/TextLayout/TestJustification.java 8250791 macosx-all java/awt/TrayIcon/DragEventSource/DragEventSource.java 8252242 macosx-all java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java 7187728 macosx-all,linux-all java/awt/print/PageFormat/Orient.java 8016055 macosx-all java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java 8024986 macosx-all,linux-all -java/awt/TextComponent/CorrectTextComponentSelectionTest.java 8237220 macosx-all -java/awt/TextComponent/SelectionAndCaretColor.java 7017622 linux-all java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java 8254841 macosx-all java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java 8256289 windows-x64 java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 8258103 linux-all @@ -825,10 +802,7 @@ java/awt/PopupMenu/PopupHangTest.java 8340022 windows-all java/awt/Focus/MinimizeNonfocusableWindowTest.java 8024487 windows-all java/awt/Focus/InactiveFocusRace.java 8023263 linux-all java/awt/List/HandlingKeyEventIfMousePressedTest.java 6848358 macosx-all,windows-all -java/awt/List/ListScrollbarCursorTest.java 8066410 generic-all java/awt/Checkbox/CheckboxBoxSizeTest.java 8340870 windows-all java/awt/Checkbox/CheckboxIndicatorSizeTest.java 8340870 windows-all java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all java/awt/dnd/WinMoveFileToShellTest.java 8341665 windows-all -java/awt/Menu/MenuVisibilityTest.java 8161110 macosx-all -java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all From d5d9f02880c72b2d154b6a4450a463bb7fdb378a Mon Sep 17 00:00:00 2001 From: suchismith1993 Date: Tue, 6 May 2025 04:24:44 -0400 Subject: [PATCH 2/6] restore problem list --- test/jdk/ProblemList.txt | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 2e43a0c1d270d..77788c2260834 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -143,6 +143,7 @@ java/awt/Focus/TestDisabledAutoTransfer.java 8159871 macosx-all,windows-all java/awt/Focus/TestDisabledAutoTransferSwing.java 6962362 windows-all java/awt/Focus/ActivateOnProperAppContextTest.java 8136516 macosx-all java/awt/Focus/FocusPolicyTest.java 7160904 linux-all +java/awt/Graphics/SmallPrimitives.java 8047070 macosx-all,linux-all java/awt/EventQueue/6980209/bug6980209.java 8198615 macosx-all java/awt/EventQueue/PushPopDeadlock/PushPopDeadlock.java 8024034 generic-all java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all @@ -188,6 +189,9 @@ java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all +java/awt/datatransfer/ClipboardPerformanceTest.java 8029022 windows-all +java/awt/datatransfer/HTMLTransferConsoleOutputTest.java 8237254 macosx-all +java/awt/datatransfer/ImageTransferCrashTest.java 8237253 macosx-all java/awt/Toolkit/RealSync/Test.java 6849383 linux-all java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8072110 macosx-all @@ -256,7 +260,14 @@ java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 6849371 macosx-all,linux-all java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java 8165863 macosx-all +java/awt/Clipboard/PasteNullToTextComponentsTest.java 8234140 macosx-all,windows-all +java/awt/Clipboard/NoOwnerNoTargetsTest.java 8234140 macosx-all +java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java 8234140 macosx-all java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all +java/awt/Clipboard/ClipboardSecurity.java 8054809 macosx-all +java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java 8234140 macosx-all +java/awt/Clipboard/ImageTransferTest.java 8030710 generic-all +java/awt/Clipboard/NoDataConversionFailureTest.java 8234140 macosx-all java/awt/Frame/MiscUndecorated/RepaintTest.java 8266244 macosx-aarch64 java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009 macosx-all java/awt/Modal/FileDialog/FileDialogAppModal2Test.java 7186009 macosx-all @@ -441,6 +452,8 @@ java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all +java/awt/ScrollPane/ScrollPositionTest.java 8040070 linux-all +java/awt/ScrollPane/ScrollPaneEventType.java 8296516 macosx-all java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,windows-all,macosx-all @@ -461,6 +474,7 @@ java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed. java/awt/PopupMenu/PopupMenuLocation.java 8259913,8315878 windows-all,macosx-aarch64 java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java 8238720,8324782 windows-all,macosx-all java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java 8238720,8324782 windows-all,macosx-all +java/awt/GridBagLayout/ComponentShortage.java 8355280 windows-all,linux-all java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java 8238720 windows-all # Several tests which fail sometimes on macos11 @@ -471,6 +485,7 @@ java/awt/MenuBar/TestNoScreenMenuBar.java 8265987 macosx-all java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8266283 generic-all java/awt/Graphics2D/DrawString/RotTransText.java 8316878 linux-all +java/awt/Graphics2D/CopyAreaOOB.java 8343106 macosx-aarch64 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java 8257529 windows-x64 java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java 8302787 windows-all java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java 8302787 windows-all @@ -478,8 +493,6 @@ java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemoni java/awt/Window/GetScreenLocation/GetScreenLocationTest.java 8225787 linux-x64 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 8266243 macosx-aarch64 -java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java 8029249 macosx-all -java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java 8029249 macosx-all java/awt/Dialog/ChoiceModalDialogTest.java 8161475 macosx-all java/awt/Dialog/FileDialogUserFilterTest.java 8001142 generic-all @@ -499,6 +512,8 @@ java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 m # Wayland related java/awt/FullScreen/SetFullScreenTest.java 8332155 linux-x64 +sun/java2d/ClassCastExceptionForInvalidSurface.java 8354097 linux-x64 +sun/java2d/GdiRendering/ClipShapeRendering.java 8354097 linux-x64 ############################################################################ @@ -674,7 +689,7 @@ javax/swing/JFileChooser/8194044/FileSystemRootTest.java 8327236 windows-all javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all -javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all +javax/swing/JFileChooser/bug6798062.java 8146446 windows-all javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765 macosx-all,linux-all javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all @@ -767,12 +782,15 @@ jdk/jfr/jvm/TestWaste.java 8282427 generic- # jdk_foreign +java/foreign/TestBufferStackStress.java 8350455 macosx-all + ############################################################################ # Client manual tests javax/swing/JFileChooser/6698013/bug6698013.java 8024419 macosx-all javax/swing/JColorChooser/8065098/bug8065098.java 8065647 macosx-all -javax/swing/JTabbedPane/4666224/bug4666224.java 8144124 macosx-all +javax/swing/JTabbedPane/bug4499556.java 8267500 macosx-all +javax/swing/JTabbedPane/bug4666224.java 8144124 macosx-all javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java 8345090 windows-all,linux-all javax/swing/SwingUtilities/TestTextPosInPrint.java 8227025 windows-all javax/swing/JInternalFrame/bug4134077.java 8184985 windows-all @@ -788,11 +806,14 @@ java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all java/awt/Frame/FrameStateTest/FrameStateTest.java 8203920 macosx-all,linux-all java/awt/print/PrinterJob/ScaledText/ScaledText.java 8231226 macosx-all java/awt/print/PrinterJob/PrintTextTest.java 8148334 macosx-all +java/awt/font/GlyphVector/TestGlyphVectorLayout.java 8354987 generic-all java/awt/font/TextLayout/TestJustification.java 8250791 macosx-all java/awt/TrayIcon/DragEventSource/DragEventSource.java 8252242 macosx-all java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java 7187728 macosx-all,linux-all java/awt/print/PageFormat/Orient.java 8016055 macosx-all java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java 8024986 macosx-all,linux-all +java/awt/TextComponent/CorrectTextComponentSelectionTest.java 8237220 macosx-all +java/awt/TextComponent/SelectionAndCaretColor.java 7017622 linux-all java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java 8254841 macosx-all java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java 8256289 windows-x64 java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 8258103 linux-all @@ -802,7 +823,10 @@ java/awt/PopupMenu/PopupHangTest.java 8340022 windows-all java/awt/Focus/MinimizeNonfocusableWindowTest.java 8024487 windows-all java/awt/Focus/InactiveFocusRace.java 8023263 linux-all java/awt/List/HandlingKeyEventIfMousePressedTest.java 6848358 macosx-all,windows-all +java/awt/List/ListScrollbarCursorTest.java 8066410 generic-all java/awt/Checkbox/CheckboxBoxSizeTest.java 8340870 windows-all java/awt/Checkbox/CheckboxIndicatorSizeTest.java 8340870 windows-all java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all java/awt/dnd/WinMoveFileToShellTest.java 8341665 windows-all +java/awt/Menu/MenuVisibilityTest.java 8161110 macosx-all +java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all From 19513b799bd6c2c8aeacbfda17117571dbce2658 Mon Sep 17 00:00:00 2001 From: suchismith1993 Date: Wed, 9 Jul 2025 11:22:22 -0400 Subject: [PATCH 3/6] system cpu load --- .../libmanagement_ext/UnixOperatingSystem.c | 62 ++++++++++++++++--- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c index 840c744f02675..a82d675109610 100644 --- a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c +++ b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2015, 2020 SAP SE. All rights reserved. + * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025 SAP SE. 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,24 +28,68 @@ /* Implement and update https://bugs.openjdk.org/browse/JDK-8030957 */ #include +#include #include #include #include "com_sun_management_internal_OperatingSystemImpl.h" perfstat_process_t prev_stats = {0}; static unsigned long long prev_timebase = 0; static int initialized = 0; - -#define HTIC2SEC(x) (((double)(x) * XINTFRAC) / 1000000000.0) +#define HTIC2SEC(x) (((double)(x) * XINTFRAC) / 1000000000.0) +static perfstat_cpu_total_t cpu_total_old; +static time_t last_sample_time = 0; +static double last_cpu_load = -1.0; JNIEXPORT jdouble JNICALL Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 (JNIEnv *env, jobject dummy) { - return -1.0; -} + perfstat_cpu_total_t cpu_total; + int ret; + time_t now = time(NULL); + if (initialized && (now - last_sample_time < 5)) { + return last_cpu_load; // Return cached value if less than 5s + } + ret = perfstat_cpu_total(NULL, &cpu_total, sizeof(perfstat_cpu_total_t), 1); + if (ret < 0) { + return -1.0; + } + + if (!initialized) { + cpu_total_old = cpu_total; + initialized = 1; + last_sample_time = now; + return -1.0; // Not enough data yet + } + + long long user_diff = cpu_total.user - cpu_total_old.user; + long long sys_diff = cpu_total.sys - cpu_total_old.sys; + long long idle_diff = cpu_total.idle - cpu_total_old.idle; + long long wait_diff = cpu_total.wait - cpu_total_old.wait; + long long total = user_diff + sys_diff + idle_diff + wait_diff; + + if (total == 0) { + return -1.0; + } + + printf("User diff: %lld\n", user_diff); + printf("Sys diff: %lld\n", sys_diff); + printf("Idle diff: %lld\n", idle_diff); + printf("Wait diff: %lld\n", wait_diff); + + + double load = (double)(user_diff + sys_diff) / total; + printf("load:%.4f\n",load); + fflush(stdout); + last_cpu_load = load; + last_sample_time = now; + cpu_total_old = cpu_total; + + return load; +} JNIEXPORT jdouble JNICALL Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0 @@ -55,13 +99,11 @@ Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0 perfstat_id_t id; unsigned long long curr_timebase, timebase_diff; double user_diff, sys_diff, delta_time; - - if (perfstat_process(&id, &curr_stats, sizeof(perfstat_process_t), 1) == -1) { - return -1.0; // Unable to get stats + if (perfstat_process(&id, &curr_stats, sizeof(perfstat_process_t), 1) < 0) { + return -1.0; } if (!initialized) { - // First call: just store and return -1.0 prev_stats = curr_stats; prev_timebase = curr_stats.last_timebase; initialized = 1; From 10e94712c814f14902cb7d9feb8f4609cd0626f9 Mon Sep 17 00:00:00 2001 From: suchismith1993 Date: Wed, 9 Jul 2025 10:49:36 -0400 Subject: [PATCH 4/6] cleanup --- .../libmanagement_ext/UnixOperatingSystem.c | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c index a82d675109610..c9888fec52af5 100644 --- a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c +++ b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c @@ -62,7 +62,7 @@ Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 cpu_total_old = cpu_total; initialized = 1; last_sample_time = now; - return -1.0; // Not enough data yet + return -1.0; } long long user_diff = cpu_total.user - cpu_total_old.user; @@ -75,14 +75,7 @@ Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 return -1.0; } - printf("User diff: %lld\n", user_diff); - printf("Sys diff: %lld\n", sys_diff); - printf("Idle diff: %lld\n", idle_diff); - printf("Wait diff: %lld\n", wait_diff); - - double load = (double)(user_diff + sys_diff) / total; - printf("load:%.4f\n",load); fflush(stdout); last_cpu_load = load; last_sample_time = now; @@ -101,7 +94,7 @@ Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0 double user_diff, sys_diff, delta_time; if (perfstat_process(&id, &curr_stats, sizeof(perfstat_process_t), 1) < 0) { - return -1.0; + return -1.0; } if (!initialized) { prev_stats = curr_stats; @@ -109,28 +102,19 @@ Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0 initialized = 1; return -1.0; } - printf("initialised done"); curr_timebase = curr_stats.last_timebase; timebase_diff = curr_timebase - prev_timebase; - if ((long long)timebase_diff <= 0 || XINTFRAC == 0) { return -1.0; } delta_time = HTIC2SEC(timebase_diff); - user_diff = (double)(curr_stats.ucpu_time - prev_stats.ucpu_time); sys_diff = (double)(curr_stats.scpu_time - prev_stats.scpu_time); - prev_stats = curr_stats; prev_timebase = curr_timebase; - double cpu_load = (user_diff + sys_diff) / delta_time; - return (jdouble)cpu_load; - - - } JNIEXPORT jdouble JNICALL From 2207f10376fb2090dca6885a58503140b4b98104 Mon Sep 17 00:00:00 2001 From: suchismith1993 Date: Wed, 16 Jul 2025 13:34:41 +0530 Subject: [PATCH 5/6] Update UnixOperatingSystem.c --- .../aix/native/libmanagement_ext/UnixOperatingSystem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c index c9888fec52af5..41ffa503dc764 100644 --- a/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c +++ b/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c @@ -76,7 +76,6 @@ Java_com_sun_management_internal_OperatingSystemImpl_getCpuLoad0 } double load = (double)(user_diff + sys_diff) / total; - fflush(stdout); last_cpu_load = load; last_sample_time = now; cpu_total_old = cpu_total; From e4c076f73186c17e2727de3ad8ac53cac0ac7ab0 Mon Sep 17 00:00:00 2001 From: suchismith1993 Date: Wed, 6 Aug 2025 20:34:13 +0530 Subject: [PATCH 6/6] Update ProblemList.txt --- test/jdk/ProblemList.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index bf684f1c00e81..f800f23d3a5fd 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -555,7 +555,6 @@ java/io/IO/IO.java 8337935 linux-pp # jdk_management -com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java 8364314 generic-all java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all java/lang/management/MemoryMXBean/PendingAllGC.sh 8158837 generic-all java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java 8247426 generic-all