RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:08:10 +00:00
Code Issues Activity Actions

Everywhere: Replace a bundle of dbg with dbgln.

Browse source 
These changes are arbitrarily divided into multiple commits to make it
easier to find potentially introduced bugs with git bisect.Everything:
This commit is contained in:
asynts 2021-01-10 15:43:09 +01:00 • committed by Andreas Kling
parent dca6f1f49b
commit 5931758dbc
7 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Net/LoopbackAdapter.cpp
View file

@ -49,7 +49,7 @@ LoopbackAdapter::~LoopbackAdapter()
void LoopbackAdapter::send_raw(ReadonlyBytes payload) void LoopbackAdapter::send_raw(ReadonlyBytes payload)
{ {
dbg() << "LoopbackAdapter: Sending " << payload.size() << " byte(s) to myself."; dbgln("LoopbackAdapter: Sending {} byte(s) to myself.", payload.size());
did_receive(payload); did_receive(payload);
} }

4
Kernel/Net/Socket.cpp
View file

@ -149,7 +149,7 @@ KResult Socket::setsockopt(int level, int option, Userspace<const void*> user_va
} }
return KSuccess; return KSuccess;
default: default:
dbg() << "setsockopt(" << option << ") at SOL_SOCKET not implemented."; dbgln("setsockopt({}) at SOL_SOCKET not implemented.", option);
return KResult(-ENOPROTOOPT); return KResult(-ENOPROTOOPT);
} }
} }
@ -226,7 +226,7 @@ KResult Socket::getsockopt(FileDescription&, int level, int option, Userspace<vo
return KResult(-EFAULT); return KResult(-EFAULT);
return KSuccess; return KSuccess;
default: default:
dbg() << "getsockopt(" << option << ") at SOL_SOCKET not implemented."; dbgln("setsockopt({}) at SOL_SOCKET not implemented.", option);
return KResult(-ENOPROTOOPT); return KResult(-ENOPROTOOPT);
} }
} }

2
Kernel/Net/TCPSocket.cpp
View file

@ -465,7 +465,7 @@ void TCPSocket::shut_down_for_writing()
[[maybe_unused]] auto rc = send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK); [[maybe_unused]] auto rc = send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK);
set_state(State::FinWait1); set_state(State::FinWait1);
} else { } else {
dbg() << " Shutting down TCPSocket for writing but not moving to FinWait1 since state is " << to_string(state()); dbgln(" Shutting down TCPSocket for writing but not moving to FinWait1 since state is {}", to_string(state()));
} }
} }

4
Kernel/Storage/IDEChannel.cpp
View file

@ -272,7 +272,7 @@ void IDEChannel::handle_irq(const RegisterState&)
// trigger page faults // trigger page faults
Processor::deferred_call_queue([this]() { Processor::deferred_call_queue([this]() {
if (m_current_request->request_type() == AsyncBlockDeviceRequest::Read) { if (m_current_request->request_type() == AsyncBlockDeviceRequest::Read) {
dbg() << "IDEChannel: Read block " << m_current_request_block_index << "/" << m_current_request->block_count(); dbgln("IDEChannel: Read block {}/{}", m_current_request_block_index, m_current_request->block_count());
if (ata_do_read_sector()) { if (ata_do_read_sector()) {
if (++m_current_request_block_index >= m_current_request->block_count()) { if (++m_current_request_block_index >= m_current_request->block_count()) {
complete_current_request(AsyncDeviceRequest::Success); complete_current_request(AsyncDeviceRequest::Success);
@ -283,7 +283,7 @@ void IDEChannel::handle_irq(const RegisterState&)
} }
} else { } else {
if (!m_current_request_flushing_cache) { if (!m_current_request_flushing_cache) {
dbg() << "IDEChannel: Wrote block " << m_current_request_block_index << "/" << m_current_request->block_count(); dbgln("IDEChannel: Wrote block {}/{}", m_current_request_block_index, m_current_request->block_count());
if (++m_current_request_block_index >= m_current_request->block_count()) { if (++m_current_request_block_index >= m_current_request->block_count()) {
// We read the last block, flush cache // We read the last block, flush cache
ASSERT(!m_current_request_flushing_cache); ASSERT(!m_current_request_flushing_cache);

2
Kernel/Storage/Partition/GUIDPartitionTable.cpp
View file

@ -133,7 +133,7 @@ bool GUIDPartitionTable::initialize()
Array<u8, 16> unique_guid {}; Array<u8, 16> unique_guid {};
unique_guid.span().overwrite(0, entry.unique_guid, unique_guid.size()); unique_guid.span().overwrite(0, entry.unique_guid, unique_guid.size());
String name = entry.partition_name; String name = entry.partition_name;
dbg() << "Detected GPT partition (entry " << entry_index << ") , offset " << entry.first_lba << " , limit " << entry.last_lba; dbgln("Detected GPT partition (entry={}), offset={}, limit={}", entry_index, entry.first_lba, entry.last_lba);
m_partitions.append({ entry.first_lba, entry.last_lba, partition_type, unique_guid, entry.attributes, "" }); m_partitions.append({ entry.first_lba, entry.last_lba, partition_type, unique_guid, entry.attributes, "" });
raw_byte_index += header().partition_entry_size; raw_byte_index += header().partition_entry_size;
} }

14
Kernel/Syscalls/module.cpp
View file

@ -86,17 +86,17 @@ int Process::sys$module_load(Userspace<const char*> user_path, size_t path_lengt
switch (relocation.type()) { switch (relocation.type()) {
case R_386_PC32: { case R_386_PC32: {
// PC-relative relocation // PC-relative relocation
dbg() << "PC-relative relocation: " << relocation.symbol().name(); dbgln("PC-relative relocation: {}", relocation.symbol().name());
u32 symbol_address = address_for_kernel_symbol(relocation.symbol().name()); u32 symbol_address = address_for_kernel_symbol(relocation.symbol().name());
if (symbol_address == 0) if (symbol_address == 0)
missing_symbols = true; missing_symbols = true;
dbg() << " Symbol address: " << (void*)symbol_address; dbgln(" Symbol address: {:p}", symbol_address);
ptrdiff_t relative_offset = (char*)symbol_address - ((char*)&patch_ptr + 4); ptrdiff_t relative_offset = (char*)symbol_address - ((char*)&patch_ptr + 4);
patch_ptr = relative_offset; patch_ptr = relative_offset;
break; break;
} }
case R_386_32: // Absolute relocation case R_386_32: // Absolute relocation
dbg() << "Absolute relocation: '" << relocation.symbol().name() << "' value:" << relocation.symbol().value() << ", index:" << relocation.symbol_index(); dbgln("Absolute relocation: '{}' value={}, index={}", relocation.symbol().name(), relocation.symbol().value(), relocation.symbol_index());
if (relocation.symbol().bind() == STB_LOCAL) { if (relocation.symbol().bind() == STB_LOCAL) {
auto* section_storage_containing_symbol = section_storage_by_name.get(relocation.symbol().section().name()).value_or(nullptr); auto* section_storage_containing_symbol = section_storage_by_name.get(relocation.symbol().section().name()).value_or(nullptr);
@ -104,13 +104,13 @@ int Process::sys$module_load(Userspace<const char*> user_path, size_t path_lengt
u32 symbol_address = (ptrdiff_t)(section_storage_containing_symbol + relocation.symbol().value()); u32 symbol_address = (ptrdiff_t)(section_storage_containing_symbol + relocation.symbol().value());
if (symbol_address == 0) if (symbol_address == 0)
missing_symbols = true; missing_symbols = true;
dbg() << " Symbol address: " << (void*)symbol_address; dbgln(" Symbol address: {:p}", symbol_address);
patch_ptr += symbol_address; patch_ptr += symbol_address;
} else if (relocation.symbol().bind() == STB_GLOBAL) { } else if (relocation.symbol().bind() == STB_GLOBAL) {
u32 symbol_address = address_for_kernel_symbol(relocation.symbol().name()); u32 symbol_address = address_for_kernel_symbol(relocation.symbol().name());
if (symbol_address == 0) if (symbol_address == 0)
missing_symbols = true; missing_symbols = true;
dbg() << " Symbol address: " << (void*)symbol_address; dbgln(" Symbol address: {:p}", symbol_address);
patch_ptr += symbol_address; patch_ptr += symbol_address;
} else { } else {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -133,7 +133,7 @@ int Process::sys$module_load(Userspace<const char*> user_path, size_t path_lengt
} }
elf_image->for_each_symbol([&](const ELF::Image::Symbol& symbol) { elf_image->for_each_symbol([&](const ELF::Image::Symbol& symbol) {
dbg() << " - " << symbol.type() << " '" << symbol.name() << "' @ " << (void*)symbol.value() << ", size=" << symbol.size(); dbgln(" - {} '{}' @ {:p}, size={}", symbol.type(), symbol.name(), symbol.value(), symbol.size());
if (symbol.name() == "module_init") { if (symbol.name() == "module_init") {
module->module_init = (ModuleInitPtr)(text_base + symbol.value()); module->module_init = (ModuleInitPtr)(text_base + symbol.value());
} else if (symbol.name() == "module_fini") { } else if (symbol.name() == "module_fini") {
@ -150,7 +150,7 @@ int Process::sys$module_load(Userspace<const char*> user_path, size_t path_lengt
return -EINVAL; return -EINVAL;
if (g_modules->contains(module->name)) { if (g_modules->contains(module->name)) {
dbg() << "a module with the name " << module->name << " is already loaded; please unload it first"; dbgln("a module with the name {} is already loaded; please unload it first", module->name);
return -EEXIST; return -EEXIST;
} }

12
Kernel/Syscalls/mount.cpp
View file

@ -57,9 +57,9 @@ int Process::sys$mount(Userspace<const Syscall::SC_mount_params*> user_params)
auto description = file_description(source_fd); auto description = file_description(source_fd);
if (!description.is_null()) if (!description.is_null())
dbg() << "mount " << fs_type << ": source fd " << source_fd << " @ " << target; dbgln("mount {}: source fd {} @ {}", fs_type, source_fd, target);
else else
dbg() << "mount " << fs_type << " @ " << target; dbgln("mount {} @ {}", fs_type, target);
auto custody_or_error = VFS::the().resolve_path(target, current_directory()); auto custody_or_error = VFS::the().resolve_path(target, current_directory());
if (custody_or_error.is_error()) if (custody_or_error.is_error())
@ -93,7 +93,7 @@ int Process::sys$mount(Userspace<const Syscall::SC_mount_params*> user_params)
return -ENODEV; return -ENODEV;
} }
dbg() << "mount: attempting to mount " << description->absolute_path() << " on " << target; dbgln("mount: attempting to mount {} on {}", description->absolute_path(), target);
fs = Ext2FS::create(*description); fs = Ext2FS::create(*description);
} else if (fs_type == "9p" || fs_type == "Plan9FS") { } else if (fs_type == "9p" || fs_type == "Plan9FS") {
@ -114,15 +114,15 @@ int Process::sys$mount(Userspace<const Syscall::SC_mount_params*> user_params)
} }
if (!fs->initialize()) { if (!fs->initialize()) {
dbg() << "mount: failed to initialize " << fs_type << " filesystem, fd - " << source_fd; dbgln("mount: failed to initialize {} filesystem, fd={}", fs_type, source_fd);
return -ENODEV; return -ENODEV;
} }
auto result = VFS::the().mount(fs.release_nonnull(), target_custody, params.flags); auto result = VFS::the().mount(fs.release_nonnull(), target_custody, params.flags);
if (!description.is_null()) if (!description.is_null())
dbg() << "mount: successfully mounted " << description->absolute_path() << " on " << target; dbgln("mount: successfully mounted {} on {}", description->absolute_path(), target);
else else
dbg() << "mount: successfully mounted " << target; dbgln("mount: successfully mounted {}", target);
return result; return result;
} }