[common/logging] eliminate uneeded std::string{} allocations per each logging

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/common/fs/file.cpp

@@ -7,25 +7,18 @@
 #include <vector>
 
 #include "common/assert.h"
-#include "common/bit_util.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#include "common/fs/fs_types.h"
 #ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif
 #include "common/logging.h"
-#include "common/literals.h"
 
 #ifdef _WIN32
 #include <io.h>
 #include <share.h>
-#include <windows.h>
 #else
 #include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #endif
 
 #ifdef _MSC_VER
@@ -43,13 +36,13 @@ namespace {
 #ifdef _WIN32
 
 /**
-* Converts the file access mode and file type enums to a file access mode wide string.
-*
-* @param mode File access mode
-* @param type File type
-*
-* @returns A pointer to a wide string representing the file access mode.
-*/
+ * Converts the file access mode and file type enums to a file access mode wide string.
+ *
+ * @param mode File access mode
+ * @param type File type
+ *
+ * @returns A pointer to a wide string representing the file access mode.
+ */
 [[nodiscard]] constexpr const wchar_t* AccessModeToWStr(FileAccessMode mode, FileType type) {
     switch (type) {
     case FileType::BinaryFile:
@@ -86,12 +79,12 @@ namespace {
 }
 
 /**
-* Converts the file-share access flag enum to a Windows defined file-share access flag.
-*
-* @param flag File-share access flag
-*
-* @returns Windows defined file-share access flag.
-*/
+ * Converts the file-share access flag enum to a Windows defined file-share access flag.
+ *
+ * @param flag File-share access flag
+ *
+ * @returns Windows defined file-share access flag.
+ */
 [[nodiscard]] constexpr int ToWindowsFileShareFlag(FileShareFlag flag) {
     switch (flag) {
     case FileShareFlag::ShareNone:
@@ -109,13 +102,13 @@ namespace {
 #else
 
 /**
-* Converts the file access mode and file type enums to a file access mode string.
-*
-* @param mode File access mode
-* @param type File type
-*
-* @returns A pointer to a string representing the file access mode.
-*/
+ * Converts the file access mode and file type enums to a file access mode string.
+ *
+ * @param mode File access mode
+ * @param type File type
+ *
+ * @returns A pointer to a string representing the file access mode.
+ */
 [[nodiscard]] constexpr const char* AccessModeToStr(FileAccessMode mode, FileType type) {
     switch (type) {
     case FileType::BinaryFile:
@@ -154,12 +147,12 @@ namespace {
 #endif
 
 /**
-* Converts the seek origin enum to a seek origin integer.
-*
-* @param origin Seek origin
-*
-* @returns Seek origin integer.
-*/
+ * Converts the seek origin enum to a seek origin integer.
+ *
+ * @param origin Seek origin
+ *
+ * @returns Seek origin integer.
+ */
 [[nodiscard]] constexpr int ToSeekOrigin(SeekOrigin origin) {
     switch (origin) {
     case SeekOrigin::SetOrigin:
@@ -185,7 +178,7 @@ std::string ReadStringFromFile(const std::filesystem::path& path, FileType type)
 }
 
 size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
-                        std::string_view string) {
+                         std::string_view string) {
     if (Exists(path) && !IsFile(path)) {
         return 0;
     }
@@ -196,7 +189,7 @@ size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
 }
 
 size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
-                        std::string_view string) {
+                          std::string_view string) {
     if (Exists(path) && !IsFile(path)) {
         return 0;
     }
@@ -251,189 +244,69 @@ FileType IOFile::GetType() const {
     return file_type;
 }
 
-#if defined(__unix__)
-static int PlatformMapReadOnly(IOFile& io, const char* path) {
-    io.mmap_fd = open(path, O_RDONLY);
-    if (io.mmap_fd > 0) {
-        struct stat st;
-        fstat(io.mmap_fd, &st);
-        io.mmap_size = st.st_size;
-
-        int map_flags = MAP_PRIVATE;
-#ifdef MAP_PREFAULT_READ
-        // Prefaults reads so the final resulting pagetable from this big stupid mmap()
-        // isn't comically lazily loaded, we just coalesce everything in-place for our
-        // lovely mmap flags; if we didn't prefault the reads the page table will be
-        // constructed in-place (i.e on a read-by-read basis) causing lovely soft-faults
-        // which would nuke any performance gains.
-        //
-        // This of course incurs a cost in the initial mmap(2) call, but that is fine.
-        map_flags |= MAP_PREFAULT_READ;
-#endif
-#ifdef MAP_NOSYNC
-        // This causes physical media to not be synched to our file/memory
-        // This means that if the read-only file is written to, we won't see changes
-        // or we may see changes which are just funnily scattered, in any case
-        // this presumes the files won't be changed during execution
-        //
-        // Do not ever use this on write files (if we ever support that); this will create
-        // a fun amount of fragmentation on the disk.
-        map_flags |= MAP_NOSYNC;
-#endif
-#if defined(NDEBUG) && defined(MAP_NOCORE)
-        map_flags |= MAP_NOCORE;
-#endif
-#ifdef MAP_HUGE_2MB
-        map_flags |= MAP_HUGE_2MB; //2mb pages
-#elif defined(MAP_ALIGNED)
-        // File must be big enough that it's worth to super align. We can't just super-align every
-        // file otherwise we will run out of alignments for actually important files :)
-        // System doesn't guarantee a super alignment, but if it's available it will delete
-        // about 3 layers(?) of the TLB tree for each read/write.
-        // Again the cost of faults may make this negligible gains, but hey, we gotta work
-        // what we gotta work with.
-        map_flags |= MAP_ALIGNED(21); //2^21 = 2mb use 2MB pages
-#endif
-        io.mmap_base = (u8*)mmap(nullptr, io.mmap_size, PROT_READ, map_flags, io.mmap_fd, 0);
-        if (io.mmap_base == MAP_FAILED) {
-            close(io.mmap_fd);
-            io.mmap_fd = -1;
-        } else {
-            using namespace Common::Literals;
-            // For small files it is acceptable to use a full readahead
-            // See https://github.com/torvalds/linux/blob/e80d033851b3bc94c3d254ac66660ddd0a49d72c/include/linux/pagemap.h#L1392
-            if (u64(st.st_size) >= 256_MiB) {
-                posix_madvise(io.mmap_base, io.mmap_size, POSIX_MADV_RANDOM);
-            } else {
-                posix_madvise(io.mmap_base, io.mmap_size, POSIX_MADV_SEQUENTIAL);
-            }
-        }
-    }
-    return io.mmap_fd;
-}
-static void PlatformUnmap(IOFile& io) {
-    if (io.mmap_fd != -1) {
-        munmap(io.mmap_base, io.mmap_size);
-        close(io.mmap_fd);
-        io.mmap_fd = -1;
-    }
-}
-#elif defined(__APPLE__)
-// NO IMPLEMENTATION YET
-#else
-static int PlatformMapReadOnly(IOFile& io, const wchar_t* path) {
-    io.file_handle = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
-    if (HANDLE(io.file_handle) != INVALID_HANDLE_VALUE) {
-        io.mapping_handle = CreateFileMappingW(HANDLE(io.file_handle), nullptr, PAGE_READONLY, 0, 0, nullptr);
-        if (io.mapping_handle) {
-            io.mmap_base = (u8*)MapViewOfFile(HANDLE(io.mapping_handle), FILE_MAP_READ, 0, 0, 0);
-            if (io.mmap_base) {
-                _LARGE_INTEGER pvalue;
-                GetFileSizeEx(io.file_handle, &pvalue);
-                io.mmap_size = uint32_t(pvalue.QuadPart);
-            } else {
-                CloseHandle(io.mapping_handle);
-                CloseHandle(io.file_handle);
-                return -1;
-            }
-        } else {
-            CloseHandle(io.file_handle);
-            return -1;
-        }
-    }
-    return 0;
-}
-static void PlatformUnmap(IOFile& io) {
-    if(io.mapping_handle) {
-        if(io.mmap_base)
-            UnmapViewOfFile(HANDLE(io.mmap_base));
-        CloseHandle(HANDLE(io.mapping_handle));
-    }
-    if(io.file_handle != INVALID_HANDLE_VALUE)
-        CloseHandle(HANDLE(io.file_handle));
-}
-#endif
-
 void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, FileShareFlag flag) {
     Close();
+
     file_path = path;
     file_access_mode = mode;
     file_type = type;
+
     errno = 0;
+
 #ifdef _WIN32
-    // TODO: this probably can use better logic but oh well I'm not a windowser
-    file_handle = nullptr;
-    if (type == FileType::BinaryFile && mode == FileAccessMode::Read) {
-        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
-            LOG_ERROR(Common_Filesystem, "Error mmap'ing file"); //: {}", path.c_str());
-        }
-    }
-    if (file_handle == nullptr) {
-        if (flag != FileShareFlag::ShareNone) {
-            file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag));
-        } else {
-            _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
-        }
+    if (flag != FileShareFlag::ShareNone) {
+        file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag));
+    } else {
+        _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
     }
 #elif __ANDROID__
     if (Android::IsContentUri(path)) {
         ASSERT_MSG(mode == FileAccessMode::Read, "Content URI file access is for read-only!");
-        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
-            LOG_ERROR(Common_Filesystem, "Error mmap'ing file: {}", path.c_str());
-            int const fd = Android::OpenContentUri(path, Android::OpenMode::Read);
-            if (fd != -1) {
-                file = fdopen(fd, "r");
-                if (errno != 0 && file == nullptr)
-                    LOG_ERROR(Common_Filesystem, "Error opening file: {}, error: {}", path.c_str(), strerror(errno));
-            } else {
-                LOG_ERROR(Common_Filesystem, "Error opening file: {}", path.c_str());
+        const auto fd = Android::OpenContentUri(path, Android::OpenMode::Read);
+        if (fd != -1) {
+            file = fdopen(fd, "r");
+            const auto error_num = errno;
+            if (error_num != 0 && file == nullptr) {
+                LOG_ERROR(Common_Filesystem, "Error opening file: {}, error: {}", path.c_str(),
+                          strerror(error_num));
             }
+        } else {
+            LOG_ERROR(Common_Filesystem, "Error opening file: {}", path.c_str());
         }
     } else {
         file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
     }
-#elif defined(__HAIKU__) || defined(__managarm__) || defined(__OPENORBIS__) || defined(__APPLE__)
-    file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
-#elif defined(__unix__)
-    if (type == FileType::BinaryFile && mode == FileAccessMode::Read) {
-        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
-            LOG_ERROR(Common_Filesystem, "Error mmap'ing file: {}", path.c_str());
-        }
-    }
-    if (mmap_fd == -1) {
-        file = std::fopen(path.c_str(), AccessModeToStr(mode, type)); // mmap(2) failed or simply we can't use it
-    }
 #else
-    // Some other fancy OS (ahem fucking Darwin/Mac OSX)
     file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
 #endif
+
     if (!IsOpen()) {
         const auto ec = std::error_code{errno, std::generic_category()};
         LOG_ERROR(Common_Filesystem, "Failed to open the file at path={}, ec_message={}",
-            PathToUTF8String(file_path), ec.message());
+                  PathToUTF8String(file_path), ec.message());
     }
 }
 
 void IOFile::Close() {
-#if defined(__APPLE__)
-    // NO IMPLEMENTATION YET
-#else
-    PlatformUnmap(*this);
-#endif
-    if (file) {
-        errno = 0;
-        const auto close_result = std::fclose(file) == 0;
-        if (!close_result) {
-            const auto ec = std::error_code{errno, std::generic_category()};
-            LOG_ERROR(Common_Filesystem, "Failed to close the file at path={}, ec_message={}",
-                PathToUTF8String(file_path), ec.message());
-        }
-        file = nullptr;
+    if (!IsOpen()) {
+        return;
     }
+
+    errno = 0;
+
+    const auto close_result = std::fclose(file) == 0;
+
+    if (!close_result) {
+        const auto ec = std::error_code{errno, std::generic_category()};
+        LOG_ERROR(Common_Filesystem, "Failed to close the file at path={}, ec_message={}",
+                  PathToUTF8String(file_path), ec.message());
+    }
+
+    file = nullptr;
 }
 
 bool IOFile::IsOpen() const {
-    return file != nullptr || IsMappedFile();
+    return file != nullptr;
 }
 
 std::string IOFile::ReadString(size_t length) const {
@@ -450,132 +323,137 @@ size_t IOFile::WriteString(std::span<const char> string) const {
 }
 
 bool IOFile::Flush() const {
-    ASSERT(!IsMappedFile());
-    if (file) {
-        errno = 0;
-        auto const flush_result = std::fflush(file) == 0;
-        if (!flush_result) {
-            const auto ec = std::error_code{errno, std::generic_category()};
-            LOG_ERROR(Common_Filesystem, "Failed to flush the file at path={}, ec_message={}",
-                PathToUTF8String(file_path), ec.message());
-        }
-        return flush_result;
+    if (!IsOpen()) {
+        return false;
     }
-    return false;
+
+    errno = 0;
+
+#ifdef _WIN32
+    const auto flush_result = std::fflush(file) == 0;
+#else
+    const auto flush_result = std::fflush(file) == 0;
+#endif
+
+    if (!flush_result) {
+        const auto ec = std::error_code{errno, std::generic_category()};
+        LOG_ERROR(Common_Filesystem, "Failed to flush the file at path={}, ec_message={}",
+                  PathToUTF8String(file_path), ec.message());
+    }
+
+    return flush_result;
 }
 
 bool IOFile::Commit() const {
-    ASSERT(!IsMappedFile());
-    if (file) {
-        errno = 0;
-#ifdef _WIN32
-        const auto commit_result = std::fflush(file) == 0 && _commit(fileno(file)) == 0;
-#else
-        const auto commit_result = std::fflush(file) == 0 && fsync(fileno(file)) == 0;
-#endif
-        if (!commit_result) {
-            const auto ec = std::error_code{errno, std::generic_category()};
-            LOG_ERROR(Common_Filesystem, "Failed to commit the file at path={}, ec_message={}",
-                PathToUTF8String(file_path), ec.message());
-        }
-        return commit_result;
+    if (!IsOpen()) {
+        return false;
     }
-    return false;
+
+    errno = 0;
+
+#ifdef _WIN32
+    const auto commit_result = std::fflush(file) == 0 && _commit(fileno(file)) == 0;
+#else
+    const auto commit_result = std::fflush(file) == 0 && fsync(fileno(file)) == 0;
+#endif
+
+    if (!commit_result) {
+        const auto ec = std::error_code{errno, std::generic_category()};
+        LOG_ERROR(Common_Filesystem, "Failed to commit the file at path={}, ec_message={}",
+                  PathToUTF8String(file_path), ec.message());
+    }
+
+    return commit_result;
 }
 
 bool IOFile::SetSize(u64 size) const {
-    ASSERT(!IsMappedFile());
-    if (file) {
-        errno = 0;
-#ifdef _WIN32
-        const auto set_size_result = _chsize_s(fileno(file), s64(size)) == 0;
-#else
-        const auto set_size_result = ftruncate(fileno(file), s64(size)) == 0;
-#endif
-        if (!set_size_result) {
-            const auto ec = std::error_code{errno, std::generic_category()};
-            LOG_ERROR(Common_Filesystem, "Failed to resize the file at path={}, size={}, ec_message={}",
-                PathToUTF8String(file_path), size, ec.message());
-        }
-        return set_size_result;
+    if (!IsOpen()) {
+        return false;
     }
-    return false;
+
+    errno = 0;
+
+#ifdef _WIN32
+    const auto set_size_result = _chsize_s(fileno(file), static_cast<s64>(size)) == 0;
+#else
+    const auto set_size_result = ftruncate(fileno(file), static_cast<s64>(size)) == 0;
+#endif
+
+    if (!set_size_result) {
+        const auto ec = std::error_code{errno, std::generic_category()};
+        LOG_ERROR(Common_Filesystem, "Failed to resize the file at path={}, size={}, ec_message={}",
+                  PathToUTF8String(file_path), size, ec.message());
+    }
+
+    return set_size_result;
 }
 
 u64 IOFile::GetSize() const {
-    if (IsMappedFile())
-        return mmap_size;
-    if (file) {
-        // Flush any unwritten buffered data into the file prior to retrieving the file mmap_size.
-        std::fflush(file);
-#if __ANDROID__
-        u64 file_size = 0;
-        if (Android::IsContentUri(file_path)) {
-            file_size = Android::GetSize(file_path);
-        } else {
-            std::error_code ec;
+    if (!IsOpen()) {
+        return 0;
+    }
 
-            file_size = fs::file_size(file_path, ec);
+    // Flush any unwritten buffered data into the file prior to retrieving the file size.
+    std::fflush(file);
 
-            if (ec) {
-                LOG_ERROR(Common_Filesystem, "Failed to retrieve the file mmap_size of path={}, ec_message={}",
-                    PathToUTF8String(file_path), ec.message());
-                return 0;
-            }
-        }
-#else
+#ifdef __ANDROID__
+    u64 file_size = 0;
+    if (Android::IsContentUri(file_path)) {
+        file_size = Android::GetSize(file_path);
+    } else {
         std::error_code ec;
-        auto const file_size = fs::file_size(file_path, ec);
+
+        file_size = fs::file_size(file_path, ec);
+
         if (ec) {
-            LOG_ERROR(Common_Filesystem, "Failed to retrieve the file mmap_size of path={}, ec_message={}",
-                PathToUTF8String(file_path), ec.message());
+            LOG_ERROR(Common_Filesystem,
+                      "Failed to retrieve the file size of path={}, ec_message={}",
+                      PathToUTF8String(file_path), ec.message());
             return 0;
         }
-#endif
-        return file_size;
     }
-    return 0;
+#else
+    std::error_code ec;
+
+    const auto file_size = fs::file_size(file_path, ec);
+
+    if (ec) {
+        LOG_ERROR(Common_Filesystem, "Failed to retrieve the file size of path={}, ec_message={}",
+                  PathToUTF8String(file_path), ec.message());
+        return 0;
+    }
+#endif
+
+    return file_size;
 }
 
 bool IOFile::Seek(s64 offset, SeekOrigin origin) const {
-    if (IsMappedFile()) {
-        // fuck you to whoever made this method const
-        switch (origin) {
-        case SeekOrigin::SetOrigin:
-            mmap_offset = s64(offset);
-            break;
-        case SeekOrigin::CurrentPosition:
-            mmap_offset += s64(offset);
-            break;
-        case SeekOrigin::End:
-            mmap_offset = s64(mmap_size) + s64(offset);
-            break;
-        }
-        return true;
+    if (!IsOpen()) {
+        return false;
     }
-    if (file) {
-        errno = 0;
-        const auto seek_result = fseeko(file, offset, ToSeekOrigin(origin)) == 0;
-        if (!seek_result) {
-            const auto ec = std::error_code{errno, std::generic_category()};
-            LOG_ERROR(Common_Filesystem, "Failed to seek the file at path={}, offset={}, origin={}, ec_message={}",
-                PathToUTF8String(file_path), offset, origin, ec.message());
-        }
-        return seek_result;
+
+    errno = 0;
+
+    const auto seek_result = fseeko(file, offset, ToSeekOrigin(origin)) == 0;
+
+    if (!seek_result) {
+        const auto ec = std::error_code{errno, std::generic_category()};
+        LOG_ERROR(Common_Filesystem,
+                  "Failed to seek the file at path={}, offset={}, origin={}, ec_message={}",
+                  PathToUTF8String(file_path), offset, origin, ec.message());
     }
-    return false;
+
+    return seek_result;
 }
 
 s64 IOFile::Tell() const {
-    if (IsMappedFile()) {
-        errno = 0;
-        return s64(mmap_offset);
+    if (!IsOpen()) {
+        return 0;
     }
-    if (file) {
-        errno = 0;
-        return ftello(file);
-    }
-    return 0;
+
+    errno = 0;
+
+    return ftello(file);
 }
 
 } // namespace Common::FS

src/common/fs/file.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include <cstdio>
-#include <cstring>
 #include <filesystem>
 #include <span>
 #include <type_traits>
@@ -25,12 +24,12 @@ enum class SeekOrigin {
 };
 
 /**
-* Opens a file stream at path with the specified open mode.
-*
-* @param file_stream Reference to file stream
-* @param path Filesystem path
-* @param open_mode File stream open mode
-*/
+ * Opens a file stream at path with the specified open mode.
+ *
+ * @param file_stream Reference to file stream
+ * @param path Filesystem path
+ * @param open_mode File stream open mode
+ */
 template <typename FileStream>
 void OpenFileStream(FileStream& file_stream, const std::filesystem::path& path,
                     std::ios_base::openmode open_mode) {
@@ -49,14 +48,14 @@ void OpenFileStream(FileStream& file_stream, const Path& path, std::ios_base::op
 #endif
 
 /**
-* Reads an entire file at path and returns a string of the contents read from the file.
-* If the filesystem object at path is not a regular file, this function returns an empty string.
-*
-* @param path Filesystem path
-* @param type File type
-*
-* @returns A string of the contents read from the file.
-*/
+ * Reads an entire file at path and returns a string of the contents read from the file.
+ * If the filesystem object at path is not a regular file, this function returns an empty string.
+ *
+ * @param path Filesystem path
+ * @param type File type
+ *
+ * @returns A string of the contents read from the file.
+ */
 [[nodiscard]] std::string ReadStringFromFile(const std::filesystem::path& path, FileType type);
 
 #ifdef _WIN32
@@ -71,18 +70,18 @@ template <typename Path>
 #endif
 
 /**
-* Writes a string to a file at path and returns the number of characters successfully written.
-* If a file already exists at path, its contents will be erased.
-* If a file does not exist at path, it creates and opens a new empty file for writing.
-* If the filesystem object at path exists and is not a regular file, this function returns 0.
-*
-* @param path Filesystem path
-* @param type File type
-*
-* @returns Number of characters successfully written.
-*/
+ * Writes a string to a file at path and returns the number of characters successfully written.
+ * If a file already exists at path, its contents will be erased.
+ * If a file does not exist at path, it creates and opens a new empty file for writing.
+ * If the filesystem object at path exists and is not a regular file, this function returns 0.
+ *
+ * @param path Filesystem path
+ * @param type File type
+ *
+ * @returns Number of characters successfully written.
+ */
 [[nodiscard]] size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
-                                    std::string_view string);
+                                       std::string_view string);
 
 #ifdef _WIN32
 template <typename Path>
@@ -96,15 +95,15 @@ template <typename Path>
 #endif
 
 /**
-* Appends a string to a file at path and returns the number of characters successfully written.
-* If a file does not exist at path, it creates and opens a new empty file for appending.
-* If the filesystem object at path exists and is not a regular file, this function returns 0.
-*
-* @param path Filesystem path
-* @param type File type
-*
-* @returns Number of characters successfully written.
-*/
+ * Appends a string to a file at path and returns the number of characters successfully written.
+ * If a file does not exist at path, it creates and opens a new empty file for appending.
+ * If the filesystem object at path exists and is not a regular file, this function returns 0.
+ *
+ * @param path Filesystem path
+ * @param type File type
+ *
+ * @returns Number of characters successfully written.
+ */
 [[nodiscard]] size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
                                         std::string_view string);
 
@@ -132,14 +131,14 @@ public:
                     FileShareFlag flag = FileShareFlag::ShareReadOnly);
 
     /**
-    * An IOFile is a lightweight wrapper on C Library file operations.
-    * Automatically closes an open file on the destruction of an IOFile object.
-    *
-    * @param path Filesystem path
-    * @param mode File access mode
-    * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
-    * @param flag (Windows only) File-share access flag, default is ShareReadOnly
-    */
+     * An IOFile is a lightweight wrapper on C Library file operations.
+     * Automatically closes an open file on the destruction of an IOFile object.
+     *
+     * @param path Filesystem path
+     * @param mode File access mode
+     * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
+     * @param flag (Windows only) File-share access flag, default is ShareReadOnly
+     */
     explicit IOFile(const std::filesystem::path& path, FileAccessMode mode,
                     FileType type = FileType::BinaryFile,
                     FileShareFlag flag = FileShareFlag::ShareReadOnly);
@@ -153,70 +152,84 @@ public:
     IOFile& operator=(IOFile&& other) noexcept;
 
     /**
-    * Gets the path of the file.
-    *
-    * @returns The path of the file.
-    */
+     * Gets the path of the file.
+     *
+     * @returns The path of the file.
+     */
     [[nodiscard]] std::filesystem::path GetPath() const;
 
     /**
-    * Gets the access mode of the file.
-    *
-    * @returns The access mode of the file.
-    */
+     * Gets the access mode of the file.
+     *
+     * @returns The access mode of the file.
+     */
     [[nodiscard]] FileAccessMode GetAccessMode() const;
 
     /**
-    * Gets the type of the file.
-    *
-    * @returns The type of the file.
-    */
+     * Gets the type of the file.
+     *
+     * @returns The type of the file.
+     */
     [[nodiscard]] FileType GetType() const;
 
     /**
-    * Opens a file at path with the specified file access mode.
-    * This function behaves differently depending on the FileAccessMode.
-    * These behaviors are documented in each enum value of FileAccessMode.
-    *
-    * @param path Filesystem path
-    * @param mode File access mode
-    * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
-    * @param flag (Windows only) File-share access flag, default is ShareReadOnly
-    */
+     * Opens a file at path with the specified file access mode.
+     * This function behaves differently depending on the FileAccessMode.
+     * These behaviors are documented in each enum value of FileAccessMode.
+     *
+     * @param path Filesystem path
+     * @param mode File access mode
+     * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
+     * @param flag (Windows only) File-share access flag, default is ShareReadOnly
+     */
     void Open(const std::filesystem::path& path, FileAccessMode mode,
-            FileType type = FileType::BinaryFile,
-            FileShareFlag flag = FileShareFlag::ShareReadOnly);
+              FileType type = FileType::BinaryFile,
+              FileShareFlag flag = FileShareFlag::ShareReadOnly);
+
+// #ifdef _WIN32
+//     template <typename Path>
+//     void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile,
+//               FileShareFlag flag = FileShareFlag::ShareReadOnly) {
+//         using ValueType = typename Path::value_type;
+//         if constexpr (IsChar<ValueType>) {
+//             Open(ToU8String(path), mode, type, flag);
+//         } else {
+//             Open(std::filesystem::path{path}, mode, type, flag);
+//         }
+//     }
+// #endif
 
     /// Closes the file if it is opened.
     void Close();
 
     /**
-    * Checks whether the file is open.
-    * Use this to check whether the calls to Open() or Close() succeeded.
-    *
-    * @returns True if the file is open, false otherwise.
-    */
+     * Checks whether the file is open.
+     * Use this to check whether the calls to Open() or Close() succeeded.
+     *
+     * @returns True if the file is open, false otherwise.
+     */
     [[nodiscard]] bool IsOpen() const;
 
     /**
-    * Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
-    * If T is not a contiguous container as defined by the concept IsContiguousContainer, this
-    * calls ReadObject and T must be a trivially copyable object.
-    *
-    * See ReadSpan for more details if T is a contiguous container.
-    * See ReadObject for more details if T is a trivially copyable object.
-    *
-    * @tparam T Contiguous container or trivially copyable object
-    *
-    * @param data Container of T::value_type data or reference to object
-    *
-    * @returns Count of T::value_type data or objects successfully read.
-    */
+     * Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
+     * If T is not a contiguous container as defined by the concept IsContiguousContainer, this
+     * calls ReadObject and T must be a trivially copyable object.
+     *
+     * See ReadSpan for more details if T is a contiguous container.
+     * See ReadObject for more details if T is a trivially copyable object.
+     *
+     * @tparam T Contiguous container or trivially copyable object
+     *
+     * @param data Container of T::value_type data or reference to object
+     *
+     * @returns Count of T::value_type data or objects successfully read.
+     */
     template <typename T>
     [[nodiscard]] size_t Read(T& data) const {
         if constexpr (IsContiguousContainer<T>) {
             using ContiguousType = typename T::value_type;
-            static_assert(std::is_trivially_copyable_v<ContiguousType>, "Data type must be trivially copyable.");
+            static_assert(std::is_trivially_copyable_v<ContiguousType>,
+                          "Data type must be trivially copyable.");
             return ReadSpan<ContiguousType>(data);
         } else {
             return ReadObject(data) ? 1 : 0;
@@ -224,24 +237,25 @@ public:
     }
 
     /**
-    * Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
-    * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
-    * calls WriteObject and T must be a trivially copyable object.
-    *
-    * See WriteSpan for more details if T is a contiguous container.
-    * See WriteObject for more details if T is a trivially copyable object.
-    *
-    * @tparam T Contiguous container or trivially copyable object
-    *
-    * @param data Container of T::value_type data or const reference to object
-    *
-    * @returns Count of T::value_type data or objects successfully written.
-    */
+     * Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
+     * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
+     * calls WriteObject and T must be a trivially copyable object.
+     *
+     * See WriteSpan for more details if T is a contiguous container.
+     * See WriteObject for more details if T is a trivially copyable object.
+     *
+     * @tparam T Contiguous container or trivially copyable object
+     *
+     * @param data Container of T::value_type data or const reference to object
+     *
+     * @returns Count of T::value_type data or objects successfully written.
+     */
     template <typename T>
     [[nodiscard]] size_t Write(const T& data) const {
         if constexpr (IsContiguousContainer<T>) {
             using ContiguousType = typename T::value_type;
-            static_assert(std::is_trivially_copyable_v<ContiguousType>, "Data type must be trivially copyable.");
+            static_assert(std::is_trivially_copyable_v<ContiguousType>,
+                          "Data type must be trivially copyable.");
             return WriteSpan<ContiguousType>(data);
         } else {
             static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
@@ -250,219 +264,197 @@ public:
     }
 
     /**
-    * Reads a span of T data from a file sequentially.
-    * This function reads from the current position of the file pointer and
-    * advances it by the (count of T * sizeof(T)) bytes successfully read.
-    *
-    * Failures occur when:
-    * - The file is not open
-    * - The opened file lacks read permissions
-    * - Attempting to read beyond the end-of-file
-    *
-    * @tparam T Data type
-    *
-    * @param data Span of T data
-    *
-    * @returns Count of T data successfully read.
-    */
+     * Reads a span of T data from a file sequentially.
+     * This function reads from the current position of the file pointer and
+     * advances it by the (count of T * sizeof(T)) bytes successfully read.
+     *
+     * Failures occur when:
+     * - The file is not open
+     * - The opened file lacks read permissions
+     * - Attempting to read beyond the end-of-file
+     *
+     * @tparam T Data type
+     *
+     * @param data Span of T data
+     *
+     * @returns Count of T data successfully read.
+     */
     template <typename T>
         requires std::is_trivially_copyable_v<T>
     [[nodiscard]] size_t ReadSpan(std::span<T> data) const {
-        if (IsMappedFile()) {
-            std::memcpy(data.data(), mmap_base + mmap_offset, sizeof(T) * data.size());
-            return data.size();
+        if (!IsOpen()) {
+            return 0;
         }
-        return IsOpen() ? std::fread(data.data(), sizeof(T), data.size(), file) : 0;
+        return std::fread(data.data(), sizeof(T), data.size(), file);
     }
 
     /**
-    * Writes a span of T data to a file sequentially.
-    * This function writes from the current position of the file pointer and
-    * advances it by the (count of T * sizeof(T)) bytes successfully written.
-    *
-    * Failures occur when:
-    * - The file is not open
-    * - The opened file lacks write permissions
-    *
-    * @tparam T Data type
-    *
-    * @param data Span of T data
-    *
-    * @returns Count of T data successfully written.
-    */
+     * Writes a span of T data to a file sequentially.
+     * This function writes from the current position of the file pointer and
+     * advances it by the (count of T * sizeof(T)) bytes successfully written.
+     *
+     * Failures occur when:
+     * - The file is not open
+     * - The opened file lacks write permissions
+     *
+     * @tparam T Data type
+     *
+     * @param data Span of T data
+     *
+     * @returns Count of T data successfully written.
+     */
     template <typename T>
     [[nodiscard]] size_t WriteSpan(std::span<const T> data) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
-        if (IsMappedFile()) {
-            std::memcpy(mmap_base + mmap_offset, data.data(), sizeof(T) * data.size());
-            return data.size();
+
+        if (!IsOpen()) {
+            return 0;
         }
-        return IsOpen() ? std::fwrite(data.data(), sizeof(T), data.size(), file) : 0;
+
+        return std::fwrite(data.data(), sizeof(T), data.size(), file);
     }
 
     /**
-    * Reads a T object from a file sequentially.
-    * This function reads from the current position of the file pointer and
-    * advances it by the sizeof(T) bytes successfully read.
-    *
-    * Failures occur when:
-    * - The file is not open
-    * - The opened file lacks read permissions
-    * - Attempting to read beyond the end-of-file
-    *
-    * @tparam T Data type
-    *
-    * @param object Reference to object
-    *
-    * @returns True if the object is successfully read from the file, false otherwise.
-    */
+     * Reads a T object from a file sequentially.
+     * This function reads from the current position of the file pointer and
+     * advances it by the sizeof(T) bytes successfully read.
+     *
+     * Failures occur when:
+     * - The file is not open
+     * - The opened file lacks read permissions
+     * - Attempting to read beyond the end-of-file
+     *
+     * @tparam T Data type
+     *
+     * @param object Reference to object
+     *
+     * @returns True if the object is successfully read from the file, false otherwise.
+     */
     template <typename T>
     [[nodiscard]] bool ReadObject(T& object) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
         static_assert(!std::is_pointer_v<T>, "T must not be a pointer to an object.");
-        if (IsMappedFile()) {
-            std::memcpy(&object, mmap_base + mmap_offset, sizeof(T));
-#ifdef _WIN32
-            return bool(sizeof(T));
-#else
-            return sizeof(T);
-#endif
+
+        if (!IsOpen()) {
+            return false;
         }
-        return IsOpen() ? std::fread(&object, sizeof(T), 1, file) == 1 : false;
+
+        return std::fread(&object, sizeof(T), 1, file) == 1;
     }
 
     /**
-    * Writes a T object to a file sequentially.
-    * This function writes from the current position of the file pointer and
-    * advances it by the sizeof(T) bytes successfully written.
-    *
-    * Failures occur when:
-    * - The file is not open
-    * - The opened file lacks write permissions
-    *
-    * @tparam T Data type
-    *
-    * @param object Const reference to object
-    *
-    * @returns True if the object is successfully written to the file, false otherwise.
-    */
+     * Writes a T object to a file sequentially.
+     * This function writes from the current position of the file pointer and
+     * advances it by the sizeof(T) bytes successfully written.
+     *
+     * Failures occur when:
+     * - The file is not open
+     * - The opened file lacks write permissions
+     *
+     * @tparam T Data type
+     *
+     * @param object Const reference to object
+     *
+     * @returns True if the object is successfully written to the file, false otherwise.
+     */
     template <typename T>
     [[nodiscard]] bool WriteObject(const T& object) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
         static_assert(!std::is_pointer_v<T>, "T must not be a pointer to an object.");
-        if (IsMappedFile()) {
-            std::memcpy(mmap_base + mmap_offset, &object, sizeof(T));
-#ifdef _WIN32
-            return sizeof(T) != 0;
-#else
-            return sizeof(T);
-#endif
+
+        if (!IsOpen()) {
+            return false;
         }
-        return IsOpen() ? std::fwrite(&object, sizeof(T), 1, file) == 1 : false;
+
+        return std::fwrite(&object, sizeof(T), 1, file) == 1;
     }
 
     /**
-    * Specialized function to read a string of a given length from a file sequentially.
-    * This function writes from the current position of the file pointer and
-    * advances it by the number of characters successfully read.
-    * The size of the returned string may not match length if not all bytes are successfully read.
-    *
-    * @param length Length of the string
-    *
-    * @returns A string read from the file.
-    */
+     * Specialized function to read a string of a given length from a file sequentially.
+     * This function writes from the current position of the file pointer and
+     * advances it by the number of characters successfully read.
+     * The size of the returned string may not match length if not all bytes are successfully read.
+     *
+     * @param length Length of the string
+     *
+     * @returns A string read from the file.
+     */
     [[nodiscard]] std::string ReadString(size_t length) const;
 
     /**
-    * Specialized function to write a string to a file sequentially.
-    * This function writes from the current position of the file pointer and
-    * advances it by the number of characters successfully written.
-    *
-    * @param string Span of const char backed std::string or std::string_view
-    *
-    * @returns Number of characters successfully written.
-    */
+     * Specialized function to write a string to a file sequentially.
+     * This function writes from the current position of the file pointer and
+     * advances it by the number of characters successfully written.
+     *
+     * @param string Span of const char backed std::string or std::string_view
+     *
+     * @returns Number of characters successfully written.
+     */
     [[nodiscard]] size_t WriteString(std::span<const char> string) const;
 
     /**
-    * Attempts to flush any unwritten buffered data into the file.
-    *
-    * @returns True if the flush was successful, false otherwise.
-    */
+     * Attempts to flush any unwritten buffered data into the file.
+     *
+     * @returns True if the flush was successful, false otherwise.
+     */
     bool Flush() const;
 
     /**
-    * Attempts to commit the file into the disk.
-    * Note that this is an expensive operation as this forces the operating system to write
-    * the contents of the file associated with the file descriptor into the disk.
-    *
-    * @returns True if the commit was successful, false otherwise.
-    */
+     * Attempts to commit the file into the disk.
+     * Note that this is an expensive operation as this forces the operating system to write
+     * the contents of the file associated with the file descriptor into the disk.
+     *
+     * @returns True if the commit was successful, false otherwise.
+     */
     bool Commit() const;
 
     /**
-    * Resizes the file to a given size.
-    * If the file is resized to a smaller size, the remainder of the file is discarded.
-    * If the file is resized to a larger size, the new area appears as if zero-filled.
-    *
-    * Failures occur when:
-    * - The file is not open
-    *
-    * @param size File size in bytes
-    *
-    * @returns True if the file resize succeeded, false otherwise.
-    */
+     * Resizes the file to a given size.
+     * If the file is resized to a smaller size, the remainder of the file is discarded.
+     * If the file is resized to a larger size, the new area appears as if zero-filled.
+     *
+     * Failures occur when:
+     * - The file is not open
+     *
+     * @param size File size in bytes
+     *
+     * @returns True if the file resize succeeded, false otherwise.
+     */
     [[nodiscard]] bool SetSize(u64 size) const;
 
     /**
-    * Gets the size of the file.
-    *
-    * Failures occur when:
-    * - The file is not open
-    *
-    * @returns The file size in bytes of the file. Returns 0 on failure.
-    */
+     * Gets the size of the file.
+     *
+     * Failures occur when:
+     * - The file is not open
+     *
+     * @returns The file size in bytes of the file. Returns 0 on failure.
+     */
     [[nodiscard]] u64 GetSize() const;
 
     /**
-    * Moves the current position of the file pointer with the specified offset and seek origin.
-    *
-    * @param offset Offset from seek origin
-    * @param origin Seek origin
-    *
-    * @returns True if the file pointer has moved to the specified offset, false otherwise.
-    */
+     * Moves the current position of the file pointer with the specified offset and seek origin.
+     *
+     * @param offset Offset from seek origin
+     * @param origin Seek origin
+     *
+     * @returns True if the file pointer has moved to the specified offset, false otherwise.
+     */
     [[nodiscard]] bool Seek(s64 offset, SeekOrigin origin = SeekOrigin::SetOrigin) const;
 
     /**
-    * Gets the current position of the file pointer.
-    *
-    * @returns The current position of the file pointer.
-    */
+     * Gets the current position of the file pointer.
+     *
+     * @returns The current position of the file pointer.
+     */
     [[nodiscard]] s64 Tell() const;
 
-#ifdef _WIN32
-    inline bool IsMappedFile() const noexcept { return mapping_handle != nullptr; }
-#else // POSIX
-    inline bool IsMappedFile() const noexcept { return mmap_fd != -1; }
-#endif
-
+private:
     std::filesystem::path file_path;
     FileAccessMode file_access_mode{};
     FileType file_type{};
+
     std::FILE* file = nullptr;
-    // Any decent system should have mmap() for files
-    // Systems with artifical mmap() limitations should simply change the logic within file.cpp
-    // and reduce the threshold for which the mmap() is set to
-#ifdef _WIN32
-    void *mapping_handle = nullptr;
-    void *file_handle = nullptr;
-#else // POSIX
-    int mmap_fd = -1;
-#endif
-    u8* mmap_base = nullptr;
-    size_t mmap_size = 0;
-    mutable s64 mmap_offset = 0; // fuck you
 };
 
 } // namespace Common::FS

src/common/logging.cpp

@@ -10,6 +10,7 @@
 #include <cstdlib>
 #include <regex>
 #include <thread>
+#include <fmt/base.h>
 
 #if defined(__ANDROID__)
 #include <android/log.h>
@@ -39,6 +40,19 @@
 
 namespace Common::Log {
 
+/// @brief A log entry. Log entries are store in a structured format to permit more varied output
+/// formatting on different frontends, as well as facilitating filtering and aggregation.
+struct Entry {
+    char const* message = nullptr;
+    size_t message_len = 0;
+    std::chrono::microseconds timestamp;
+    Class log_class{};
+    Level log_level{};
+    const char* filename = nullptr;
+    const char* function = nullptr;
+    uint32_t line_num = 0;
+};
+
 namespace {
 
 /// @brief Returns the name of the passed log class as a C-string. Subclasses are separated by periods
@@ -70,8 +84,6 @@ const char* GetLevelName(Level log_level) {
     }
 }
 
-}
-
 // Some IDEs prefer <file>:<line> instead, so let's just do that :)
 std::string FormatLogMessage(const Entry& entry) noexcept {
     if (!entry.filename) return "";
@@ -79,10 +91,9 @@ std::string FormatLogMessage(const Entry& entry) noexcept {
     auto const time_fractional = uint32_t(entry.timestamp.count() % 1000000);
     auto const class_name = GetLogClassName(entry.log_class);
     auto const level_name = GetLevelName(entry.log_level);
-    return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}", time_seconds, time_fractional, class_name, level_name, entry.filename, entry.line_num, entry.function, entry.message);
+    return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}\n", time_seconds, time_fractional, class_name, level_name, entry.filename, entry.line_num, entry.function, entry.message);
 }
 
-namespace {
 template <typename It>
 Level GetLevelByName(const It begin, const It end) {
     for (u32 i = 0; i < u32(Level::Count); ++i) {
@@ -127,25 +138,6 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
     instance.SetClassLevel(log_class, level);
     return true;
 }
-} // Anonymous namespace
-
-void Filter::ParseFilterString(std::string_view filter_view) {
-    auto clause_begin = filter_view.cbegin();
-    while (clause_begin != filter_view.cend()) {
-        auto clause_end = std::find(clause_begin, filter_view.cend(), ' ');
-        // If clause isn't empty
-        if (clause_end != clause_begin) {
-            ParseFilterRule(*this, clause_begin, clause_end);
-        }
-        if (clause_end != filter_view.cend()) {
-            // Skip over the whitespace
-            ++clause_end;
-        }
-        clause_begin = clause_end;
-    }
-}
-
-namespace {
 
 /// @brief Trims up to and including the last of ../, ..\, src/, src\ in a string
 /// do not be fooled this isn't generating new strings on .rodata :)
@@ -220,22 +212,24 @@ struct ColorConsoleBackend final : public Backend {
     ~ColorConsoleBackend() noexcept override {}
     void Write(const Entry& entry) noexcept override {
         if (enabled) {
-#define ESC "\x1b"
             auto const color_str = [&entry]() -> const char* {
                 switch (entry.log_level) {
-#define CCB_MAKE_COLOR_FMT(X) ESC X CCB_PRINTF_FMT ESC "[0m\n"
-                case Level::Debug: return CCB_MAKE_COLOR_FMT("[0;36m"); // Cyan
-                case Level::Info: return CCB_MAKE_COLOR_FMT("[0;37m"); // Bright gray
-                case Level::Warning: return CCB_MAKE_COLOR_FMT("[1;33m"); // Bright yellow
-                case Level::Error: return CCB_MAKE_COLOR_FMT("[1;31m"); // Bright red
-                case Level::Critical: return CCB_MAKE_COLOR_FMT("[1;35m"); // Bright magenta
-                default: return CCB_MAKE_COLOR_FMT("[1;30m"); // Grey
-#undef CCB_MAKE_COLOR_FMT
+                case Level::Debug: return "[0;36m"; // Cyan
+                case Level::Info: return "[0;37m"; // Bright gray
+                case Level::Warning: return "[1;33m"; // Bright yellow
+                case Level::Error: return "[1;31m"; // Bright red
+                case Level::Critical: return "[1;35m"; // Bright magenta
+                default: return "[1;30m"; // Grey
                 }
             }();
             auto const df = GetDirectFormatArgs(entry);
-            std::fprintf(stdout, color_str, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str());
-#undef ESC
+            // more restrictive, because take for example this simple prelude:
+            // [  50.872256] Config <Info> common/settings.cpp:142:LogSettings:
+            char buffer[100];
+            auto result = fmt::format_to_n(buffer, sizeof(buffer) - 1, "\x1b{}[{:4d}.{:06d}] {} <{}> {}:{}:{}: ", color_str, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message);
+            std::fwrite(buffer, 1, result.size, stdout);
+            std::fwrite(entry.message, 1, entry.message_len, stdout);
+            std::fwrite("\x1b[0m\n", 1, sizeof("\x1b[0m\n"), stdout);
         }
     }
     void Flush() noexcept override {}
@@ -246,7 +240,7 @@ struct ColorConsoleBackend final : public Backend {
 #ifndef __OPENORBIS__
 /// @brief Backend that writes to a file passed into the constructor
 struct FileBackend final : public Backend {
-    explicit FileBackend(const std::filesystem::path& filename) noexcept {
+    explicit FileBackend(const std::filesystem::path filename) noexcept {
         auto old_filename = filename;
         old_filename += ".old.txt";
         // Existence checks are done within the functions themselves.
@@ -261,7 +255,7 @@ struct FileBackend final : public Backend {
         if (!enabled)
             return;
 
-        auto message = FormatLogMessage(entry).append(1, '\n');
+        auto message = FormatLogMessage(entry);
 #ifndef __ANDROID__
         if (Settings::values.censor_username.GetValue()) {
             // This must be a static otherwise it would get checked on EVERY
@@ -269,8 +263,7 @@ struct FileBackend final : public Backend {
             static std::string username = []() -> std::string {
                 // in order of precedence
                 // LOGNAME usually works on UNIX, USERNAME on Windows
-                // Some UNIX systems suck and don't use LOGNAME so we also
-                // need USER :(
+                // Some UNIX systems suck and don't use LOGNAME so we also need USER :(
                 for (auto const var : { "LOGNAME", "USERNAME", "USER", })
                     if (auto const s = ::getenv(var); s != nullptr)
                         return std::string{s};
@@ -280,7 +273,7 @@ struct FileBackend final : public Backend {
                 boost::replace_all(message, username, "user");
         }
 #endif
-        bytes_written += file->WriteString(message);
+        bytes_written += file->WriteSpan(std::span<const char>{message.begin(), message.end()});
 
         // Option to log each line rather than 4k buffers
         if (Settings::values.log_flush_line.GetValue())
@@ -308,14 +301,13 @@ private:
     bool enabled = true;
 };
 #endif
-
 #ifdef _WIN32
 /// @brief Backend that writes to Visual Studio's output window
 struct DebuggerBackend final : public Backend {
     explicit DebuggerBackend() noexcept = default;
     ~DebuggerBackend() noexcept override = default;
     void Write(const Entry& entry) noexcept override {
-        ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str());
+        ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry)).c_str());
     }
     void Flush() noexcept override {}
 };
@@ -377,7 +369,23 @@ struct Impl {
 #endif
     std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
 };
-} // namespace
+} // Anonymous namespace
+
+void Filter::ParseFilterString(std::string_view filter_view) {
+    auto clause_begin = filter_view.cbegin();
+    while (clause_begin < filter_view.cend()) {
+        auto clause_end = std::find(clause_begin, filter_view.cend(), ' ');
+        // If clause isn't empty
+        if (clause_end != clause_begin) {
+            ParseFilterRule(*this, clause_begin, clause_end);
+        }
+        if (clause_end != filter_view.cend()) {
+            // Skip over the whitespace
+            ++clause_end;
+        }
+        clause_begin = clause_end;
+    }
+}
 
 // Constructor shall NOT depend upon Settings() or whatever
 // it's ran at global static ctor() time... so BE CAREFUL MFER!
@@ -418,10 +426,14 @@ void SetColorConsoleBackendEnabled(bool enabled) {
 
 void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args) {
     if (logging_instance && logging_instance->filter.CheckMessage(log_class, log_level)) {
+        char buffer[BUFSIZ];
+        auto result = fmt::vformat_to_n(buffer, sizeof(buffer) - 1, format, args);
+        buffer[result.size] = '\0';
         auto const flush = ::Settings::values.log_flush_line.GetValue();
         logging_instance->ForEachBackend([=](Backend& backend) {
             backend.Write(Entry{
-                .message = fmt::vformat(format, args),
+                .message = buffer,
+                .message_len = result.size,
                 .timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance->time_origin),
                 .log_class = log_class,
                 .log_level = log_level,

src/common/logging.h

@@ -140,25 +140,4 @@ void Stop();
 void SetGlobalFilter(const Filter& filter);
 void SetColorConsoleBackendEnabled(bool enabled);
 
-/// @brief A log entry. Log entries are store in a structured format to permit more varied output
-/// formatting on different frontends, as well as facilitating filtering and aggregation.
-struct Entry {
-    std::string message;
-    std::chrono::microseconds timestamp;
-    Class log_class{};
-    Level log_level{};
-    const char* filename = nullptr;
-    const char* function = nullptr;
-    unsigned int line_num = 0;
-};
-
-/// Formats a log entry into the provided text buffer.
-std::string FormatLogMessage(const Entry& entry) noexcept;
-
-/// Prints the same message as `PrintMessage`, but colored according to the severity level.
-void PrintColoredMessage(const Entry& entry) noexcept;
-
-/// Formats and prints a log entry to the android logcat.
-void PrintMessageToLogcat(const Entry& entry) noexcept;
-
 } // namespace Common::Log

src/core/hle/service/nim/nim.cpp

@@ -5,136 +5,33 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
-#include <mutex>
-#include <string>
-#include <vector>
-
+#include <ctime>
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
-#include "core/hle/service/cmif_serialization.h"
-#include "core/hle/service/cmif_types.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/nim/nim.h"
-#include "core/hle/service/os/event.h"
 #include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
 
 namespace Service::NIM {
+
 class IShopServiceAsync final : public ServiceFramework<IShopServiceAsync> {
 public:
     explicit IShopServiceAsync(Core::System& system_)
-        : ServiceFramework{system_, "IShopServiceAsync"},
-          service_context{system_, "IShopServiceAsync"} {
+        : ServiceFramework{system_, "IShopServiceAsync"} {
         // clang-format off
         static const FunctionInfo functions[] = {
-            {0, D<&IShopServiceAsync::Cancel>, "Cancel"},
-            {1, D<&IShopServiceAsync::GetSize>, "GetSize"},
-            {2, D<&IShopServiceAsync::Read>, "Read"},
-            {3, D<&IShopServiceAsync::GetErrorCode>, "GetErrorCode"},
-            {4, D<&IShopServiceAsync::Request>, "Request"},
-            {5, D<&IShopServiceAsync::Prepare>, "Prepare"},
+            {0, nullptr, "Cancel"},
+            {1, nullptr, "GetSize"},
+            {2, nullptr, "Read"},
+            {3, nullptr, "GetErrorCode"},
+            {4, nullptr, "Request"},
+            {5, nullptr, "Prepare"},
         };
         // clang-format on
 
         RegisterHandlers(functions);
-
-        completion_event = service_context.CreateEvent("IShopServiceAsync:Completion");
-    }
-
-    ~IShopServiceAsync() override {
-        CancelImpl();
-        service_context.CloseEvent(completion_event);
-    }
-
-    Kernel::KReadableEvent* GetEvent() const {
-        return &completion_event->GetReadableEvent();
-    }
-
-private:
-    KernelHelpers::ServiceContext service_context;
-    Kernel::KEvent* completion_event;
-
-    std::jthread worker;
-    std::atomic<u32> error_code{0};
-
-    std::mutex data_mutex;
-    std::vector<u8> download_data;
-
-    void CancelImpl() {
-        worker.request_stop();
-        if (worker.joinable()) {
-            worker.join();
-        }
-    }
-
-    Result Cancel() {
-        LOG_DEBUG(Service_NIM, "called");
-        CancelImpl();
-        R_SUCCEED();
-    }
-
-    Result GetSize(Out<u64> out_size) {
-        LOG_DEBUG(Service_NIM, "called");
-        std::scoped_lock lock{data_mutex};
-        *out_size = download_data.size();
-        R_SUCCEED();
-    }
-
-    Result Read(Out<u64> out_size, u64 offset, OutBuffer<BufferAttr_HipcAutoSelect> out_buffer) {
-        std::scoped_lock lock{data_mutex};
-
-        u64 actual_read = 0;
-        if (offset < download_data.size()) {
-            actual_read = std::min<u64>(out_buffer.size(), download_data.size() - offset);
-            std::memcpy(out_buffer.data(), download_data.data() + offset, actual_read);
-        }
-
-        *out_size = actual_read;
-        R_SUCCEED();
-    }
-
-    Result GetErrorCode(Out<u32> out_error_code) {
-        LOG_DEBUG(Service_NIM, "called");
-        *out_error_code = error_code.load();
-        R_SUCCEED();
-    }
-
-    Result Request() {
-        LOG_DEBUG(Service_NIM, "(STUBBED) called");
-        CancelImpl();
-
-        error_code.store(0);
-        completion_event->Clear(system.Kernel());
-
-        {
-            std::scoped_lock lock{data_mutex};
-            download_data.clear();
-        }
-
-        worker = std::jthread([this](const std::stop_token& stop_token) {
-            if (stop_token.stop_requested()) {
-                error_code.store(1);
-            } else {
-                std::scoped_lock lock{data_mutex};
-                // Dummy JSON response, else it fails...
-                const std::string dummy_response = "{}";
-                download_data.assign(dummy_response.begin(), dummy_response.end());
-                error_code.store(0);
-            }
-            completion_event->Signal(system.Kernel());
-        });
-
-        R_SUCCEED();
-    }
-
-    Result Prepare(InArray<char, BufferAttr_HipcMapAlias> in_path, InArray<char, BufferAttr_HipcMapAlias> in_post) {
-        LOG_DEBUG(Service_NIM, "called");
-        if (!in_path.empty()) {
-            std::string url(in_path.data(), in_path.size());
-            LOG_INFO(Service_NIM, "Preparing request for URL: {}", url);
-        }
-        R_SUCCEED();
     }
 };
 
@@ -152,13 +49,11 @@ public:
     }
 
 private:
-    void CreateAsyncInterface(HLERequestContext& ctx) {LOG_DEBUG(Service_NIM, "called");
-        auto async_interface = std::make_shared<IShopServiceAsync>(system);
-
-        IPC::ResponseBuilder rb{ctx, 2, 1, 1};
+    void CreateAsyncInterface(HLERequestContext& ctx) {
+        LOG_WARNING(Service_NIM, "(STUBBED) called");
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
         rb.Push(ResultSuccess);
-        rb.PushCopyObjects(ctx, async_interface->GetEvent());
-        rb.PushIpcInterface<IShopServiceAsync>(ctx, std::move(async_interface));
+        rb.PushIpcInterface<IShopServiceAsync>(ctx, system);
     }
 };