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

Changeset - 435cb6e4699f

Parent rev.

Child rev.

[Not reviewed]

feat-compiler-bin

0 7 0

mh - 3 years ago 2022-02-08 15:11:11
contact@maxhenger.nl

Add (defaultly disabled) flag for debug logging

7 files changed with 27 insertions and 14 deletions:

bin-compiler/src/main.rs

src/runtime2/component/component_pdl.rs

src/runtime2/runtime.rs

src/runtime2/scheduler.rs

src/runtime2/tests/mod.rs

testdata/basic-modules/producer.pdl

testdata/basic/testing.pdl

0 comments (0 inline, 0 general)

bin-compiler/src/main.rs

➞

Show inline comments

@@ @@ -22,12 +22,18 @@ fn main() { @@
             Arg::new("threads")
                 .long("threads")
                 .short('t')
                 .help("number of runtime threads")
                 .default_value("1")
                 .takes_value(true)
+        )
         .arg(
             Arg::new("debug")
                 .long("debug")
                 .short('d')
                 .help("enable debug logging")
         );
     // Retrieve arguments and convert
     let app = app.get_matches();
     let input_files = app.values_of("input");
     if input_files.is_none() {
@@ @@ -48,12 +54,14 @@ fn main() { @@
         Err(err) => {
             println!("ERROR: Failed to parse number of threads\nbecause: {}", err);
             return;
+        }
     };
     let debug_enabled = app.is_present("debug");
     // Add input files to file buffer
     let input_files = input_files.unwrap();
     assert!(input_files.len() > 0); // because arg is required
     let mut builder = rw::ProtocolDescriptionBuilder::new();
     let mut file_buffer = Vec::with_capacity(4096);
@@ @@ -92,13 +100,13 @@ fn main() { @@
     };
     println!("Success");
     // Make sure there is a nameless module with a main component
     print!("Creating main component ... ");
     let runtime = rw::runtime2::Runtime::new(num_threads, protocol_description);
+    let runtime = rw::runtime2::Runtime::new(num_threads, debug_enabled, protocol_description);
     if let Err(err) = runtime.create_component(b"", b"main") {
         use rw::ComponentCreationError as CCE;
         let reason = match err {
             CCE::ModuleDoesntExist => "Input files did not contain a nameless module (that should contain the 'main' component)",
             CCE::DefinitionDoesntExist => "Input files did not contain a component called 'main'",
             CCE::DefinitionNotComponent => "Input file contained a 'main' function, but not a 'main' component",

src/runtime2/component/component_pdl.rs

➞

Show inline comments

@@ @@ -669,13 +669,12 @@ impl CompPDL { @@
                         created_port_info.peer_port_id = peer_pair.created_id;
                         created_port_info.peer_comp_id = reservation.id();
                         todo!("either add 'self peer', or remove that idea from Ctx altogether")
                     },
                     None => {
                         // Peer port remains with creator component.
                         println!("DEBUG: Setting peer for port {:?} of component {:?} to {:?}", created_port_info.self_id, reservation.id(), creator_ctx.id);
                         created_port_info.peer_comp_id = creator_ctx.id;
                         created_ctx.add_peer(pair.created_handle, sched_ctx, creator_ctx.id, None);
+                    }
+                }
             } else {
                 // Peer is a different component. We'll deal with sending the

src/runtime2/runtime.rs

➞

Show inline comments

@@ @@ -155,13 +155,14 @@ impl Drop for CompHandle { @@
 pub struct Runtime {
     pub(crate) inner: Arc<RuntimeInner>,
     threads: Vec<std::thread::JoinHandle<()>>,
+}
 impl Runtime {
     pub fn new(num_threads: u32, protocol_description: ProtocolDescription) -> Runtime {
     // TODO: debug_logging should be removed at some point
     pub fn new(num_threads: u32, debug_logging: bool, protocol_description: ProtocolDescription) -> Runtime {
         assert!(num_threads > 0, "need a thread to perform work");
         let runtime_inner = Arc::new(RuntimeInner {
             protocol: protocol_description,
             components: ComponentStore::new(128),
             work_queue: Mutex::new(VecDeque::with_capacity(128)),
             work_condvar: Condvar::new(),
@@ @@ -170,13 +171,13 @@ impl Runtime { @@
         let mut runtime = Runtime {
             inner: runtime_inner,
             threads: Vec::with_capacity(num_threads as usize),
         };
         for thread_index in 0..num_threads {
             let mut scheduler = Scheduler::new(runtime.inner.clone(), thread_index);
+            let mut scheduler = Scheduler::new(runtime.inner.clone(), thread_index, debug_logging);
             let thread_handle = std::thread::spawn(move || {
                 scheduler.run();
             });
             runtime.threads.push(thread_handle);
+        }

src/runtime2/scheduler.rs

➞

Show inline comments

@@ @@ -5,48 +5,55 @@ use super::component::*; @@
 use super::runtime::*;
 /// Data associated with a scheduler thread
 pub(crate) struct Scheduler {
     runtime: Arc<RuntimeInner>,
     scheduler_id: u32,
     debug_logging: bool,
+}
 pub(crate) struct SchedulerCtx<'a> {
     pub runtime: &'a RuntimeInner,
     pub id: u32,
     pub comp: u32,
     pub logging_enabled: bool,
+}
 impl<'a> SchedulerCtx<'a> {
     pub fn new(runtime: &'a RuntimeInner, id: u32) -> Self {
+    pub fn new(runtime: &'a RuntimeInner, id: u32, logging_enabled: bool) -> Self {
         return Self {
             runtime,
             id,
             comp: 0,
             logging_enabled,
+        }
+    }
     pub(crate) fn log(&self, text: &str) {
         println!("[s:{:02}, c:{:03}] {}", self.id, self.comp, text);
         if self.logging_enabled {
             println!("[s:{:02}, c:{:03}] {}", self.id, self.comp, text);
+        }
+    }
     // TODO: Obviously remove, but useful for testing
     pub(crate) fn log_special(&self, text: &str) {
         println!("[s:{:02}, c:{:03}] *** *** {}", self.id, self.comp, text);
         if self.logging_enabled {
             println!("[s:{:02}, c:{:03}] *** *** {}", self.id, self.comp, text);
+        }
+    }
+}
 impl Scheduler {
     // public interface to thread
     pub fn new(runtime: Arc<RuntimeInner>, scheduler_id: u32) -> Self {
         return Scheduler{ runtime, scheduler_id }
     pub fn new(runtime: Arc<RuntimeInner>, scheduler_id: u32, debug_logging: bool) -> Self {
         return Scheduler{ runtime, scheduler_id, debug_logging }
+    }
     pub fn run(&mut self) {
         let mut scheduler_ctx = SchedulerCtx::new(&*self.runtime, self.scheduler_id);
+        let mut scheduler_ctx = SchedulerCtx::new(&*self.runtime, self.scheduler_id, self.debug_logging);
         'run_loop: loop {
             // Wait until we have something to do (or need to quit)
             let comp_key = self.runtime.take_work();
             if comp_key.is_none() {
                 break 'run_loop;

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -20,13 +20,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, pd);
+    let rt = Runtime::new(1, true, pd);
     for i in 0..20 {
         create_component(&rt, "", "nothing_at_all", no_args());
+    }
+}
@@ @@ -77,9 +77,9 @@ 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, pd);
+    let rt = Runtime::new(3, true, pd);
     create_component(&rt, "", "constructor", no_args());
+}
@@ \ No newline at end of file @@

testdata/basic-modules/producer.pdl

➞

Show inline comments

 #module producer
 primitive producer(out<u32> output) {
     print("P: Going to send a value");
     sync {
         print("P: Going to send a value!");
         put(output, 1337);
         print("P: I just sent a value!");
+    }
     print("P: I am exiting");

testdata/basic/testing.pdl

➞

Show inline comments

@@ @@ -5,13 +5,12 @@ primitive consumer(in<u32> input) { @@
         print("C: I have received a value");
+    }
     print("C: I am now exiting");
+}
 primitive producer(out<u32> output) {
     print("P: Going to send a value");
     sync {
         print("P: Going to send a value!");
         put(output, 1337);
         print("P: I just sent a value!");
+    }
     print("P: I am exiting");

0 comments (0 inline, 0 general)