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

Changeset - 070174891230

Parent rev.

Child rev.

[Not reviewed]

0 3 0

mh - 3 years ago 2022-04-29 11:13:14
contact@maxhenger.nl

Fix invalid cmp in debug level

3 files changed with 14 insertions and 14 deletions:

src/runtime2/runtime.rs

src/runtime2/scheduler.rs

src/runtime2/tests/mod.rs

0 comments (0 inline, 0 general)

src/runtime2/runtime.rs

➞

Show inline comments

@@ @@ -11,15 +11,15 @@ use super::communication::Message; @@
 use super::component::{Component, wake_up_if_sleeping, CompPDL, CompCtx};
 use super::store::{ComponentStore, ComponentReservation, QueueDynMpsc, QueueDynProducer};
 use super::scheduler::*;
 #[derive(PartialOrd, PartialEq, Copy, Clone)]
 pub enum LogLevel {
     None, // no logging
     Debug, // all logging (includes messages)
     Info, // rough logging
     None, // no logging
+}
 // -----------------------------------------------------------------------------
 // Component
 // -----------------------------------------------------------------------------

src/runtime2/scheduler.rs

➞

Show inline comments

@@ @@ -31,19 +31,19 @@ impl<'a> SchedulerCtx<'a> { @@
             log_level,
+        }
+    }
     pub(crate) fn debug(&self, text: &str) {
         // TODO: Probably not always use colour
         if self.log_level >= LogLevel::Debug {
             println!("[s:{:02}, c:{:03}] \x1b[0;34m{}\x1b[0m", self.id, self.comp, text);
         if LogLevel::Debug >= self.log_level {
             println!("[s:{:02}, c:{:03}] \x1b[0;36m{}\x1b[0m", self.id, self.comp, text);
+        }
+    }
     pub(crate) fn info(&self, text: &str) {
-        if self.log_level >= LogLevel::Info {
+        if LogLevel::Info >= self.log_level {
             println!("[s:{:02}, c:{:03}] {}", self.id, self.comp, text);
+        }
+    }
     pub(crate) fn error(&self, text: &str) {
         // TODO: Probably not always use colour

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -2,19 +2,19 @@ use crate::protocol::*; @@
 use crate::protocol::eval::*;
 use crate::runtime2::runtime::*;
 use crate::runtime2::component::{CompCtx, CompPDL};
 mod error_handling;
 const LOG_LEVEL: LogLevel = LogLevel::Debug;
 const NUM_THREADS: u32 = 4;
 const DEBUG_LOGGING: bool = true;
 pub(crate) fn compile_and_create_component(source: &str, routine_name: &str, args: ValueGroup) {
     let protocol = ProtocolDescription::parse(source.as_bytes())
         .expect("successful compilation");
-    let runtime = Runtime::new(NUM_THREADS, DEBUG_LOGGING, protocol)
+    let runtime = Runtime::new(NUM_THREADS, LOG_LEVEL, protocol)
         .expect("successful runtime startup");
     create_component(&runtime, "", routine_name, args);
+}
 pub(crate) fn create_component(rt: &Runtime, module_name: &str, routine_name: &str, args: ValueGroup) {
     let prompt = rt.inner.protocol.new_component(
@@ @@ -34,13 +34,13 @@ fn test_component_creation() { @@
     let pd = ProtocolDescription::parse(b"
     primitive nothing_at_all() {
         s32 a = 5;
         auto b = 5 + a;
+    }
     ").expect("compilation");
-    let rt = Runtime::new(1, true, pd).unwrap();
+    let rt = Runtime::new(1, LOG_LEVEL, pd).unwrap();
     for _i in 0..20 {
         create_component(&rt, "", "nothing_at_all", no_args());
+    }
+}
@@ @@ -91,13 +91,13 @@ fn test_component_communication() { @@
         new receiver(i_ormm, 1, 5);
         // multiple rounds, multiple messages per round
         new sender(o_mrmm, 5, 5);
         new receiver(i_mrmm, 5, 5);
     }").expect("compilation");
-    let rt = Runtime::new(3, true, pd).unwrap();
+    let rt = Runtime::new(3, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_intermediate_messenger() {
     let pd = ProtocolDescription::parse(b"
@@ @@ -140,13 +140,13 @@ fn test_intermediate_messenger() { @@
         new constructor_template<u64>();
         new constructor_template<s16>();
         new constructor_template<s32>();
         new constructor_template<s64>();
+    }
     ").expect("compilation");
-    let rt = Runtime::new(3, true, pd).unwrap();
+    let rt = Runtime::new(3, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_simple_select() {
     let pd = ProtocolDescription::parse(b"
@@ @@ -190,13 +190,13 @@ fn test_simple_select() { @@
         channel tx_b -> rx_b;
         new sender(tx_a, num_sends);
         new receiver(rx_a, rx_b, num_sends);
         new sender(tx_b, num_sends);
+    }
     ").expect("compilation");
-    let rt = Runtime::new(3, true, pd).unwrap();
+    let rt = Runtime::new(3, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_unguarded_select() {
     let pd = ProtocolDescription::parse(b"
@@ @@ -212,13 +212,13 @@ fn test_unguarded_select() { @@
         u32 index = 0;
         while (index < 5) {
             sync select { auto v = () -> index += 1; }
+        }
+    }
     ").expect("compilation");
-    let rt = Runtime::new(3, false, pd).unwrap();
+    let rt = Runtime::new(3, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor_outside_select", no_args());
     create_component(&rt, "", "constructor_inside_select", no_args());
+}
 #[test]
 fn test_empty_select() {
@@ @@ -228,13 +228,13 @@ fn test_empty_select() { @@
         while (index < 5) {
             sync select {}
             index += 1;
+        }
+    }
     ").expect("compilation");
-    let rt = Runtime::new(3, false, pd).unwrap();
+    let rt = Runtime::new(3, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_random_u32_temporary_thingo() {
     let pd = ProtocolDescription::parse(b"
@@ @@ -254,13 +254,13 @@ fn test_random_u32_temporary_thingo() { @@
         channel tx -> rx;
         auto num_values = 25;
         new random_u32(tx, 1, 100, num_values);
         new random_taker(rx, num_values);
+    }
     ").expect("compilation");
-    let rt = Runtime::new(1, true, pd).unwrap();
+    let rt = Runtime::new(1, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_tcp_socket_http_request() {
     let _pd = ProtocolDescription::parse(b"
@@ @@ -384,9 +384,9 @@ fn test_sending_receiving_union() { @@
         channel cmd_tx -> cmd_rx;
         channel data_tx -> data_rx;
         new database(cmd_rx, data_tx);
         new client(cmd_tx, data_rx, num_rounds);
+    }
     ").expect("compilation");
-    let rt = Runtime::new(1, false, pd).unwrap();
+    let rt = Runtime::new(1, LOG_LEVEL, pd).unwrap();
     create_component(&rt, "", "main", no_args());
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)