CSY/reowolf Changeset - b33d1be6d118 · Centrum Wiskunde & Informatica (CWI)

Changeset - b33d1be6d118

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

Max Henger - 3 years ago 2022-05-16 01:15:27
henger@cwi.nl

Merge branch 'fix-compiler-bin-2' into 'master'

fix: add support for log level to bin-compiler

See merge request nl-cwi-csy/reowolf!10

3 files changed with 19 insertions and 7 deletions:

.gitignore

bin-compiler/src/main.rs

src/runtime2/mod.rs

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ @@ -9,6 +9,7 @@ target @@
 # IDEs
 /.idea
 bin-compiler/.idea
 # Binaries
 main

bin-compiler/src/main.rs

➞

Show inline comments

@@ @@ -27,10 +27,12 @@ fn main() { @@
                 .takes_value(true)
+        )
         .arg(
             Arg::new("debug")
                 .long("debug")
                 .short('d')
                 .help("enable debug logging")
             Arg::new("loglevel")
                 .long("log_level")
                 .short('l')
                 .help("set log level ('none', 'info', 'debug' or 'all')")
                 .default_value("all")
                 .takes_value(true)
+        )
         .arg(
             Arg::new("stdlib")
@@ @@ -64,7 +66,16 @@ fn main() { @@
+        }
     };
     let debug_enabled = app.is_present("debug");
     let log_level = app.value_of("loglevel").unwrap();
     let log_level = match log_level {
         "none" | "None" => rw::runtime2::LogLevel::None,
         "debug" | "Debug" => rw::runtime2::LogLevel::Debug,
         "info" | "Info" | "all" | "All" => rw::runtime2::LogLevel::Info,
         _ => {
             println!("ERROR: Unexpected log level");
             return;
+        }
     };
     let standard_library_dir = app.value_of("stdlib")
         .map(|v| v.to_string());
@@ @@ -114,7 +125,7 @@ fn main() { @@
     // Start runtime
     print!("Startup of runtime ... ");
-    let runtime = rw::runtime2::Runtime::new(num_threads, debug_enabled, protocol_description);
+    let runtime = rw::runtime2::Runtime::new(num_threads, log_level, protocol_description);
     if let Err(err) = &runtime {
         println!("FAILED\nbecause:\n{}", err);
+    }

src/runtime2/mod.rs

➞

Show inline comments

@@ @@ -8,7 +8,7 @@ mod poll; @@
 mod stdlib;
 #[cfg(test)] mod tests;
 pub use runtime::Runtime;
+pub use runtime::{Runtime, LogLevel};
 pub(crate) use error::RtError;
 pub(crate) use scheduler::SchedulerCtx;
 pub(crate) use communication::{

0 comments (0 inline, 0 general)