vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set all log levels, reduce unnecessary logs

Browse Source
This commit is contained in:
Jeremy Soller
2025-11-01 19:36:38 -06:00
parent 4d4038dea7
commit 6d5523de2a
26 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acpid/src/aml_physmem.rs
+3 -3
View File
@@ -353,16 +353,16 @@ impl acpi::Handler for AmlPhysMemHandler {
}
fn create_mutex(&self) -> Handle {
log::warn!("TODO: Handler::create_mutex");
log::info!("TODO: Handler::create_mutex");
Handle(0)
}
fn acquire(&self, mutex: Handle, timeout: u16) -> Result<(), AmlError> {
log::warn!("TODO: Handler::acquire");
log::info!("TODO: Handler::acquire");
Ok(())
}
fn release(&self, mutex: Handle) {
log::warn!("TODO: Handler::release");
log::info!("TODO: Handler::release");
}
}
acpid/src/main.rs
+1 -1
View File
@@ -18,8 +18,8 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"misc",
"acpi",
"acpid",
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
let rxsdt_raw_data: Arc<[u8]> = std::fs::read("/scheme/kernel.acpi/rxsdt")
audio/ac97d/src/main.rs
+1 -1
View File
@@ -40,7 +40,7 @@ fn main() {
"audio",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
audio/ihdad/src/main.rs
+1 -1
View File
@@ -70,7 +70,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"audio",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
audio/sb16d/src/main.rs
+1 -1
View File
@@ -23,7 +23,7 @@ fn main() {
"audio",
"pci",
"sb16",
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
graphics/virtio-gpud/src/main.rs
+2 -2
View File
@@ -553,8 +553,8 @@ pub fn main() {
"misc",
"pci",
"virtio-gpud",
log::LevelFilter::Trace,
log::LevelFilter::Trace,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
redox_daemon::Daemon::new(daemon_runner).expect("virtio-core: failed to daemonize");
}
hwd/src/backend/acpi.rs
+1 -1
View File
@@ -89,7 +89,7 @@ impl Backend for AcpiBackend {
"PNP0F13" => "PS/2 port for PS/2-style mouse",
_ => "?",
};
log::debug!("{}: {} ({})", name, id, what);
log::info!("{}: {} ({})", name, id, what);
}
}
}
hwd/src/backend/devicetree.rs
+1 -1
View File
@@ -20,7 +20,7 @@ impl DeviceTreeBackend {
line.push_str(id);
}
}
log::debug!("{}", line);
log::info!("{}", line);
for child in node.children() {
Self::dump(&child, level + 1);
}
hwd/src/main.rs
+2 -2
View File
@@ -6,8 +6,8 @@ fn main() {
"misc",
"hwd",
"hwd",
log::LevelFilter::Debug,
log::LevelFilter::Debug,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
// Prefer DTB if available (matches kernel preference)
input/ps2d/src/main.rs
+1 -1
View File
@@ -30,7 +30,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"misc",
"ps2",
"ps2",
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
input/usbhidd/src/main.rs
+1 -1
View File
@@ -188,7 +188,7 @@ fn main() {
"usb",
"device",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
inputd/src/main.rs
+1 -1
View File
@@ -576,8 +576,8 @@ fn main() {
"misc",
"inputd",
"inputd",
log::LevelFilter::Warn,
log::LevelFilter::Info,
log::LevelFilter::Debug,
);
let mut args = std::env::args().skip(1);
net/rtl8139d/src/main.rs
+1 -1
View File
@@ -113,7 +113,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"net",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
net/rtl8168d/src/main.rs
+1 -1
View File
@@ -113,7 +113,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"net",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
net/virtio-netd/src/main.rs
+2 -2
View File
@@ -124,8 +124,8 @@ pub fn main() {
"net",
"pci",
"virtio-netd",
log::LevelFilter::Trace,
log::LevelFilter::Trace,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
redox_daemon::Daemon::new(daemon_runner).expect("virtio-core: failed to daemonize");
}
pcid-spawner/src/main.rs
+1 -1
View File
@@ -16,8 +16,8 @@ fn main() -> Result<()> {
"bus",
"pci",
"pci-spawner.log",
log::LevelFilter::Warn,
log::LevelFilter::Info,
log::LevelFilter::Trace,
);
let config_data = if fs::metadata(&config_path)?.is_file() {
pcid/src/main.rs
+4 -3
View File
@@ -191,12 +191,13 @@ fn main() {
let mut args = pico_args::Arguments::from_env();
let verbosity = (0..).find(|_| !args.contains("-v")).unwrap_or(0);
let log_level = match verbosity {
0 => log::LevelFilter::Info,
1 => log::LevelFilter::Debug,
0 => log::LevelFilter::Warn,
1 => log::LevelFilter::Info,
2 => log::LevelFilter::Debug,
_ => log::LevelFilter::Trace,
};
common::setup_logging("bus", "pci", "pcid", log_level, log::LevelFilter::Trace);
common::setup_logging("bus", "pci", "pcid", log_level, log::LevelFilter::Info);
redox_daemon::Daemon::new(move |daemon| main_inner(daemon)).unwrap();
}
storage/ahcid/src/main.rs
+1 -1
View File
@@ -33,7 +33,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"disk",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
storage/ided/src/main.rs
+1 -1
View File
@@ -33,7 +33,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"disk",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
storage/lived/src/main.rs
+28 -31
View File
@@ -24,36 +24,7 @@ struct LiveDisk {
}
impl LiveDisk {
fn new() -> anyhow::Result<LiveDisk> {
let mut phys = 0;
let mut size = 0;
// TODO: handle error
for line in std::fs::read_to_string("/scheme/sys/env")
.context("failed to read env")?
.lines()
{
let mut parts = line.splitn(2, '=');
let name = parts.next().unwrap_or("");
let value = parts.next().unwrap_or("");
if name == "DISK_LIVE_ADDR" {
phys = usize::from_str_radix(value, 16).unwrap_or(0);
}
if name == "DISK_LIVE_SIZE" {
size = usize::from_str_radix(value, 16).unwrap_or(0);
}
}
if phys == 0 || size == 0 {
bail!(
"either livedisk phys ({}) or size ({}) was zero",
phys,
size
);
}
fn new(phys: usize, size: usize) -> anyhow::Result<LiveDisk> {
let start = phys.div_floor(PAGE_SIZE) * PAGE_SIZE;
let end = phys
.checked_add(size)
@@ -133,6 +104,32 @@ impl Disk for LiveDisk {
}
fn main() -> anyhow::Result<()> {
let mut phys = 0;
let mut size = 0;
// TODO: handle error
for line in std::fs::read_to_string("/scheme/sys/env")
.context("failed to read env")?
.lines()
{
let mut parts = line.splitn(2, '=');
let name = parts.next().unwrap_or("");
let value = parts.next().unwrap_or("");
if name == "DISK_LIVE_ADDR" {
phys = usize::from_str_radix(value, 16).unwrap_or(0);
}
if name == "DISK_LIVE_SIZE" {
size = usize::from_str_radix(value, 16).unwrap_or(0);
}
}
if phys == 0 || size == 0 {
// No live disk data, no need to say anything or exit with error
std::process::exit(0);
}
redox_daemon::Daemon::new(move |daemon| {
let event_queue = event::EventQueue::new().unwrap();
@@ -147,7 +144,7 @@ fn main() -> anyhow::Result<()> {
"disk.live".to_owned(),
BTreeMap::from([(
0,
LiveDisk::new().unwrap_or_else(|err| {
LiveDisk::new(phys, size).unwrap_or_else(|err| {
eprintln!("failed to initialize livedisk scheme: {}", err);
std::process::exit(1)
}),
storage/nvmed/src/main.rs
+1 -1
View File
@@ -156,7 +156,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
"disk",
"pci",
&scheme_name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
storage/virtio-blkd/src/main.rs
+2 -2
View File
@@ -35,8 +35,8 @@ pub fn main() -> anyhow::Result<()> {
"disk",
"pci",
"virtio-blkd",
log::LevelFilter::Trace,
log::LevelFilter::Trace,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
redox_daemon::Daemon::new(daemon_runner).expect("virtio-core: failed to daemonize");
}
usb/usbhubd/src/main.rs
+1 -1
View File
@@ -35,7 +35,7 @@ fn main() {
"usb",
"device",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
usb/xhcid/src/main.rs
+1 -1
View File
@@ -134,7 +134,7 @@ fn daemon_with_context_size<const N: usize>(
"usb",
"host",
&name,
log::LevelFilter::Info,
log::LevelFilter::Warn,
log::LevelFilter::Info,
);
usb/xhcid/src/xhci/device_enumerator.rs
+4 -4
View File
@@ -35,7 +35,7 @@ impl<const N: usize> DeviceEnumerator<N> {
let port_id = request.port_id;
let port_array_index = port_id.root_hub_port_index();
info!("Device Enumerator request for port {}", port_id);
debug!("Device Enumerator request for port {}", port_id);
let (len, flags) = {
let ports = self.hci.ports.lock().unwrap();
@@ -54,7 +54,7 @@ impl<const N: usize> DeviceEnumerator<N> {
};
if flags.contains(PortFlags::CCS) {
info!(
debug!(
"Received Device Connect Port Status Change Event with port flags {:?}",
flags
);
@@ -114,14 +114,14 @@ impl<const N: usize> DeviceEnumerator<N> {
}
Err(err) => {
if err.errno == EAGAIN {
info!("Received a device connect notification for an already connected device. Ignoring...")
debug!("Received a device connect notification for an already connected device. Ignoring...")
} else {
warn!("processing of device attach request failed! Error: {}", err);
}
}
}
} else {
info!(
debug!(
"Device Enumerator received Detach request on port {} which is in state {}",
port_id,
self.hci.get_pls(port_id)
usb/xhcid/src/xhci/mod.rs
+8 -8
View File
@@ -765,7 +765,7 @@ impl<const N: usize> Xhci<N> {
pub async fn attach_device(&self, port_id: PortId) -> syscall::Result<()> {
if self.port_states.contains_key(&port_id) {
println!("Already contains port {}", port_id);
debug!("Already contains port {}", port_id);
return Err(syscall::Error::new(EAGAIN));
}
@@ -798,7 +798,7 @@ impl<const N: usize> Xhci<N> {
}
};
info!("Enabled port {}, which the xHC mapped to {}", port_id, slot);
debug!("Enabled port {}, which the xHC mapped to {}", port_id, slot);
//TODO: get correct speed for child devices
let protocol_speed = self
@@ -895,7 +895,7 @@ impl<const N: usize> Xhci<N> {
match child.try_wait() {
Ok(status_opt) => match status_opt {
Some(status) => {
info!(
debug!(
"driver process {} for port {} exited with status {}",
child.id(),
port_id,
@@ -904,7 +904,7 @@ impl<const N: usize> Xhci<N> {
}
None => {
//TODO: kill harder
info!(
warn!(
"driver process {} for port {} still running",
child.id(),
port_id
@@ -912,7 +912,7 @@ impl<const N: usize> Xhci<N> {
}
},
Err(err) => {
info!(
warn!(
"failed to wait for the driver process {} for port {}: {}",
child.id(),
port_id,
@@ -934,16 +934,16 @@ impl<const N: usize> Xhci<N> {
}
if let Some(state) = self.port_states.remove(&port_id) {
info!("disabling port slot {} for port {}", state.slot, port_id);
debug!("disabling port slot {} for port {}", state.slot, port_id);
let result = self.disable_port_slot(state.slot).await;
info!(
debug!(
"disabled port slot {} for port {} with result: {:?}",
state.slot, port_id, result
);
result
} else {
warn!(
debug!(
"Attempted to detach from port {}, which wasn't previously attached.",
port_id
);