Add support for thread cpu time in Management

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso.mokapot/include/jmm_common.h

@@ -54,7 +54,7 @@ enum {
   JMM_VERSION_4   = 0x20040000, // JDK 21
 };
 
-typedef struct {
+typedef struct jmmOptionalSupport {
   unsigned int isLowMemoryDetectionSupported : 1;
   unsigned int isCompilationTimeMonitoringSupported : 1;
   unsigned int isThreadContentionMonitoringSupported : 1;

espresso/src/com.oracle.truffle.espresso.mokapot/src/structs.c

@@ -23,6 +23,7 @@
 
 #include "jvm.h"
 #include "jvmti.h"
+#include "jmm_common.h"
 #include "structs.h"
 
 #include <jni.h>
@@ -218,13 +219,17 @@
     V(_jvmtiAddrLocationMap) \
     V(_jvmtiEventCallbacks)
 
+#define JMM_STRUCT_LIST(V) \
+    V(jmmOptionalSupport)
+
 #define MEMBER_INFO_STRUCT_LIST(V) \
     V(member_info)
 
 #define STRUCT_LIST_LIST(V) \
     JNI_STRUCT_LIST(V) \
     JVM_STRUCT_LIST(V) \
     JVMTI_STRUCT_LIST(V) \
+    JMM_STRUCT_LIST(V) \
     MEMBER_INFO_STRUCT_LIST(V)
 
 #define STRUCT_MEMBER_LIST_LIST(V) \
@@ -233,7 +238,8 @@
     JVMTI_STRUCT_MEMBER_LIST(V) \
     MEMBER_INFO_STRUCT_MEMBER_LIST(V)
 
-#define STRUCT_BITFIELD_MEMBER_LIST_LIST(V)
+#define STRUCT_BITFIELD_MEMBER_LIST_LIST(V) \
+    JMM_STRUCT_BITFIELD_MEMBER_LIST(V)
 
 void add_member_info(member_info** info, char* id, size_t offset) {
     member_info* current = malloc(sizeof(struct member_info));

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/Management.java

@@ -31,6 +31,7 @@
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
+import java.lang.management.ThreadMXBean;
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.List;
@@ -78,6 +79,7 @@
 import com.oracle.truffle.espresso.threads.EspressoThreadRegistry;
 import com.oracle.truffle.espresso.threads.State;
 import com.oracle.truffle.espresso.threads.ThreadAccess;
+import com.oracle.truffle.espresso.vm.structs.JmmOptionalSupport;
 
 @GenerateNativeEnv(target = ManagementImpl.class, prependEnv = true)
 public final class Management extends NativeEnv {
@@ -163,6 +165,7 @@ public final class Management extends NativeEnv {
     private int managementVersion;
 
     private MemoryMXBean memoryMXBean;
+    private ThreadMXBean threadMXBean;
 
     private final @Pointer TruffleObject initializeManagementContext;
     private final @Pointer TruffleObject disposeManagementContext;
@@ -190,6 +193,14 @@ private MemoryMXBean getHostMemoryMXBean() {
         return memoryMXBean;
     }
 
+    @TruffleBoundary
+    private ThreadMXBean getHostThreadMXBean() {
+        if (threadMXBean == null) {
+            threadMXBean = ManagementFactory.getThreadMXBean();
+        }
+        return threadMXBean;
+    }
+
     /**
      * Procedure to support a new management version in Espresso:
      * <ul>
@@ -266,12 +277,16 @@ public int GetVersion() {
 
     @ManagementImpl
     public int GetOptionalSupport(@Pointer TruffleObject /* jmmOptionalSupport **/ supportPtr) {
-        if (!getUncached().isNull(supportPtr)) {
-            ByteBuffer supportBuf = NativeUtils.directByteBuffer(supportPtr, 8);
-            supportBuf.putInt(0); // nothing optional is supported
-            return 0;
-        }
-        return -1;
+        if (getUncached().isNull(supportPtr)) {
+            return -1;
+        }
+        ByteBuffer supportBuf = NativeUtils.directByteBuffer(supportPtr, 8);
+        supportBuf.putInt(0); // clear
+        JmmOptionalSupport.JmmOptionalSupportWrapper optionalSupport = getVM().getStructs().jmmOptionalSupport.wrap(getHandles(), supportPtr);
+        ThreadMXBean hostBean = getHostThreadMXBean();
+        optionalSupport.isOtherThreadCpuTimeSupported(hostBean.isThreadCpuTimeSupported() ? 1 : 0);
+        optionalSupport.isCurrentThreadCpuTimeSupported(hostBean.isCurrentThreadCpuTimeSupported() ? 1 : 0);
+        return 0;
     }
 
     private static void validateThreadIdArray(EspressoLanguage language, Meta meta, @JavaType(long[].class) StaticObject threadIds, SubstitutionProfiler profiler) {
@@ -286,6 +301,18 @@ private static void validateThreadIdArray(EspressoLanguage language, Meta meta,
         }
     }
 
+    private static int validateThreadIdArray(EspressoLanguage language, Meta meta, @JavaType(long[].class) StaticObject threadIds) {
+        assert threadIds.isArray();
+        int numThreads = threadIds.length(language);
+        for (int i = 0; i < numThreads; ++i) {
+            long tid = threadIds.<long[]> unwrap(language)[i];
+            if (tid <= 0) {
+                throw meta.throwIllegalArgumentExceptionBoundary("Invalid thread ID entry");
+            }
+        }
+        return numThreads;
+    }
+
     private static void validateThreadInfoArray(Meta meta, @JavaType(internalName = "[Ljava/lang/management/ThreadInfo;") StaticObject infoArray, SubstitutionProfiler profiler) {
         // check if the element of infoArray is of type ThreadInfo class
         Klass infoArrayKlass = infoArray.getKlass();
@@ -909,5 +936,56 @@ public boolean ResetStatistic(@SuppressWarnings("unused") long obj, /* jmmStatis
         return false;
     }
 
+    @ManagementImpl
+    public long GetThreadCpuTimeWithKind(long threadId, boolean withSysTime,
+                    @Inject Meta meta) {
+        if (threadId < 0) {
+            throw meta.throwIllegalArgumentExceptionBoundary("Invalid thread ID");
+        }
+        ThreadMXBean hostBean = getHostThreadMXBean();
+        if (threadId == 0) {
+            if (!hostBean.isCurrentThreadCpuTimeSupported()) {
+                return -1;
+            }
+            long id = EspressoThreadRegistry.getThreadId(Thread.currentThread());
+            return withSysTime ? hostBean.getThreadCpuTime(id) : hostBean.getThreadUserTime(id);
+        }
+        StaticObject[] activeThreads = getContext().getActiveThreads();
+        StaticObject thread = findThreadById(activeThreads, threadId);
+        if (getThreadAccess().isVirtualThread(thread)) {
+            return -1;
+        }
+        Thread host = getThreadAccess().getHost(thread);
+        long hostId = EspressoThreadRegistry.getThreadId(host);
+        return withSysTime ? hostBean.getThreadCpuTime(hostId) : hostBean.getThreadUserTime(hostId);
+    }
+
+    @ManagementImpl
+    public void GetThreadCpuTimesWithKind(@JavaType(long[].class) StaticObject threadIds, @JavaType(long[].class) StaticObject times, boolean withSysTime,
+                    @Inject EspressoLanguage language, @Inject Meta meta) {
+        if (StaticObject.isNull(threadIds) || StaticObject.isNull(times)) {
+            throw meta.throwNullPointerExceptionBoundary();
+        }
+        int length = validateThreadIdArray(language, meta, threadIds);
+        if (length != times.length(language)) {
+            throw meta.throwIllegalArgumentExceptionBoundary("The length of the given long array does not match the length of the given array of thread IDs");
+        }
+
+        StaticObject[] activeThreads = getContext().getActiveThreads();
+        InterpreterToVM interpreterToVM = getInterpreterToVM();
+        ThreadMXBean hostBean = getHostThreadMXBean();
+        for (int i = 0; i < length; i++) {
+            long guestId = interpreterToVM.getArrayLong(language, i, threadIds);
+            StaticObject thread = findThreadById(activeThreads, guestId);
+            if (getThreadAccess().isVirtualThread(thread)) {
+                continue;
+            }
+            Thread host = getThreadAccess().getHost(thread);
+            long hostId = EspressoThreadRegistry.getThreadId(host);
+            long time = withSysTime ? hostBean.getThreadCpuTime(hostId) : hostBean.getThreadUserTime(hostId);
+            interpreterToVM.setArrayLong(language, time, i, times);
+        }
+    }
+
     // Checkstyle: resume method name check
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/structs/StructWrapper.java

@@ -22,6 +22,7 @@
  */
 package com.oracle.truffle.espresso.vm.structs;
 
+import static com.oracle.truffle.espresso.ffi.NativeType.BITFIELD_INT;
 import static com.oracle.truffle.espresso.ffi.NativeType.BOOLEAN;
 import static com.oracle.truffle.espresso.ffi.NativeType.INT;
 import static com.oracle.truffle.espresso.ffi.NativeType.LONG;
@@ -719,6 +720,43 @@
                                                 POINTER,
                                                 POINTER,
                                 }),
+                /*-
+                 * typedef struct jmmOptionalSupport {
+                 *   unsigned int isLowMemoryDetectionSupported : 1;
+                 *   unsigned int isCompilationTimeMonitoringSupported : 1;
+                 *   unsigned int isThreadContentionMonitoringSupported : 1;
+                 *   unsigned int isCurrentThreadCpuTimeSupported : 1;
+                 *   unsigned int isOtherThreadCpuTimeSupported : 1;
+                 *   unsigned int isObjectMonitorUsageSupported : 1;
+                 *   unsigned int isSynchronizerUsageSupported : 1;
+                 *   unsigned int isThreadAllocatedMemorySupported : 1;
+                 *   unsigned int isRemoteDiagnosticCommandsSupported : 1;
+                 *   unsigned int : 22;
+                 * } jmmOptionalSupport;
+                 */
+                @KnownStruct(structName = "jmmOptionalSupport", //
+                                memberNames = {
+                                                "isLowMemoryDetectionSupported",
+                                                "isCompilationTimeMonitoringSupported",
+                                                "isThreadContentionMonitoringSupported",
+                                                "isCurrentThreadCpuTimeSupported",
+                                                "isOtherThreadCpuTimeSupported",
+                                                "isObjectMonitorUsageSupported",
+                                                "isSynchronizerUsageSupported",
+                                                "isThreadAllocatedMemorySupported",
+                                                "isRemoteDiagnosticCommandsSupported",
+                                }, //
+                                types = {
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                                BITFIELD_INT,
+                                }),
 })
 public abstract class StructWrapper {
     private final JNIHandles handles;