From 03bc0b967bc0f3be77341b15c037ad8f684a8f10 Mon Sep 17 00:00:00 2001
From: Avi Cohen <avi.cohen@starkware.co>
Date: Sun, 16 Jun 2024 16:19:52 +0300
Subject: [PATCH] chore(concurrency): add log messages to the concurrency
 module

---
 crates/blockifier/src/concurrency/utils.rs        |  8 ++++++++
 crates/blockifier/src/concurrency/worker_logic.rs | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/crates/blockifier/src/concurrency/utils.rs b/crates/blockifier/src/concurrency/utils.rs
index 4ca2b2eb17..a421f3cf67 100644
--- a/crates/blockifier/src/concurrency/utils.rs
+++ b/crates/blockifier/src/concurrency/utils.rs
@@ -8,3 +8,11 @@ pub fn lock_mutex_in_array<T: Debug>(array: &[Mutex<T>], tx_index: TxIndex) -> M
         panic!("Cell of transaction index {} is poisoned. Data: {:?}.", tx_index, *error.get_ref())
     })
 }
+
+#[macro_export]
+macro_rules! debug_thread {
+    ($($arg:tt)*) => {{
+        let thread_id = std::thread::current().id();
+        log::debug!("[{:?}] {}", thread_id, format!($($arg)*));
+    }}
+}
diff --git a/crates/blockifier/src/concurrency/worker_logic.rs b/crates/blockifier/src/concurrency/worker_logic.rs
index 207b002466..f2f2526c13 100644
--- a/crates/blockifier/src/concurrency/worker_logic.rs
+++ b/crates/blockifier/src/concurrency/worker_logic.rs
@@ -17,6 +17,7 @@ use crate::concurrency::utils::lock_mutex_in_array;
 use crate::concurrency::versioned_state::ThreadSafeVersionedState;
 use crate::concurrency::TxIndex;
 use crate::context::BlockContext;
+use crate::debug_thread;
 use crate::execution::execution_utils::stark_felt_to_felt;
 use crate::fee::fee_utils::get_sequencer_balance_keys;
 use crate::state::cached_state::{
@@ -88,6 +89,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
     }
 
     pub fn run(&self) {
+        debug_thread!("Worker started.");
         let mut task = Task::NoTask;
         loop {
             self.commit_while_possible();
@@ -105,9 +107,12 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
 
     fn commit_while_possible(&self) {
         if let Some(mut transaction_committer) = self.scheduler.try_enter_commit_phase() {
+            // log_debug_thread!("Entered commit phase.");
             while let Some(tx_index) = transaction_committer.try_commit() {
+                debug_thread!("Committing transaction index {}.", tx_index);
                 let commit_succeeded = self.commit_tx(tx_index);
                 if !commit_succeeded {
+                    debug_thread!("No room for transaction index {}. Halting scheduler.", tx_index,);
                     transaction_committer.halt_scheduler();
                 }
             }
@@ -115,7 +120,9 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
     }
 
     fn execute(&self, tx_index: TxIndex) {
+        debug_thread!("Executing transaction index {}.", tx_index);
         self.execute_tx(tx_index);
+        debug_thread!("Finished executing transaction index {}.", tx_index);
         self.scheduler.finish_execution(tx_index)
     }
 
@@ -159,6 +166,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
     }
 
     fn validate(&self, tx_index: TxIndex) -> Task {
+        debug_thread!("Validating transaction index {}.", tx_index);
         let tx_versioned_state = self.state.pin_version(tx_index);
         let execution_output = lock_mutex_in_array(&self.execution_outputs, tx_index);
         let execution_output = execution_output.as_ref().expect(EXECUTION_OUTPUTS_UNWRAP_ERROR);
@@ -167,10 +175,12 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
 
         let aborted = !reads_valid && self.scheduler.try_validation_abort(tx_index);
         if aborted {
+            debug_thread!("Aborted transaction index {}.", tx_index);
             tx_versioned_state
                 .delete_writes(&execution_output.writes, &execution_output.contract_classes);
             self.scheduler.finish_abort(tx_index)
         } else {
+            debug_thread!("Finished validating transaction index {} with no abort.", tx_index);
             Task::NoTask
         }
     }