fixed excessive locking in logger

lexa-diky · Jul 10, 2024 · e051305 · e051305
1 parent c4dc1a9
commit e051305
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 38 deletions.
diff --git a/src/compiler/compiler_source.rs b/src/compiler/compiler_source.rs
@@ -1,6 +1,7 @@
 use std::fs::File;
 use std::io::Read;
 use std::path::{Path, PathBuf};
+use crate::util::logger;
 
 pub(crate) trait CompilerSource {
     fn read(&self) -> Result<String, std::io::Error>;
@@ -20,6 +21,7 @@ impl FileCompilerSource {
 
 impl CompilerSource for FileCompilerSource {
     fn read(&self) -> Result<String, std::io::Error> {
+        logger::debug!("Reading source file: {:?}", self.path);
         let mut p = File::open(self.path.clone())?;
         let mut buff = String::new();
         p.read_to_string(&mut buff)?;

diff --git a/src/util/logger.rs b/src/util/logger.rs
@@ -80,60 +80,68 @@ lazy_static!(
 
 macro_rules! debug {
     ($($arg:tt)*) => {
-        let  instance = crate::util::logger::INSTANCE.lock().unwrap();
-        if *instance.level() <= crate::util::logger::LogLevel::Debug {
-            instance.debug(
-                format!(
-                    "{}: {}",
-                    module_path!(),
-                    format!($($arg)*).as_str()
-                ).as_str()
-            );
+        {
+            let  instance = crate::util::logger::INSTANCE.lock().unwrap();
+            if *instance.level() <= crate::util::logger::LogLevel::Debug {
+                instance.debug(
+                    format!(
+                        "{}: {}",
+                        module_path!(),
+                        format!($($arg)*).as_str()
+                    ).as_str()
+                );
+            }
         }
     };
 }
 
 macro_rules! error {
     ($($arg:tt)*) => {
-        let  instance = crate::util::logger::INSTANCE.lock().unwrap();
-        if *instance.level() <= crate::util::logger::LogLevel::Error {
-            instance.error(
-                format!(
-                    "{}: {}",
-                    module_path!(),
-                    format!($($arg)*).as_str()
-                ).as_str()
-            );
+        {
+            let  instance = crate::util::logger::INSTANCE.lock().unwrap();
+            if *instance.level() <= crate::util::logger::LogLevel::Error {
+                instance.error(
+                    format!(
+                        "{}: {}",
+                        module_path!(),
+                        format!($($arg)*).as_str()
+                    ).as_str()
+                );
+            }
         }
     };
 }
 
 macro_rules! info {
     ($($arg:tt)*) => {
-        let  instance = crate::util::logger::INSTANCE.lock().unwrap();
-        if *instance.level() <= crate::util::logger::LogLevel::Info {
-            instance.info(
-                format!(
-                    "{}: {}",
-                    module_path!(),
-                    format!($($arg)*).as_str()
-                ).as_str()
-            );
+        {
+            let  instance = crate::util::logger::INSTANCE.lock().unwrap();
+            if *instance.level() <= crate::util::logger::LogLevel::Info {
+                instance.info(
+                    format!(
+                        "{}: {}",
+                        module_path!(),
+                        format!($($arg)*).as_str()
+                    ).as_str()
+                );
+            }
         }
     };
 }
 
-macro_rules! warn {
+macro_rules! warning {
     ($($arg:tt)*) => {
-        let  instance = crate::util::logger::INSTANCE.lock().unwrap();
-        if *instance.level() <= crate::util::logger::LogLevel::Warn {
-            instance.warn(
-                format!(
-                    "{}: {}",
-                    module_path!(),
-                    format!($($arg)*).as_str()
-                ).as_str()
-            );
+        {
+            let  instance = crate::util::logger::INSTANCE.lock().unwrap();
+            if *instance.level() <= crate::util::logger::LogLevel::Warn {
+                instance.warn(
+                    format!(
+                        "{}: {}",
+                        module_path!(),
+                        format!($($arg)*).as_str()
+                    ).as_str()
+                );
+            }
         }
     };
 }
@@ -147,4 +155,4 @@ macro_rules! output {
     };
 }
 
-pub(crate) use {debug, output, error};
+pub(crate) use {debug, output, error, info, warning};