Skip to content

Commit 2cb14ae

Browse files
committed
Add proper allocator support to Loggers
Signed-off-by: Daryl Maier <[email protected]>
1 parent 45d2704 commit 2cb14ae

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

runtime/compiler/control/J9Options.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "control/RecompilationInfo.hpp"
4747
#include "env/CompilerEnv.hpp"
4848
#include "env/IO.hpp"
49+
#include "env/TRMemory.hpp"
4950
#include "env/VMJ9.h"
5051
#include "env/VerboseLog.hpp"
5152
#include "env/jittypes.h"
@@ -3572,13 +3573,13 @@ J9::Options::createLoggerForLogFile(TR::FILE *file)
35723573

35733574
if (self()->getOption(TR_ForceCStdIOForLoggers))
35743575
{
3575-
logger = OMR::CStdIOStreamLogger::create(file->_stream);
3576+
logger = OMR::CStdIOStreamLogger::create(trPersistentMemory, file->_stream);
35763577
}
35773578
else
35783579
{
35793580
// An OMR::TRIOStreamLogger is the default logger
35803581
//
3581-
logger = OMR::TRIOStreamLogger::create(file);
3582+
logger = OMR::TRIOStreamLogger::create(trPersistentMemory, file);
35823583
}
35833584

35843585
return logger;

runtime/compiler/env/J2IThunk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ TR_MHJ2IThunkTable::getThunk(char *signature, TR_FrontEnd *fe, bool isForCurrent
179179
if (!result)
180180
{
181181
char terseSignature[260]; // 256 args + 1 return type + null terminator
182-
OMR::Logger *log = OMR::CStdIOStreamLogger::Stderr;
182+
OMR::Logger *log = OMR::CStdIOStreamLogger::stderr();
183183
dumpTo(log, fe);
184184
getTerseSignature(terseSignature, sizeof(terseSignature), signature);
185185
log->printf("\nERROR: Failed to find J2I thunk for %s signature %.*s\n", terseSignature, computeSignatureLength(signature), signature);

runtime/compiler/runtime/J9ValueProfiler.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ TR_EmbeddedHashTable<T, bits>::addKey(T value)
725725
if (dumpInfo)
726726
{
727727
OMR::CriticalSection lock(vpMonitor);
728-
OMR::Logger *log = OMR::CStdIOStreamLogger::Stdout;
728+
OMR::Logger *log = OMR::CStdIOStreamLogger::stdout();
729729
log->printf("Pre %" OMR_PRIX64, static_cast<uint64_t>(value));
730730
this->dumpInfo(log);
731731
log->flush();
@@ -820,7 +820,7 @@ TR_EmbeddedHashTable<T, bits>::addKey(T value)
820820
if (dumpInfo)
821821
{
822822
OMR::CriticalSection lock(vpMonitor);
823-
OMR::Logger *log = OMR::CStdIOStreamLogger::Stdout;
823+
OMR::Logger *log = OMR::CStdIOStreamLogger::stdout();
824824
log->printf("Post %" OMR_PRIX64, static_cast<uint64_t>(value));
825825
this->dumpInfo(log);
826826
log->flush();

0 commit comments

Comments
 (0)