mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 14:17:36 +00:00
Everywhere: Replace a bundle of dbg with dbgln.
These changes are arbitrarily divided into multiple commits to make it easier to find potentially introduced bugs with git bisect.
This commit is contained in:
parent
78b2be5a2a
commit
67583bc424
8 changed files with 69 additions and 55 deletions
|
@ -24,6 +24,7 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/MemoryStream.h>
|
||||
#include <Kernel/Devices/BlockDevice.h>
|
||||
#include <Kernel/Devices/CharacterDevice.h>
|
||||
|
@ -40,8 +41,6 @@
|
|||
#include <Kernel/VM/MemoryManager.h>
|
||||
#include <LibC/errno_numbers.h>
|
||||
|
||||
//#define FILEDESCRIPTION_DEBUG
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(Custody& custody)
|
||||
|
@ -50,9 +49,7 @@ KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(Custody& custo
|
|||
description->m_custody = custody;
|
||||
auto result = description->attach();
|
||||
if (result.is_error()) {
|
||||
#ifdef FILEDESCRIPTION_DEBUG
|
||||
dbg() << "Failed to create file description for custody: " << result;
|
||||
#endif
|
||||
dbgln<debug_file_description>("Failed to create file description for custody: {}", result);
|
||||
return result;
|
||||
}
|
||||
return description;
|
||||
|
@ -63,9 +60,7 @@ KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(File& file)
|
|||
auto description = adopt(*new FileDescription(file));
|
||||
auto result = description->attach();
|
||||
if (result.is_error()) {
|
||||
#ifdef FILEDESCRIPTION_DEBUG
|
||||
dbg() << "Failed to create file description for file: " << result;
|
||||
#endif
|
||||
dbgln<debug_file_description>("Failed to create file description for file: {}", result);
|
||||
return result;
|
||||
}
|
||||
return description;
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/JsonArraySerializer.h>
|
||||
#include <AK/JsonObject.h>
|
||||
#include <AK/JsonObjectSerializer.h>
|
||||
|
@ -987,9 +988,7 @@ NonnullRefPtr<Inode> ProcFS::root_inode() const
|
|||
|
||||
RefPtr<Inode> ProcFS::get_inode(InodeIdentifier inode_id) const
|
||||
{
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbg() << "ProcFS::get_inode(" << inode_id.index() << ")";
|
||||
#endif
|
||||
dbgln<debug_procfs>("ProcFS::get_inode({})", inode_id.index());
|
||||
if (inode_id == root_inode()->identifier())
|
||||
return m_root_inode;
|
||||
|
||||
|
@ -1102,9 +1101,7 @@ void ProcFSInode::did_seek(FileDescription& description, off_t new_offset)
|
|||
|
||||
InodeMetadata ProcFSInode::metadata() const
|
||||
{
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbg() << "ProcFSInode::metadata(" << index() << ")";
|
||||
#endif
|
||||
dbgln<debug_procfs>("ProcFSInode::metadata({})", index());
|
||||
InodeMetadata metadata;
|
||||
metadata.inode = identifier();
|
||||
metadata.ctime = mepoch;
|
||||
|
@ -1113,9 +1110,7 @@ InodeMetadata ProcFSInode::metadata() const
|
|||
auto proc_parent_directory = to_proc_parent_directory(identifier());
|
||||
auto proc_file_type = to_proc_file_type(identifier());
|
||||
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbg() << " -> pid: " << to_pid(identifier()).value() << ", fi: " << proc_file_type << ", pdi: " << proc_parent_directory;
|
||||
#endif
|
||||
dbgln<debug_procfs>(" -> pid={}, fi={}, pdi={}", to_pid(identifier()).value(), (int)proc_file_type, (int)proc_parent_directory);
|
||||
|
||||
if (is_process_related_file(identifier())) {
|
||||
ProcessID pid = to_pid(identifier());
|
||||
|
@ -1180,18 +1175,14 @@ InodeMetadata ProcFSInode::metadata() const
|
|||
|
||||
ssize_t ProcFSInode::read_bytes(off_t offset, ssize_t count, UserOrKernelBuffer& buffer, FileDescription* description) const
|
||||
{
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbg() << "ProcFS: read_bytes offset: " << offset << " count: " << count;
|
||||
#endif
|
||||
dbgln<debug_procfs>("ProcFS: read_bytes offset: {} count: {}", offset, count);
|
||||
ASSERT(offset >= 0);
|
||||
ASSERT(buffer.user_or_kernel_ptr());
|
||||
|
||||
if (!description)
|
||||
return -EIO;
|
||||
if (!description->data()) {
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbgln("ProcFS: Do not have cached data!");
|
||||
#endif
|
||||
dbgln<debug_procfs>("ProcFS: Do not have cached data!");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@ -1215,9 +1206,7 @@ InodeIdentifier ProcFS::ProcFSDirectoryEntry::identifier(unsigned fsid) const
|
|||
|
||||
KResult ProcFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntryView&)> callback) const
|
||||
{
|
||||
#ifdef PROCFS_DEBUG
|
||||
dbg() << "ProcFS: traverse_as_directory " << index();
|
||||
#endif
|
||||
dbgln<debug_procfs>("ProcFS: traverse_as_directory {}", index());
|
||||
|
||||
if (!Kernel::is_directory(identifier()))
|
||||
return ENOTDIR;
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/LexicalPath.h>
|
||||
#include <AK/Singleton.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
|
@ -132,7 +133,7 @@ KResult VFS::unmount(Inode& guest_inode)
|
|||
}
|
||||
}
|
||||
|
||||
dbg() << "VFS: Nothing mounted on inode " << guest_inode.identifier();
|
||||
dbgln("VFS: Nothing mounted on inode {}", guest_inode.identifier());
|
||||
return ENODEV;
|
||||
}
|
||||
|
||||
|
@ -401,9 +402,7 @@ KResultOr<NonnullRefPtr<FileDescription>> VFS::create(StringView path, int optio
|
|||
return EROFS;
|
||||
|
||||
LexicalPath p(path);
|
||||
#ifdef VFS_DEBUG
|
||||
dbg() << "VFS::create: '" << p.basename() << "' in " << parent_inode.identifier();
|
||||
#endif
|
||||
dbgln<debug_vfs>("VFS::create: '{}' in {}", p.basename(), parent_inode.identifier());
|
||||
uid_t uid = owner.has_value() ? owner.value().uid : current_process->euid();
|
||||
gid_t gid = owner.has_value() ? owner.value().gid : current_process->egid();
|
||||
auto inode_or_error = parent_inode.create_child(p.basename(), mode, 0, uid, gid);
|
||||
|
@ -445,9 +444,7 @@ KResult VFS::mkdir(StringView path, mode_t mode, Custody& base)
|
|||
return EROFS;
|
||||
|
||||
LexicalPath p(path);
|
||||
#ifdef VFS_DEBUG
|
||||
dbg() << "VFS::mkdir: '" << p.basename() << "' in " << parent_inode.identifier();
|
||||
#endif
|
||||
dbgln<debug_vfs>("VFS::mkdir: '{}' in {}", p.basename(), parent_inode.identifier());
|
||||
return parent_inode.create_child(p.basename(), S_IFDIR | mode, 0, current_process->euid(), current_process->egid()).result();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue