SapMachine SAP#2023: Add suport for SAP JMC agent - cleanups

Author: RealCLanger

make/autoconf/configure.ac

@@ -215,7 +215,7 @@ JDKOPT_SETUP_CODE_COVERAGE
 # AddressSanitizer
 JDKOPT_SETUP_ADDRESS_SANITIZER
 
-# SapMachine 2024-12-05: Setup SAP JMC agent if requested
+# SapMachine 2025-08-11: Setup SAP JMC agent if requested
 JDKOPT_SETUP_SAP_JMC_AGENT
 
 # UndefinedBehaviorSanitizer

make/modules/java.base/Copy.gmk

@@ -257,7 +257,7 @@ ifeq ($(call isTargetOs, linux macosx), true)
 endif
 
 ################################################################################
-# SapMachine 2025-08-11: Copy jmc agent jars
+# SapMachine 2025-08-11: Copy JMC agent jars
 ifeq ($(SAP_JMC_AGENT_ENABLED), true)
   $(LIB_DST_DIR)/agent.jar: $(SAP_JMC_AGENT_PATH)/agent-$(SAP_JMC_AGENT_VERSION).jar
 	$(call install-file)

src/hotspot/share/runtime/arguments.cpp

@@ -2335,15 +2335,15 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
         }
       }
 #endif // !INCLUDE_JVMTI
-    // SapMachine 2025-08-11: Handle jmc agent if requested.
+    // SapMachine 2025-08-11: Handle JMC agent if requested.
     } else if (match_option(option, "-jmcagent:", &tail)) {
 #if !defined(WITH_SAP_JMC_AGENT)
       jio_fprintf(defaultStream::error_stream(),
           "SAP JMC agent is not included in this VM\n");
       return JNI_ERR;
 #else
 #if !INCLUDE_JVMTI
-#error "Must have JVMTI enabled with SAP JVM agent"
+#error "Must have JVMTI enabled with SAP JMC agent"
 #endif
       char const* agent_jar = "agent.jar";
       if (tail != nullptr) {

src/hotspot/share/services/diagnosticCommand.cpp

@@ -354,7 +354,7 @@ void JVMTIAgentLoadDCmd::execute(DCmdSource source, TRAPS) {
   }
 }
 
-// SapMachine 2025-08-11
+// SapMachine 2025-08-11: Add support for SAP JMC agent if requested.
 #if defined(WITH_SAP_JMC_AGENT)
 JVMTIJmcAgentLoadDCmd::JVMTIJmcAgentLoadDCmd(outputStream* output, bool heap) :
   DCmdWithParser(output, heap),

src/hotspot/share/services/diagnosticCommand.hpp

@@ -159,7 +159,7 @@ class JVMTIAgentLoadDCmd : public DCmdWithParser {
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-// SapMachine 2025-08-11
+// SapMachine 2025-08-11: Add support for SAP JMC agent if requested.
 #if defined(WITH_SAP_JMC_AGENT)
 class JVMTIJmcAgentLoadDCmd : public DCmdWithParser {
 protected:
@@ -169,7 +169,7 @@ class JVMTIJmcAgentLoadDCmd : public DCmdWithParser {
   static int num_arguments() { return 1; }
   static const char* name() { return "JVMTI.jmc_agent_load"; }
   static const char* description() {
-    return "Load the SAP jmc agent.";
+    return "Load the SAP JMC agent.";
   }
   static const char* impact() {
     return "Medium: Depends on the command or trace";

test/jdk/sap/JmcAgentIntegrationTest.java

@@ -24,7 +24,7 @@
 
 /**
  * @test
- * @summary Runs the test for the jmc agent integration.
+ * @summary Runs the test for the SAP JMC agent integration.
  *
  * @run main/othervm JmcAgentIntegrationTest
  */