Add C API support for retrieving current log level

nmraz · nmraz · commit b0ea5daded23 · 2025-07-09T22:39:21.000+03:00
diff --git a/c-api-tests/cases/log.c b/c-api-tests/cases/log.c
@@ -11,41 +11,46 @@
     a = spidir_builder_build_icmp(builder, SPIDIR_ICMP_##kind,                 \
                                   SPIDIR_TYPE_I32, a, b)
 
+static void set_log_level(spidir_log_level_t level) {
+    spidir_log_set_max_level(level);
+    ASSERT(spidir_log_get_max_level() == level);
+}
+
 void builder_callback(spidir_builder_handle_t builder, void* ctx) {
     (void) ctx;
 
     spidir_block_t block = spidir_builder_create_block(builder);
     spidir_builder_set_entry_block(builder, block);
     spidir_builder_set_block(builder, block);
 
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_ERROR);
+    set_log_level(SPIDIR_LOG_LEVEL_ERROR);
     spidir_value_t a = spidir_builder_build_param_ref(builder, 0);
     spidir_value_t b = spidir_builder_build_param_ref(builder, 0);
 
     BUILD_BINOP(iadd);
     BUILD_BINOP(isub);
     BUILD_BINOP(and);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_WARN);
+    set_log_level(SPIDIR_LOG_LEVEL_WARN);
     BUILD_BINOP(or);
     BUILD_BINOP(xor);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_DEBUG);
+    set_log_level(SPIDIR_LOG_LEVEL_DEBUG);
     BUILD_BINOP(shl);
     BUILD_BINOP(lshr);
     BUILD_BINOP(ashr);
     BUILD_BINOP(imul);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_TRACE);
+    set_log_level(SPIDIR_LOG_LEVEL_TRACE);
     BUILD_BINOP(sdiv);
     BUILD_BINOP(udiv);
     BUILD_ICMP(EQ);
     BUILD_ICMP(NE);
     BUILD_ICMP(SLT);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_INFO);
+    set_log_level(SPIDIR_LOG_LEVEL_INFO);
     BUILD_ICMP(SLE);
     BUILD_ICMP(ULT);
     BUILD_ICMP(ULE);
 
     a = spidir_builder_build_iext(builder, a);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_NONE);
+    set_log_level(SPIDIR_LOG_LEVEL_NONE);
     a = spidir_builder_build_itrunc(builder, a);
     a = spidir_builder_build_sfill(builder, 16, a);
 
@@ -55,6 +60,8 @@ void builder_callback(spidir_builder_handle_t builder, void* ctx) {
 int main(void) {
     init_stdout_spidir_log();
 
+    ASSERT(spidir_log_get_max_level() == SPIDIR_LOG_LEVEL_NONE);
+
     spidir_module_handle_t module = spidir_module_create();
 
     spidir_value_type_t ret_type = SPIDIR_TYPE_I32;
diff --git a/c-api-tests/cases/log_disabled.c b/c-api-tests/cases/log_disabled.c
@@ -11,41 +11,46 @@
     a = spidir_builder_build_icmp(builder, SPIDIR_ICMP_##kind,                 \
                                   SPIDIR_TYPE_I32, a, b)
 
+static void set_log_level(spidir_log_level_t level) {
+    spidir_log_set_max_level(level);
+    ASSERT(spidir_log_get_max_level() == SPIDIR_LOG_LEVEL_NONE);
+}
+
 void builder_callback(spidir_builder_handle_t builder, void* ctx) {
     (void) ctx;
 
     spidir_block_t block = spidir_builder_create_block(builder);
     spidir_builder_set_entry_block(builder, block);
     spidir_builder_set_block(builder, block);
 
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_ERROR);
+    set_log_level(SPIDIR_LOG_LEVEL_ERROR);
     spidir_value_t a = spidir_builder_build_param_ref(builder, 0);
     spidir_value_t b = spidir_builder_build_param_ref(builder, 0);
 
     BUILD_BINOP(iadd);
     BUILD_BINOP(isub);
     BUILD_BINOP(and);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_WARN);
+    set_log_level(SPIDIR_LOG_LEVEL_WARN);
     BUILD_BINOP(or);
     BUILD_BINOP(xor);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_DEBUG);
+    set_log_level(SPIDIR_LOG_LEVEL_DEBUG);
     BUILD_BINOP(shl);
     BUILD_BINOP(lshr);
     BUILD_BINOP(ashr);
     BUILD_BINOP(imul);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_TRACE);
+    set_log_level(SPIDIR_LOG_LEVEL_TRACE);
     BUILD_BINOP(sdiv);
     BUILD_BINOP(udiv);
     BUILD_ICMP(EQ);
     BUILD_ICMP(NE);
     BUILD_ICMP(SLT);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_INFO);
+    set_log_level(SPIDIR_LOG_LEVEL_INFO);
     BUILD_ICMP(SLE);
     BUILD_ICMP(ULT);
     BUILD_ICMP(ULE);
 
     a = spidir_builder_build_iext(builder, a);
-    spidir_log_set_max_level(SPIDIR_LOG_LEVEL_NONE);
+    set_log_level(SPIDIR_LOG_LEVEL_NONE);
     a = spidir_builder_build_itrunc(builder, a);
     a = spidir_builder_build_sfill(builder, 16, a);
 
@@ -55,6 +60,8 @@ void builder_callback(spidir_builder_handle_t builder, void* ctx) {
 int main(void) {
     init_stdout_spidir_log();
 
+    ASSERT(spidir_log_get_max_level() == SPIDIR_LOG_LEVEL_NONE);
+
     spidir_module_handle_t module = spidir_module_create();
 
     spidir_value_type_t ret_type = SPIDIR_TYPE_I32;
diff --git a/c-api/include/spidir/log.h b/c-api/include/spidir/log.h
@@ -56,4 +56,7 @@ void spidir_log_init(spidir_log_callback_t callback);
 /// should be overridden with this function if logs are to be received.
 void spidir_log_set_max_level(spidir_log_level_t level);
 
+/// Returns the current maximum level for logs to be delivered.
+spidir_log_level_t spidir_log_get_max_level(void);
+
 #endif
diff --git a/c-api/src/log.rs b/c-api/src/log.rs
@@ -1,17 +1,32 @@
+// The log levels aren't always all used, but it's cleaner to define them together.
+#![allow(unused)]
+
 use core::ffi::c_char;
 
 type ApiLevel = u8;
 type LogCallback = extern "C" fn(ApiLevel, *const c_char, usize, *const c_char, usize);
 
+const SPIDIR_LOG_LEVEL_NONE: ApiLevel = 0;
+const SPIDIR_LOG_LEVEL_ERROR: ApiLevel = 1;
+const SPIDIR_LOG_LEVEL_WARN: ApiLevel = 2;
+const SPIDIR_LOG_LEVEL_INFO: ApiLevel = 3;
+const SPIDIR_LOG_LEVEL_DEBUG: ApiLevel = 4;
+const SPIDIR_LOG_LEVEL_TRACE: ApiLevel = 5;
+
 #[cfg(feature = "no_logging")]
 mod imp {
-    use super::{ApiLevel, LogCallback};
+    use super::{ApiLevel, LogCallback, SPIDIR_LOG_LEVEL_NONE};
 
     #[unsafe(no_mangle)]
     unsafe extern "C" fn spidir_log_init(_callback: LogCallback) {}
 
     #[unsafe(no_mangle)]
     unsafe extern "C" fn spidir_log_set_max_level(_level: ApiLevel) {}
+
+    #[unsafe(no_mangle)]
+    unsafe extern "C" fn spidir_log_get_max_level() -> ApiLevel {
+        SPIDIR_LOG_LEVEL_NONE
+    }
 }
 
 #[cfg(not(feature = "no_logging"))]
@@ -25,14 +40,7 @@ mod imp {
 
     use log::{Level, LevelFilter, Log};
 
-    use super::{ApiLevel, LogCallback};
-
-    const SPIDIR_LOG_LEVEL_NONE: u8 = 0;
-    const SPIDIR_LOG_LEVEL_ERROR: u8 = 1;
-    const SPIDIR_LOG_LEVEL_WARN: u8 = 2;
-    const SPIDIR_LOG_LEVEL_INFO: u8 = 3;
-    const SPIDIR_LOG_LEVEL_DEBUG: u8 = 4;
-    const SPIDIR_LOG_LEVEL_TRACE: u8 = 5;
+    use super::*;
 
     fn log_level_to_api(level: Level) -> ApiLevel {
         match level {
@@ -44,7 +52,18 @@ mod imp {
         }
     }
 
-    fn log_level_from_api(level: ApiLevel) -> LevelFilter {
+    fn log_filter_to_api(level: LevelFilter) -> ApiLevel {
+        match level {
+            LevelFilter::Off => SPIDIR_LOG_LEVEL_NONE,
+            LevelFilter::Error => SPIDIR_LOG_LEVEL_ERROR,
+            LevelFilter::Warn => SPIDIR_LOG_LEVEL_WARN,
+            LevelFilter::Info => SPIDIR_LOG_LEVEL_INFO,
+            LevelFilter::Debug => SPIDIR_LOG_LEVEL_DEBUG,
+            LevelFilter::Trace => SPIDIR_LOG_LEVEL_TRACE,
+        }
+    }
+
+    fn log_filter_from_api(level: ApiLevel) -> LevelFilter {
         match level {
             SPIDIR_LOG_LEVEL_NONE => LevelFilter::Off,
             SPIDIR_LOG_LEVEL_ERROR => LevelFilter::Error,
@@ -94,6 +113,11 @@ mod imp {
 
     #[unsafe(no_mangle)]
     unsafe extern "C" fn spidir_log_set_max_level(level: ApiLevel) {
-        log::set_max_level(log_level_from_api(level));
+        log::set_max_level(log_filter_from_api(level));
+    }
+
+    #[unsafe(no_mangle)]
+    unsafe extern "C" fn spidir_log_get_max_level() -> ApiLevel {
+        log_filter_to_api(log::max_level())
     }
 }
