williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 16 Pull requests Releases 18 Wiki Activity

WIP: The Road to 1.4 #23

Closed
williamjcm wants to merge 24 commits from the-road-to-1point4 into master
pull from: the-road-to-1point4
merge into: williamjcm:master
Conversation 0 Commits 24 Files changed 12 +33 -13
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 874dd9bd4c - Show all commits

24
src/Logger/Logger.cpp
View file

@ -82,8 +82,6 @@ initialise() {
void void
addEntry(EntryType type, StringView message) { addEntry(EntryType type, StringView message) {
_logMutex.lock();
auto time = std::time(nullptr); auto time = std::time(nullptr);
static char formatted_time[20] = {'\0'}; static char formatted_time[20] = {'\0'};
@ -106,20 +104,28 @@ addEntry(EntryType type, StringView message) {
} << entry; } << entry;
arrayAppend(_entries, std::move(entry)); arrayAppend(_entries, std::move(entry));
_logMutex.unlock();
} }
ArrayView<const LogEntry> ArrayView<const LogEntry>
entries() { entries() {
if(!_logMutex.try_lock()) {
return nullptr;
}
_logMutex.unlock();
return _entries; return _entries;
} }
void
lockMutex() {
_logMutex.lock();
}
void
unlockMutex() {
_logMutex.unlock();
}
bool
tryLockMutex() {
return _logMutex.try_lock();
}
} // Logger } // Logger
} // MassBuilderSaveTool } // MassBuilderSaveTool

22
src/Logger/Logger.h
View file

@ -48,11 +48,25 @@ void addEntry(EntryType type, StringView message);
auto entries() -> ArrayView<const LogEntry>; auto entries() -> ArrayView<const LogEntry>;
void lockMutex();
void unlockMutex();
bool tryLockMutex();
} // Logger } // Logger
} // MassBuilderSaveTool } // MassBuilderSaveTool
#define LOG_INFO(message) MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Info, message) #define LOG_INFO(message) MassBuilderSaveTool::Logger::lockMutex(); \
#define LOG_SUCCESS(message) MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Success, message) MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Info, message); \
#define LOG_WARNING(message) MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Warning, message) MassBuilderSaveTool::Logger::unlockMutex();
#define LOG_ERROR(message) MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Error, message) #define LOG_SUCCESS(message) MassBuilderSaveTool::Logger::lockMutex(); \
MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Success, message); \
MassBuilderSaveTool::Logger::unlockMutex();
#define LOG_WARNING(message) MassBuilderSaveTool::Logger::lockMutex(); \
MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Warning, message); \
MassBuilderSaveTool::Logger::unlockMutex();
#define LOG_ERROR(message) MassBuilderSaveTool::Logger::lockMutex(); \
MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Error, message); \
MassBuilderSaveTool::Logger::unlockMutex();