measure_us! use Instant and duration_to_us internally (solana-labs#30339

)
yu3ver · Feb 15, 2023 · b86bfbb · b86bfbb
1 parent eb6d6e9
commit b86bfbb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/core/src/banking_stage/committer.rs b/core/src/banking_stage/committer.rs
@@ -3,7 +3,7 @@ use {
     solana_ledger::{
         blockstore_processor::TransactionStatusSender, token_balances::collect_token_balances,
     },
-    solana_measure::{measure, measure_us},
+    solana_measure::measure_us,
     solana_runtime::{
         accounts::TransactionLoadResult,
         bank::{

diff --git a/core/src/banking_stage/packet_receiver.rs b/core/src/banking_stage/packet_receiver.rs
@@ -9,7 +9,7 @@ use {
         unprocessed_transaction_storage::UnprocessedTransactionStorage,
     },
     crossbeam_channel::RecvTimeoutError,
-    solana_measure::{measure, measure::Measure, measure_us},
+    solana_measure::{measure::Measure, measure_us},
     solana_sdk::{saturating_add_assign, timing::timestamp},
     std::{sync::atomic::Ordering, time::Duration},
 };

diff --git a/measure/src/macros.rs b/measure/src/macros.rs
@@ -83,8 +83,9 @@ macro_rules! measure {
 #[macro_export]
 macro_rules! measure_us {
     ($val:expr) => {{
-        let (result, measure) = measure!($val);
-        (result, measure.as_us())
+        let start = std::time::Instant::now();
+        let result = $val;
+        (result, solana_sdk::timing::duration_as_us(&start.elapsed()))
     }};
 }
 

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -68,7 +68,7 @@ use {
     rand::{thread_rng, Rng},
     rayon::{prelude::*, ThreadPool},
     serde::{Deserialize, Serialize},
-    solana_measure::{measure, measure::Measure, measure_us},
+    solana_measure::{measure::Measure, measure_us},
     solana_rayon_threadlimit::get_thread_count,
     solana_sdk::{
         account::{Account, AccountSharedData, ReadableAccount, WritableAccount},

diff --git a/runtime/src/ancient_append_vecs.rs b/runtime/src/ancient_append_vecs.rs
@@ -17,7 +17,7 @@ use {
         storable_accounts::{StorableAccounts, StorableAccountsBySlot},
     },
     rand::{thread_rng, Rng},
-    solana_measure::{measure, measure_us},
+    solana_measure::measure_us,
     solana_sdk::{account::ReadableAccount, clock::Slot, hash::Hash, saturating_add_assign},
     std::{
         collections::HashMap,