From fc87097bf0de96fd867f6f686718fb2a93319ff5 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Tue, 20 Mar 2018 14:11:22 +0100 Subject: [PATCH] Add more logging --- kernel/src/fs/devfs.cpp | 2 ++ kernel/src/fs/fat32.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/kernel/src/fs/devfs.cpp b/kernel/src/fs/devfs.cpp index 54159109..952d9d96 100644 --- a/kernel/src/fs/devfs.cpp +++ b/kernel/src/fs/devfs.cpp @@ -85,6 +85,8 @@ size_t devfs::devfs_file_system::get_file(const path& file_path, vfs::file& f){ } size_t devfs::devfs_file_system::read(const path& file_path, char* buffer, size_t count, size_t offset, size_t& read){ + logging::logf(logging::log_level::TRACE, "devfs: read(buffer=%p, count=%d, offset=%d)\n", buffer, count, offset); + //Cannot access the root for reading if(file_path.is_root()){ return std::ERROR_PERMISSION_DENIED; diff --git a/kernel/src/fs/fat32.cpp b/kernel/src/fs/fat32.cpp index a8fee06c..67b48c41 100644 --- a/kernel/src/fs/fat32.cpp +++ b/kernel/src/fs/fat32.cpp @@ -229,6 +229,7 @@ size_t fat32::fat32_file_system::read(const path& file_path, char* buffer, size_ vfs::file file; auto result = get_file(file_path, file); if(result > 0){ + logging::logf(logging::log_level::TRACE, "fat32: invalid file\n"); return result; } @@ -237,11 +238,13 @@ size_t fat32::fat32_file_system::read(const path& file_path, char* buffer, size_ //Check the offset parameter if(offset > file_size){ + logging::logf(logging::log_level::TRACE, "fat32: invalid offset\n"); return std::ERROR_INVALID_OFFSET; } //No need to read the cluster if there are no content if(file_size == 0 || count == 0){ + logging::logf(logging::log_level::TRACE, "fat32: nothing to read\n"); read = 0; return 0; } @@ -262,6 +265,7 @@ size_t fat32::fat32_file_system::read(const path& file_path, char* buffer, size_ auto cluster_last = (cluster + 1) * cluster_size; if(first < cluster_last){ + logging::logf(logging::log_level::TRACE, "fat32: read_sectors\n"); if(read_sectors(cluster_lba(cluster_number), fat_bs->sectors_per_cluster, cluster_buffer.get())){ size_t i = 0; @@ -273,6 +277,7 @@ size_t fat32::fat32_file_system::read(const path& file_path, char* buffer, size_ buffer[position++] = cluster_buffer[i]; } } else { + logging::logf(logging::log_level::TRACE, "fat32: read failed\n"); return std::ERROR_FAILED; } } else { @@ -299,6 +304,8 @@ size_t fat32::fat32_file_system::read(const path& file_path, char* buffer, size_ read = last - first; + logging::logf(logging::log_level::TRACE, "fat32: finished read\n"); + return 0; }