style

Author: roberttoyonaga

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java

@@ -279,7 +279,7 @@ public Target_jdk_jfr_internal_EventWriter newEventWriter() {
             throw new OutOfMemoryError("OOME for thread local buffer");
         }
 
-        Target_jdk_jfr_internal_EventWriter result = JfrEventWriterAccess.newEventWriter(buffer, isThreadExcluded(Thread.currentThread()));
+        Target_jdk_jfr_internal_EventWriter result = JfrEventWriterAccess.newEventWriter(buffer, isCurrentThreadExcluded());
         javaEventWriter.set(result);
         return result;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java

@@ -683,14 +683,16 @@ public void setExcluded(Thread thread, boolean excluded) {
         getThreadLocal().setExcluded(thread, excluded);
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean isExcluded(Thread thread) {
-        return getThreadLocal().isThreadExcluded(thread);
+        if (!thread.equals(Thread.currentThread())) {
+            return false;
+        }
+        return getThreadLocal().isCurrentThreadExcluded();
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean isCurrentThreadExcluded() {
-        return isExcluded(Thread.currentThread());
+        return getThreadLocal().isCurrentThreadExcluded();
     }
 
     private static class JfrBeginRecordingOperation extends JavaVMOperation {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBuffersAccess.java

@@ -95,178 +95,4 @@ public static void processFullBuffers() {
 
         SubstrateJVM.getSamplerBufferPool().adjustBufferCount();
     }
-<<<<<<< HEAD
-=======
-
-    @Uninterruptible(reason = "The callee explicitly does a safepoint check.", calleeMustBe = false)
-    private static void safepointCheck() {
-        safepointCheck0();
-    }
-
-    private static void safepointCheck0() {
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
-    private static void serializeStackTraces(SamplerBuffer rawStackTraceBuffer) {
-        assert rawStackTraceBuffer.isNonNull();
-
-        Pointer end = rawStackTraceBuffer.getPos();
-        Pointer current = SamplerBufferAccess.getDataStart(rawStackTraceBuffer);
-        while (current.belowThan(end)) {
-            Pointer entryStart = current;
-            assert entryStart.unsignedRemainder(Long.BYTES).equal(0);
-
-            /* Sample hash. */
-            int sampleHash = current.readInt(0);
-            current = current.add(Integer.BYTES);
-
-            /* Is truncated. */
-            boolean isTruncated = current.readInt(0) == 1;
-            current = current.add(Integer.BYTES);
-
-            /* Sample size, excluding the header and the end marker. */
-            int sampleSize = current.readInt(0);
-            current = current.add(Integer.BYTES);
-
-            /* Padding. */
-            current = current.add(Integer.BYTES);
-
-            /* Tick. */
-            long sampleTick = current.readLong(0);
-            current = current.add(Long.BYTES);
-
-            /* Event thread. */
-            long threadId = current.readLong(0);
-            current = current.add(Long.BYTES);
-
-            /* Thread state. */
-            long threadState = current.readLong(0);
-            current = current.add(Long.BYTES);
-
-            assert current.subtract(entryStart).equal(SamplerSampleWriter.getHeaderSize());
-
-            CIntPointer statusPtr = StackValue.get(CIntPointer.class);
-            JfrStackTraceTableEntry entry = SubstrateJVM.getStackTraceRepo().getOrPutStackTrace(current, WordFactory.unsigned(sampleSize), sampleHash, statusPtr);
-            long stackTraceId = entry.isNull() ? 0 : entry.getId();
-
-            int status = statusPtr.read();
-            if (status == JfrStackTraceTableEntryStatus.INSERTED || status == JfrStackTraceTableEntryStatus.EXISTING_RAW) {
-                /* Walk the IPs and serialize the stacktrace. */
-                assert current.add(sampleSize).belowThan(end);
-                boolean serialized = serializeStackTrace(current, sampleSize, isTruncated, stackTraceId);
-                if (serialized) {
-                    SubstrateJVM.getStackTraceRepo().commitSerializedStackTrace(entry);
-                }
-            } else {
-                /* Processing is not needed: skip the rest of the data. */
-                assert status == JfrStackTraceTableEntryStatus.EXISTING_SERIALIZED || status == JfrStackTraceTableEntryStatus.INSERT_FAILED;
-            }
-            current = current.add(sampleSize);
-
-            /*
-             * Emit an event depending on the end marker of the raw stack trace. This needs to be
-             * done here because the sampler can't emit the event directly.
-             */
-            long endMarker = current.readLong(0);
-            if (endMarker == SamplerSampleWriter.EXECUTION_SAMPLE_END) {
-                if (stackTraceId != 0) {
-                    ExecutionSampleEvent.writeExecutionSample(sampleTick, threadId, stackTraceId, threadState);
-                } else {
-                    JfrThreadLocal.increaseMissedSamples();
-                }
-            } else {
-                assert endMarker == SamplerSampleWriter.JFR_STACK_TRACE_END;
-            }
-            current = current.add(SamplerSampleWriter.END_MARKER_SIZE);
-        }
-
-        SamplerBufferAccess.reinitialize(rawStackTraceBuffer);
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
-    private static boolean serializeStackTrace(Pointer rawStackTrace, int sampleSize, boolean isTruncated, long stackTraceId) {
-        assert sampleSize % Long.BYTES == 0;
-
-        JfrBuffer targetBuffer = SubstrateJVM.getStackTraceRepo().getCurrentBuffer();
-        if (targetBuffer.isNull()) {
-            return false;
-        }
-
-        /*
-         * One IP may correspond to multiple Java-level stack frames. We need to precompute the
-         * number of stack trace elements because the count can't be patched later on
-         * (JfrNativeEventWriter.putInt() would not necessarily reserve enough bytes).
-         */
-        int numStackTraceElements = visitRawStackTrace(rawStackTrace, sampleSize, WordFactory.nullPointer());
-        if (numStackTraceElements == 0) {
-            return false;
-        }
-
-        JfrNativeEventWriterData data = StackValue.get(JfrNativeEventWriterData.class);
-        JfrNativeEventWriterDataAccess.initialize(data, targetBuffer);
-        JfrNativeEventWriter.putLong(data, stackTraceId);
-        JfrNativeEventWriter.putBoolean(data, isTruncated);
-        JfrNativeEventWriter.putInt(data, numStackTraceElements);
-        visitRawStackTrace(rawStackTrace, sampleSize, data);
-        boolean success = JfrNativeEventWriter.commit(data);
-
-        /* Buffer can get replaced with a larger one. */
-        SubstrateJVM.getStackTraceRepo().setCurrentBuffer(data.getJfrBuffer());
-        return success;
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
-    private static int visitRawStackTrace(Pointer rawStackTrace, int sampleSize, JfrNativeEventWriterData data) {
-        int numStackTraceElements = 0;
-        Pointer rawStackTraceEnd = rawStackTrace.add(sampleSize);
-        Pointer ipPtr = rawStackTrace;
-        while (ipPtr.belowThan(rawStackTraceEnd)) {
-            long ip = ipPtr.readLong(0);
-            numStackTraceElements += visitFrame(data, ip);
-            ipPtr = ipPtr.add(Long.BYTES);
-        }
-        return numStackTraceElements;
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording, epoch change, and that the GC frees the CodeInfo.")
-    private static int visitFrame(JfrNativeEventWriterData data, long address) {
-        CodePointer ip = WordFactory.pointer(address);
-        UntetheredCodeInfo untetheredInfo = CodeInfoTable.lookupCodeInfo(ip);
-        if (untetheredInfo.isNull()) {
-            /* Unknown frame. Must not happen for AOT-compiled code. */
-            VMError.shouldNotReachHere("Stack walk must walk only frames of known code.");
-        }
-
-        Object tether = CodeInfoAccess.acquireTether(untetheredInfo);
-        try {
-            CodeInfo tetheredCodeInfo = CodeInfoAccess.convert(untetheredInfo, tether);
-            return visitFrame(data, tetheredCodeInfo, ip);
-        } finally {
-            CodeInfoAccess.releaseTether(untetheredInfo, tether);
-        }
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
-    private static int visitFrame(JfrNativeEventWriterData data, CodeInfo codeInfo, CodePointer ip) {
-        int numStackTraceElements = 0;
-        FRAME_INFO_CURSOR.initialize(codeInfo, ip);
-        while (FRAME_INFO_CURSOR.advance()) {
-            if (data.isNonNull()) {
-                FrameInfoQueryResult frame = FRAME_INFO_CURSOR.get();
-                serializeStackTraceElement(data, frame);
-            }
-            numStackTraceElements++;
-        }
-        return numStackTraceElements;
-    }
-
-    @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
-    private static void serializeStackTraceElement(JfrNativeEventWriterData data, FrameInfoQueryResult stackTraceElement) {
-        long methodId = SubstrateJVM.getMethodRepo().getMethodId(stackTraceElement.getSourceClass(), stackTraceElement.getSourceMethodName(), stackTraceElement.getMethodId());
-        JfrNativeEventWriter.putLong(data, methodId);
-        JfrNativeEventWriter.putInt(data, stackTraceElement.getSourceLineNumber());
-        JfrNativeEventWriter.putInt(data, stackTraceElement.getBci());
-        JfrNativeEventWriter.putLong(data, JfrFrameType.FRAME_AOT_COMPILED.getId());
-    }
->>>>>>> 36915eee070d9433c26d7ec247b8cc08b98b89ae
 }