Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ namespace gpgmm::d3d12 {
SetEventMessageLevel(GetLogSeverity(descriptor.MinRecordLevel));
}

SetLogMessageLevel(GetLogSeverity(descriptor.MinLogLevel));
SetLogLevel(GetLogSeverity(descriptor.MinLogLevel));

std::unique_ptr<ResidencyManager> residencyManager = std::unique_ptr<ResidencyManager>(
new ResidencyManager(descriptor, std::move(residencyFence)));
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ namespace gpgmm::d3d12 {
// Do not override the default min. log level specified by the residency manager.
// Only if this allocator is without residency, does the min. log level have affect.
if (pResidencyManager == nullptr) {
SetLogMessageLevel(GetLogSeverity(newDescriptor.MinLogLevel));
SetLogLevel(GetLogSeverity(newDescriptor.MinLogLevel));
}

#if defined(GPGMM_ENABLE_DEVICE_LEAK_CHECKS)
Expand Down
14 changes: 7 additions & 7 deletions src/gpgmm/utils/Log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace gpgmm {

static const char kLogTag[] = "GPGMM";

LogSeverity GetDefaultLogMessageLevel() {
LogSeverity GetDefaultLogLevel() {
#if defined(NDEBUG)
return LogSeverity::Info;
#else
Expand All @@ -42,7 +42,7 @@ namespace gpgmm {
}

// Messages with equal or greater to severity will be logged.
static LogSeverity gLogMessageLevel = GetDefaultLogMessageLevel();
static LogSeverity gLogLevel = GetDefaultLogLevel();
static std::mutex mMutex;

namespace {
Expand Down Expand Up @@ -83,14 +83,14 @@ namespace gpgmm {

} // anonymous namespace

void SetLogMessageLevel(const LogSeverity& newLevel) {
void SetLogLevel(const LogSeverity& newLevel) {
std::lock_guard<std::mutex> lock(mMutex);
gLogMessageLevel = newLevel;
gLogLevel = newLevel;
}

LogSeverity GetLogMessageLevel() {
LogSeverity GetLogLevel() {
std::lock_guard<std::mutex> lock(mMutex);
return gLogMessageLevel;
return gLogLevel;
}

// LogMessage
Expand Down Expand Up @@ -126,7 +126,7 @@ namespace gpgmm {
#endif // defined(GPGMM_PLATFORM_WINDOWS)

// If this message is below the global severity level, do not print it.
if (GetLogMessageLevel() > mSeverity) {
if (GetLogLevel() > mSeverity) {
return;
}

Expand Down
10 changes: 5 additions & 5 deletions src/gpgmm/utils/Log.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ namespace gpgmm {
};

// Messages of a given severity to be logged.
void SetLogMessageLevel(const LogSeverity& level);
LogSeverity GetLogMessageLevel();
void SetLogLevel(const LogSeverity& level);
LogSeverity GetLogLevel();

// Essentially an ostringstream that will print itself in its destructor.
class LogMessage {
Expand Down Expand Up @@ -101,12 +101,12 @@ namespace gpgmm {
// RAII helper to set the global log severity level.
class ScopedLogLevel {
public:
explicit ScopedLogLevel(const LogSeverity& newLevel) : mPrevLevel(GetLogMessageLevel()) {
SetLogMessageLevel(newLevel);
explicit ScopedLogLevel(const LogSeverity& newLevel) : mPrevLevel(GetLogLevel()) {
SetLogLevel(newLevel);
}

~ScopedLogLevel() {
SetLogMessageLevel(mPrevLevel);
SetLogLevel(mPrevLevel);
}

private:
Expand Down
2 changes: 1 addition & 1 deletion src/tests/GPGMMTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void GPGMMTestEnvironment::SetEnvironment(GPGMMTestEnvironment* env) {
}

void GPGMMTestEnvironment::SetUp() {
mLogLevel = gpgmm::GetLogMessageLevel();
mLogLevel = gpgmm::GetLogLevel();
}

bool GPGMMTestEnvironment::IsDumpEventsEnabled() const {
Expand Down