ITStudio_OUC/OxideJS
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 迁出日志宏，移除直接依赖

Browse Source
This commit is contained in:
爱特每羊队
2026-06-26 18:53:48 +08:00
parent 8394c5d632
commit e730d0fd2d
24 changed files with 214 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_kernel/Cargo.toml
+4 -5
View File
@@ -11,9 +11,8 @@ oxide_bytecode = { path = "../oxide_bytecode" }
oxide_code_cache = { path = "../oxide_code_cache" }
oxide_parser = { path = "../oxide_parser" }
oxide_types = { path = "../oxide_types" }
dashmap.workspace = true
hashbrown.workspace = true
rustc-hash.workspace = true
oxide_log = { path = "../oxide_log" }
bumpalo.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
hashbrown.workspace = true
dashmap.workspace = true
rustc-hash.workspace = true
crates/oxide_kernel/src/kernel.rs
+11 -7
View File
@@ -9,10 +9,11 @@ use oxide_types::value::JsValue;
use crate::builtin::BuiltinWorld;
use crate::code_forge::CodeForge;
use crate::logging::{init_logging, LogLevel, SUBSYSTEM_COUNT};
use crate::prop_forge::PropForge;
use crate::shape_forge::{ShapeForge, EMPTY_SHAPE_ID};
use crate::string_forge::PermInterner;
use oxide_log;
use oxide_log::{Level, SUBSYSTEM_COUNT};
#[derive(Clone)]
pub struct KernelConfig {
@@ -23,7 +24,7 @@ pub struct KernelConfig {
pub max_call_depth: usize,
pub session_gc_threshold: usize,
pub max_cached_modules: usize,
pub log_levels: [LogLevel; SUBSYSTEM_COUNT],
pub log_levels: [Level; SUBSYSTEM_COUNT],
pub warmup_builtin_shapes: bool,
pub warmup_builtin_code: bool,
pub warmup_builtin_ic: bool,
@@ -39,7 +40,7 @@ impl KernelConfig {
max_call_depth: 1024,
session_gc_threshold: 8_388_608,
max_cached_modules: 512,
log_levels: [LogLevel::Off; SUBSYSTEM_COUNT],
log_levels: [Level::Off; SUBSYSTEM_COUNT],
warmup_builtin_shapes: true,
warmup_builtin_code: false,
warmup_builtin_ic: false,
@@ -55,7 +56,7 @@ impl KernelConfig {
max_call_depth: 1024,
session_gc_threshold: 8_388_608,
max_cached_modules: 512,
log_levels: [LogLevel::Off; SUBSYSTEM_COUNT],
log_levels: [Level::Off; SUBSYSTEM_COUNT],
warmup_builtin_shapes: true,
warmup_builtin_code: true,
warmup_builtin_ic: false,
@@ -71,7 +72,7 @@ impl KernelConfig {
max_call_depth: 1024,
session_gc_threshold: 8_388_608,
max_cached_modules: 512,
log_levels: [LogLevel::Off; SUBSYSTEM_COUNT],
log_levels: [Level::Off; SUBSYSTEM_COUNT],
warmup_builtin_shapes: true,
warmup_builtin_code: true,
warmup_builtin_ic: true,
@@ -113,7 +114,10 @@ pub struct KernelCore {
impl KernelCore {
pub fn new(config: KernelConfig) -> Arc<Self> {
init_logging(&config.log_levels);
oxide_log::init(&oxide_log::LogConfig {
output: oxide_log::Output::Stderr,
levels: config.log_levels,
});
let perm_interner = Arc::new(PermInterner::new());
let shape_forge = Arc::new(ShapeForge::new());
let code_forge = Arc::new(CodeForge::new(
@@ -603,7 +607,7 @@ mod tests {
assert_eq!(KernelConfig::minimal().max_steps, None);
assert_eq!(KernelConfig::standard().max_steps, None);
assert_eq!(KernelConfig::full().max_steps, None);
assert_eq!(KernelConfig::minimal().log_levels, [LogLevel::Off; SUBSYSTEM_COUNT]);
assert_eq!(KernelConfig::minimal().log_levels, [Level::Off; SUBSYSTEM_COUNT]);
assert!(!KernelConfig::minimal().warmup_builtin_ic);
assert!(KernelConfig::full().warmup_builtin_ic);
assert_eq!(KernelConfig::full().max_pool_size, None);
crates/oxide_kernel/src/kernel_log.rs
+34
View File
@@ -0,0 +1,34 @@
#[macro_export]
macro_rules! kernel_error {
($($arg:tt)*) => {
oxide_log::__log_event!("oxide::kernel", oxide_log::tracing::Level::ERROR, $($arg)*)
};
}
#[macro_export]
macro_rules! kernel_warn {
($($arg:tt)*) => {
oxide_log::__log_event!("oxide::kernel", oxide_log::tracing::Level::WARN, $($arg)*)
};
}
#[macro_export]
macro_rules! kernel_info {
($($arg:tt)*) => {
oxide_log::__log_event!("oxide::kernel", oxide_log::tracing::Level::INFO, $($arg)*)
};
}
#[macro_export]
macro_rules! kernel_debug {
($($arg:tt)*) => {
oxide_log::__log_event!("oxide::kernel", oxide_log::tracing::Level::DEBUG, $($arg)*)
};
}
#[macro_export]
macro_rules! kernel_trace {
($($arg:tt)*) => {
oxide_log::__log_event!("oxide::kernel", oxide_log::tracing::Level::TRACE, $($arg)*)
};
}
crates/oxide_kernel/src/lib.rs
+1 -1
View File
@@ -3,7 +3,7 @@
pub mod builtin;
pub mod code_forge;
pub mod kernel;
pub mod logging;
pub mod kernel_log;
pub mod prop_forge;
pub mod shape_forge;
pub mod string_forge;
crates/oxide_kernel/src/logging.rs
-235
View File
@@ -1,235 +0,0 @@
use std::sync::atomic::{AtomicU8, Ordering};
use std::sync::Once;
use tracing_subscriber::EnvFilter;
#[repr(u8)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum LogLevel {
Off = 0,
Error = 1,
Warn = 2,
Info = 3,
Debug = 4,
Trace = 5,
}
#[repr(usize)]
#[derive(Clone, Copy, Debug)]
pub enum Subsystem {
Vm = 0,
Ic = 1,
Kernel = 2,
Builtins = 3,
}
pub const SUBSYSTEM_COUNT: usize = 4;
pub struct SubsystemLevel(AtomicU8);
impl SubsystemLevel {
pub const fn new() -> Self {
Self(AtomicU8::new(LogLevel::Off as u8))
}
pub fn set(&self, level: LogLevel) {
self.0.store(level as u8, Ordering::Relaxed);
}
pub fn get(&self) -> LogLevel {
match self.0.load(Ordering::Relaxed) {
1 => LogLevel::Error,
2 => LogLevel::Warn,
3 => LogLevel::Info,
4 => LogLevel::Debug,
5 => LogLevel::Trace,
_ => LogLevel::Off,
}
}
pub fn is_enabled(&self, level: LogLevel) -> bool {
self.0.load(Ordering::Relaxed) >= level as u8
}
}
impl Default for SubsystemLevel {
fn default() -> Self {
Self::new()
}
}
pub static VM_LEVEL: SubsystemLevel = SubsystemLevel::new();
pub static IC_LEVEL: SubsystemLevel = SubsystemLevel::new();
pub static KERNEL_LEVEL: SubsystemLevel = SubsystemLevel::new();
pub static BUILTINS_LEVEL: SubsystemLevel = SubsystemLevel::new();
pub fn apply_log_levels(levels: &[LogLevel; SUBSYSTEM_COUNT]) {
VM_LEVEL.set(levels[Subsystem::Vm as usize]);
IC_LEVEL.set(levels[Subsystem::Ic as usize]);
KERNEL_LEVEL.set(levels[Subsystem::Kernel as usize]);
BUILTINS_LEVEL.set(levels[Subsystem::Builtins as usize]);
apply_env_log_levels();
}
pub fn init_logging(log_levels: &[LogLevel; SUBSYSTEM_COUNT]) {
static LOGGING_INIT: Once = Once::new();
LOGGING_INIT.call_once(|| {
let filter = EnvFilter::try_from_env("OXIDE_LOG").unwrap_or_else(|_| EnvFilter::new("oxide=off"));
let subscriber = tracing_subscriber::fmt()
.with_env_filter(filter)
.with_writer(std::io::stderr)
.with_ansi(false)
.without_time()
.compact()
.finish();
let _ = tracing::subscriber::set_global_default(subscriber);
});
apply_log_levels(log_levels);
}
fn apply_env_log_levels() {
let Ok(spec) = std::env::var("OXIDE_LOG") else {
return;
};
for directive in spec.split(',') {
let Some((target, level)) = directive.split_once('=') else {
continue;
};
let Some(level) = parse_level(level.trim()) else {
continue;
};
match target.trim() {
"oxide" => {
VM_LEVEL.set(level);
IC_LEVEL.set(level);
KERNEL_LEVEL.set(level);
BUILTINS_LEVEL.set(level);
}
"oxide::vm" => VM_LEVEL.set(level),
"oxide::ic" => IC_LEVEL.set(level),
"oxide::kernel" => KERNEL_LEVEL.set(level),
"oxide::builtins" => BUILTINS_LEVEL.set(level),
_ => {}
}
}
}
fn parse_level(level: &str) -> Option<LogLevel> {
if level.eq_ignore_ascii_case("off") {
Some(LogLevel::Off)
} else if level.eq_ignore_ascii_case("error") {
Some(LogLevel::Error)
} else if level.eq_ignore_ascii_case("warn") {
Some(LogLevel::Warn)
} else if level.eq_ignore_ascii_case("info") {
Some(LogLevel::Info)
} else if level.eq_ignore_ascii_case("debug") {
Some(LogLevel::Debug)
} else if level.eq_ignore_ascii_case("trace") {
Some(LogLevel::Trace)
} else {
None
}
}
#[macro_export]
macro_rules! vm_debug {
($($arg:tt)*) => {
if $crate::logging::VM_LEVEL.is_enabled($crate::logging::LogLevel::Debug) {
tracing::event!(target: "oxide::vm", tracing::Level::DEBUG, $($arg)*);
}
};
}
#[macro_export]
macro_rules! vm_trace {
($($arg:tt)*) => {
if $crate::logging::VM_LEVEL.is_enabled($crate::logging::LogLevel::Trace) {
tracing::event!(target: "oxide::vm", tracing::Level::TRACE, $($arg)*);
}
};
}
#[macro_export]
macro_rules! ic_debug {
($($arg:tt)*) => {
if $crate::logging::IC_LEVEL.is_enabled($crate::logging::LogLevel::Debug) {
tracing::event!(target: "oxide::ic", tracing::Level::DEBUG, $($arg)*);
}
};
}
#[macro_export]
macro_rules! ic_trace {
($($arg:tt)*) => {
if $crate::logging::IC_LEVEL.is_enabled($crate::logging::LogLevel::Trace) {
tracing::event!(target: "oxide::ic", tracing::Level::TRACE, $($arg)*);
}
};
}
#[macro_export]
macro_rules! kernel_info {
($($arg:tt)*) => {
if $crate::logging::KERNEL_LEVEL.is_enabled($crate::logging::LogLevel::Info) {
tracing::event!(target: "oxide::kernel", tracing::Level::INFO, $($arg)*);
}
};
}
#[macro_export]
macro_rules! kernel_debug {
($($arg:tt)*) => {
if $crate::logging::KERNEL_LEVEL.is_enabled($crate::logging::LogLevel::Debug) {
tracing::event!(target: "oxide::kernel", tracing::Level::DEBUG, $($arg)*);
}
};
}
#[macro_export]
macro_rules! kernel_trace {
($($arg:tt)*) => {
if $crate::logging::KERNEL_LEVEL.is_enabled($crate::logging::LogLevel::Trace) {
tracing::event!(target: "oxide::kernel", tracing::Level::TRACE, $($arg)*);
}
};
}
#[macro_export]
macro_rules! builtins_debug {
($($arg:tt)*) => {
if $crate::logging::BUILTINS_LEVEL.is_enabled($crate::logging::LogLevel::Debug) {
tracing::event!(target: "oxide::builtins", tracing::Level::DEBUG, $($arg)*);
}
};
}
#[macro_export]
macro_rules! builtins_trace {
($($arg:tt)*) => {
if $crate::logging::BUILTINS_LEVEL.is_enabled($crate::logging::LogLevel::Trace) {
tracing::event!(target: "oxide::builtins", tracing::Level::TRACE, $($arg)*);
}
};
}
#[cfg(test)]
mod tests {
use super::{LogLevel, SubsystemLevel};
#[test]
fn log_level_ordinals_match_gate_contract() {
assert_eq!(LogLevel::Off as u8, 0);
assert_eq!(LogLevel::Trace as u8, 5);
}
#[test]
fn subsystem_level_defaults_off() {
let level = SubsystemLevel::new();
assert_eq!(level.get(), LogLevel::Off);
assert!(!level.is_enabled(LogLevel::Error));
}
}