Skip to content

Commit c77e555

Browse files
0xdaryl0xdaryl
committed
Support OMR::Options::buildLogFileName()
* Use OMR::Options::buildLogFileName() in place of bespoke formatting * Remove FrontEnd name formatting functionality * Support OMR option and identifier renames Signed-off-by: Daryl Maier <maier@ca.ibm.com>
1 parent f56eab9 commit c77e555

File tree

8 files changed

+60
-136
lines changed

8 files changed

+60
-136
lines changed

‎runtime/compiler/control/J9Options.cpp‎

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,12 +2605,6 @@ J9::Options::fePreProcess(void * base)
26052605
PORT_ACCESS_FROM_JAVAVM(vm);
26062606
OMRPORT_ACCESS_FROM_J9PORT(PORTLIB);
26072607

2608-
#if defined(DEBUG) || defined(PROD_WITH_ASSUMES)
2609-
bool forceSuffixLogs = false;
2610-
#else
2611-
bool forceSuffixLogs = true;
2612-
#endif
2613-
26142608
int32_t xxLateSCCDisclaimTime = J9::Options::getExternalOptionIndex(J9::ExternalOptions::XXLateSCCDisclaimTimeOption);
26152609
if (xxLateSCCDisclaimTime >= 0)
26162610
{
@@ -2660,8 +2654,11 @@ J9::Options::fePreProcess(void * base)
26602654
self()->setOption(TR_DisableTraps);
26612655
#endif
26622656

2663-
if (forceSuffixLogs)
2664-
self()->setOption(TR_EnablePIDExtension);
2657+
#if !defined(DEBUG) && !defined(PROD_WITH_ASSUMES)
2658+
// Production (PROD) builds force the application of the log filename suffix
2659+
//
2660+
self()->setOption(TR_ApplyLogFileNameSuffix);
2661+
#endif
26652662

26662663
if (jitConfig->runtimeFlags & J9JIT_CG_REGISTER_MAPS)
26672664
self()->setOption(TR_RegisterMaps);
@@ -3592,7 +3589,6 @@ J9::Options::printPID()
35923589
}
35933590

35943591
#if defined(J9VM_OPT_JITSERVER)
3595-
void getTRPID(char *buf, size_t size);
35963592

35973593
static void
35983594
appendRegex(TR::SimpleRegex *&regexPtr, uint8_t *&curPos)
@@ -3643,34 +3639,25 @@ std::string
36433639
J9::Options::packOptions(const TR::Options *origOptions)
36443640
{
36453641
size_t logFileNameLength = 0;
3646-
size_t suffixLogsFormatLength = 0;
36473642
size_t blockShufflingSequenceLength = 0;
36483643
size_t induceOSRLength = 0;
36493644

36503645
char buf[JITSERVER_LOG_FILENAME_MAX_SIZE];
3651-
char *origLogFileName = NULL;
3652-
if (origOptions->_logFileName)
3653-
{
3654-
origLogFileName = origOptions->_logFileName;
3655-
char pidBuf[20];
3656-
memset(pidBuf, 0, sizeof(pidBuf));
3657-
getTRPID(pidBuf, sizeof(pidBuf));
3658-
logFileNameLength = strlen(origOptions->_logFileName) + strlen(".") + strlen(pidBuf) + strlen(".server") + 1;
3659-
// If logFileNameLength is greater than JITSERVER_LOG_FILENAME_MAX_SIZE, PID might not be appended to the log file name
3660-
// and the log file name could be truncated as well.
3661-
if (logFileNameLength > JITSERVER_LOG_FILENAME_MAX_SIZE)
3662-
logFileNameLength = JITSERVER_LOG_FILENAME_MAX_SIZE;
3663-
snprintf(buf, logFileNameLength, "%s.%s.server", origOptions->_logFileName, pidBuf);
3664-
}
3665-
if (origOptions->_suffixLogsFormat)
3666-
suffixLogsFormatLength = strlen(origOptions->_suffixLogsFormat) + 1;
3646+
if (origOptions->getLogFileNameBase())
3647+
{
3648+
char *fn = TR::Options::buildLogFileName(buf, JITSERVER_LOG_FILENAME_MAX_SIZE, origOptions->getLogFileNameBase(), -1,
3649+
".%pid.server", true);
3650+
3651+
TR_ASSERT_FATAL(fn, "Error building JitServer log filename");
3652+
}
3653+
36673654
if (origOptions->_blockShufflingSequence)
36683655
blockShufflingSequenceLength = strlen(origOptions->_blockShufflingSequence) + 1;
36693656
if (origOptions->_induceOSR)
36703657
induceOSRLength = strlen(origOptions->_induceOSR) + 1;
36713658

36723659
// sizeof(bool) is reserved to pack J9JIT_RUNTIME_RESOLVE
3673-
size_t totalSize = sizeof(TR::Options) + logFileNameLength + suffixLogsFormatLength + blockShufflingSequenceLength + induceOSRLength + sizeof(bool);
3660+
size_t totalSize = sizeof(TR::Options) + logFileNameLength + blockShufflingSequenceLength + induceOSRLength + sizeof(bool);
36743661

36753662
addRegexStringSize(origOptions->_disabledOptTransformations, totalSize);
36763663
addRegexStringSize(origOptions->_disabledInlineSites, totalSize);
@@ -3700,8 +3687,8 @@ J9::Options::packOptions(const TR::Options *origOptions)
37003687
TR::Options * options = (TR::Options *)optionsStr.data();
37013688
memcpy(options, origOptions, sizeof(TR::Options));
37023689

3703-
if (origOptions->_logFileName)
3704-
options->_logFileName = buf;
3690+
if (origOptions->getLogFileNameBase())
3691+
options->setLogFileNameBase(buf);
37053692

37063693
uint8_t *curPos = ((uint8_t *)options) + sizeof(TR::Options);
37073694

@@ -3745,8 +3732,7 @@ J9::Options::packOptions(const TR::Options *origOptions)
37453732
// Append the data pointed by a pointer to the content and patch the pointer
37463733
// as a self-referring-pointer, or a relative pointer, which is
37473734
// the offset of the data with respect to the pointer.
3748-
curPos = appendContent(options->_logFileName, curPos, logFileNameLength);
3749-
curPos = appendContent(options->_suffixLogsFormat, curPos, suffixLogsFormatLength);
3735+
curPos = appendContent(options->_logFileNameBase, curPos, logFileNameLength);
37503736
curPos = appendContent(options->_blockShufflingSequence, curPos, blockShufflingSequenceLength);
37513737
curPos = appendContent(options->_induceOSR, curPos, induceOSRLength);
37523738

@@ -3769,10 +3755,8 @@ J9::Options::unpackOptions(char *clientOptions, size_t clientOptionsSize, TR::Co
37693755

37703756
// Convert relative pointers to absolute pointers
37713757
// pointer = address of field + offset
3772-
if (options->_logFileName)
3773-
options->_logFileName = (char *)((uint8_t *)&(options->_logFileName) + (ptrdiff_t)options->_logFileName);
3774-
if (options->_suffixLogsFormat)
3775-
options->_suffixLogsFormat = (char *)((uint8_t *)&(options->_suffixLogsFormat) + (ptrdiff_t)options->_suffixLogsFormat);
3758+
if (options->getLogFileNameBase())
3759+
options->setLogFileNameBase((char *)((uint8_t *)&(options->_logFileNameBase) + (ptrdiff_t)options->_logFileNameBase));
37763760
if (options->_blockShufflingSequence)
37773761
options->_blockShufflingSequence = (char *)((uint8_t *)&(options->_blockShufflingSequence) + (ptrdiff_t)options->_blockShufflingSequence);
37783762
if (options->_induceOSR)
@@ -3836,12 +3820,12 @@ J9::Options::packLogFile(TR::FILE *fp)
38363820
int
38373821
J9::Options::writeLogFileFromServer(const std::string& logFileContent)
38383822
{
3839-
if (logFileContent.empty() || !_logFileName)
3823+
if (logFileContent.empty() || !getLogFileNameBase())
38403824
return 0;
38413825

38423826
char buf[JITSERVER_LOG_FILENAME_MAX_SIZE];
38433827
_fe->acquireLogMonitor();
3844-
snprintf(buf, sizeof(buf), "%s.%d.REMOTE", _logFileName, ++_compilationSequenceNumber);
3828+
snprintf(buf, sizeof(buf), "%s.%d.REMOTE", getLogFileNameBase(), ++_compilationSequenceNumber);
38453829
int sequenceNumber = _compilationSequenceNumber;
38463830
_fe->releaseLogMonitor();
38473831

@@ -3856,10 +3840,12 @@ J9::Options::writeLogFileFromServer(const std::string& logFileContent)
38563840
}
38573841
return 0; // may overflow the buffer
38583842
}
3843+
38593844
char tmp[JITSERVER_LOG_FILENAME_MAX_SIZE];
3860-
char * filename = _fe->getFormattedName(tmp, JITSERVER_LOG_FILENAME_MAX_SIZE, buf, _suffixLogsFormat, true);
3845+
char *fn = TR::Options::buildLogFileName(tmp, JITSERVER_LOG_FILENAME_MAX_SIZE, buf, -1, TR::Options::getLogFileNameSuffix(), true);
3846+
TR_ASSERT_FATAL(fn, "Error building JitServer log filename");
38613847

3862-
TR::FILE *logFile = trfopen(filename, "wb", false);
3848+
TR::FILE *logFile = trfopen(tmp, "wb", false);
38633849
::fputs(logFileContent.c_str(), logFile->_stream);
38643850
trfflush(logFile);
38653851
trfclose(logFile);
@@ -3877,18 +3863,18 @@ TR_Debug *createDebugObject(TR::Compilation *);
38773863
void
38783864
J9::Options::setLogFileForClientOptions(int suffixNumber)
38793865
{
3880-
if (_logFileName)
3866+
if (getLogFileNameBase())
38813867
{
38823868
_fe->acquireLogMonitor();
38833869
if (suffixNumber)
38843870
{
3885-
self()->setOption(TR_EnablePIDExtension, true);
3871+
self()->setOption(TR_ApplyLogFileNameSuffix, true);
38863872
self()->openLogFileCreateLogger(suffixNumber);
38873873
}
38883874
else
38893875
{
38903876
_compilationSequenceNumber++;
3891-
self()->setOption(TR_EnablePIDExtension, false);
3877+
self()->setOption(TR_ApplyLogFileNameSuffix, false);
38923878
self()->openLogFileCreateLogger(_compilationSequenceNumber);
38933879
}
38943880

@@ -3979,3 +3965,5 @@ J9::Options::initialize()
39793965
{
39803966
self()->OMR::OptionsConnector::initialize();
39813967
}
3968+
3969+
char *J9::Options::_logFileNameSuffix = ".%Y%m%d.%H%M%S.%pid";

‎runtime/compiler/control/J9Options.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,8 @@ class OMR_EXTENSIBLE Options : public OMR::OptionsConnector
503503

504504
static int32_t _jvmStarvationThreshold;
505505

506+
static char *_logFileNameSuffix;
507+
506508
static ExternalOptionsMetadata _externalOptionsMetadata[ExternalOptions::TR_NumExternalOptions];
507509

508510
/**

‎runtime/compiler/env/VMJ9.cpp‎

Lines changed: 8 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,14 @@ extern "C" bool _isPSWInProblemState(); /* 390 asm stub */
179179

180180
TR::FILE *fileOpen(TR::Options *options, J9JITConfig *jitConfig, char *name, char *permission, bool b1)
181181
{
182-
PORT_ACCESS_FROM_ENV(jitConfig->javaVM);
183-
char tmp[1025];
184-
char *formattedTmp = NULL;
185-
if (!options->getOption(TR_EnablePIDExtension))
186-
{
187-
formattedTmp = TR_J9VMBase::getJ9FormattedName(jitConfig, PORTLIB, tmp, sizeof(tmp), name, NULL, false);
188-
}
189-
else
190-
{
191-
formattedTmp = TR_J9VMBase::getJ9FormattedName(jitConfig, PORTLIB, tmp, sizeof(tmp), name, options->getSuffixLogsFormat(), true);
192-
}
193-
if (NULL != formattedTmp)
194-
{
195-
return j9jit_fopen(formattedTmp, permission, b1);
196-
}
197-
return NULL;
182+
const int32_t bufSize = 1025;
183+
char buf[bufSize];
184+
char *fn = TR::Options::buildLogFileName(buf, bufSize, name, -1, TR::Options::getLogFileNameSuffix(),
185+
options->getOption(TR_ApplyLogFileNameSuffix));
186+
187+
TR_ASSERT_FATAL(fn, "Error building log filename");
188+
189+
return j9jit_fopen(fn, permission, b1);
198190
}
199191

200192
// Returns -1 if given vmThread is not a compilation thread
@@ -936,69 +928,6 @@ TR_J9VMBase::getProcessID()
936928
return result;
937929
}
938930

939-
// static method
940-
char *
941-
TR_J9VMBase::getJ9FormattedName(
942-
J9JITConfig *jitConfig,
943-
J9PortLibrary *portLibrary,
944-
char *buf,
945-
size_t bufLength,
946-
char *name,
947-
char *format,
948-
bool suffix)
949-
{
950-
PORT_ACCESS_FROM_ENV(jitConfig->javaVM);
951-
J9VMThread *vmThread = jitConfig->javaVM->internalVMFunctions->currentVMThread(jitConfig->javaVM);
952-
I_64 curTime = j9time_current_time_millis();
953-
J9StringTokens *tokens = j9str_create_tokens(curTime);
954-
if (tokens == NULL)
955-
{
956-
return NULL;
957-
}
958-
959-
char tmp[1025];
960-
size_t nameLength = strlen(name);
961-
uintptr_t substLength = j9str_subst_tokens(tmp, sizeof(tmp), name, tokens);
962-
963-
if (substLength >= std::min(sizeof(tmp), bufLength))
964-
{
965-
j9str_free_tokens(tokens);
966-
return NULL; // not enough room for the name or the token expansion
967-
}
968-
969-
if (strcmp(tmp, name) != 0) // only append if there isn't a format specifier
970-
{
971-
memcpy(buf, tmp, substLength + 1); // +1 to get the null terminator
972-
}
973-
else
974-
{
975-
memcpy(buf, name, nameLength);
976-
char *suffixBuf = &buf[nameLength];
977-
if (format)
978-
j9str_subst_tokens(suffixBuf, bufLength - nameLength, format, tokens);
979-
else if (suffix)
980-
{
981-
// We have to break the string up to prevent CMVC keyword expansion
982-
j9str_subst_tokens(suffixBuf, bufLength - nameLength, ".%Y" "%m" "%d." "%H" "%M" "%S.%pid", tokens);
983-
}
984-
else
985-
{
986-
buf = name;
987-
}
988-
}
989-
990-
j9str_free_tokens(tokens);
991-
return buf;
992-
}
993-
994-
995-
char *
996-
TR_J9VMBase::getFormattedName(char *buf, int32_t bufLength, char *name, char *format, bool suffix)
997-
{
998-
return getJ9FormattedName(_jitConfig, _portLibrary, buf, bufLength, name, format, suffix);
999-
}
1000-
1001-
1002931
void
1003932
TR_J9VMBase::invalidateCompilationRequestsForUnloadedMethods(TR_OpaqueClassBlock *clazz, bool hotCodeReplacement)
1004933
{

‎runtime/compiler/env/VMJ9.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ class TR_J9VMBase : public TR_FrontEnd
300300

301301
static bool createGlobalFrontEnd(J9JITConfig *jitConfig, TR::CompilationInfo *compInfo);
302302
static TR_J9VMBase * get(J9JITConfig *, J9VMThread *, VM_TYPE vmType=DEFAULT_VM);
303-
static char *getJ9FormattedName(J9JITConfig *, J9PortLibrary *, char *, size_t, char *, char *, bool suffix=false);
304303

305304
int32_t *getStringClassEnableCompressionFieldAddr(TR::Compilation *comp, bool isVettedForAOT);
306305
virtual bool stringEquals(TR::Compilation *comp, uintptr_t *stringLocation1, uintptr_t *stringLocation2, int32_t &result);
@@ -498,7 +497,6 @@ class TR_J9VMBase : public TR_FrontEnd
498497

499498
virtual bool isAsyncCompilation();
500499
virtual uintptr_t getProcessID();
501-
virtual char * getFormattedName(char *, int32_t, char *, char *, bool);
502500

503501
virtual void invalidateCompilationRequestsForUnloadedMethods(TR_OpaqueClassBlock *, bool);
504502

‎runtime/compiler/runtime/IProfiler.cpp‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4808,8 +4808,11 @@ TR_IProfiler::dumpIPBCDataCallGraph(J9VMThread* vmThread)
48084808
return;
48094809
}
48104810
traverseIProfilerTableAndCollectEntries(&aggregationHT, vmThread, true/*collectOnlyCallGraphEntries*/);
4811-
char tmp[1025];
4812-
char *fn = _vm->getFormattedName(tmp, sizeof(tmp), "ipdata", NULL, true);
4811+
const int32_t bufSize = 1025;
4812+
char buf[bufSize];
4813+
char *fn = TR::Options::buildLogFileName(buf, bufSize, "ipdata", -1, TR::Options::getLogFileNameSuffix(), true);
4814+
TR_ASSERT_FATAL(fn, "Error building IPBCData filename");
4815+
48134816
aggregationHT.sortByNameAndPrint(fn);
48144817

48154818
fprintf(stderr, "Finished dumping info\n");
@@ -4826,8 +4829,12 @@ TR_IProfiler::dumpAllBytecodeProfilingData(J9VMThread* vmThread)
48264829
return;
48274830
}
48284831
traverseIProfilerTableAndCollectEntries(&aggregationHT, vmThread, false/*collectOnlyCallGraphEntries*/);
4829-
char tmp[1025];
4830-
char *fn = _vm->getFormattedName(tmp, sizeof(tmp), "ipdata", NULL, true);
4832+
4833+
const int32_t bufSize = 1025;
4834+
char buf[bufSize];
4835+
char *fn = TR::Options::buildLogFileName(buf, bufSize, "ipdata", -1, TR::Options::getLogFileNameSuffix(), true);
4836+
TR_ASSERT_FATAL(fn, "Error building bytecode profiling filename");
4837+
48314838
aggregationHT.sortByNameAndPrint(fn);
48324839

48334840
fprintf(stderr, "Finished dumping info\n");

‎test/functional/cmdLineTests/criu/playlist.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
<variation>-XX:+DebugOnRestore -Xjit:count=0</variation>
189189
</variations>
190190
<command>
191-
TR_Options=$(Q)disableSuffixLogs$(Q) \
191+
TR_Options=$(Q)dontApplyLogFileNameSuffix$(Q) \
192192
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -Xdump \
193193
-DSCRIPPATH=$(TEST_RESROOT)$(D)criuScript.sh -DTEST_RESROOT=$(TEST_RESROOT) \
194194
-DCATSCRIPPATH=$(TEST_RESROOT)$(D)criuCatVlog.sh \
@@ -224,7 +224,7 @@
224224
<command>
225225
if [ -x $(Q)$(TEST_JDK_BIN)$(D)jitserver$(Q) ]; \
226226
then \
227-
TR_Options=$(Q)disableSuffixLogs$(Q) \
227+
TR_Options=$(Q)dontApplyLogFileNameSuffix$(Q) \
228228
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -Xdump \
229229
-DSCRIPPATH=$(TEST_RESROOT)$(D)criuJitServerScript.sh -DTEST_RESROOT=$(TEST_RESROOT) \
230230
-DCATSCRIPPATH=$(TEST_RESROOT)$(D)criuCatVlog.sh \
@@ -270,7 +270,7 @@
270270
<command>
271271
if [ -x $(Q)$(TEST_JDK_BIN)$(D)jitserver$(Q) ]; \
272272
then \
273-
TR_Options=$(Q)disableSuffixLogs$(Q) \
273+
TR_Options=$(Q)dontApplyLogFileNameSuffix$(Q) \
274274
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -Xdump \
275275
-DSCRIPPATH=$(TEST_RESROOT)$(D)criuJitServerScript.sh -DTEST_RESROOT=$(TEST_RESROOT) \
276276
-DCATSCRIPPATH=$(TEST_RESROOT)$(D)criuCatVlog.sh \
@@ -623,4 +623,4 @@
623623
<impl>openj9</impl>
624624
</impls>
625625
</test>
626-
</playlist>
626+
</playlist>

‎test/functional/cmdLineTests/jitserver/playlist.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<command>
3838
if [ -x $(Q)$(TEST_JDK_BIN)$(D)jitserver$(Q) ]; \
3939
then \
40-
TR_Options=$(Q)disableSuffixLogs$(Q) \
40+
TR_Options=$(Q)dontApplyLogFileNameSuffix$(Q) \
4141
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -Xdump \
4242
-DSCRIPPATH=$(TEST_RESROOT)$(D)jitserverScript.sh -DTEST_RESROOT=$(TEST_RESROOT) \
4343
-DTEST_JDK_BIN=$(TEST_JDK_BIN) \

‎test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@
3333
<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
3434

3535
<test id="fw001-1">
36-
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=0,traceFull,traceCG,log=unresolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
36+
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},dontApplyLogFileNameSuffix,{*jitme*}(count=0,traceFull,traceCG,log=unresolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
3737
<return type="success" value="0"/>
3838
</test>
3939

4040
<test id="fw001-2">
41-
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=1,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
41+
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},dontApplyLogFileNameSuffix,{*jitme*}(count=1,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
4242
<return type="success" value="0"/>
4343
</test>
4444

4545
<test id="fw001-3">
46-
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
46+
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},dontApplyLogFileNameSuffix,{*jitme*}(count=2,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
4747
<return type="success" value="0"/>
4848
</test>
4949

5050
<test id="fw001-4">
51-
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
51+
<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},dontApplyLogFileNameSuffix,{*jitme*}(count=2) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
5252
<return type="success" value="0"/>
5353
</test>
5454

0 commit comments

Comments
 (0)