From 543efad9804a61424ed2f1f274b87e3cb420ba8a Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Thu, 22 Aug 2019 15:29:02 +0200
Subject: Added benchmarks for timer code

---
 src/timers/mod.rs   |  5 ++++-
 src/timers/peer.rs  |  8 ++++++++
 src/timers/timer.rs | 37 ++++++++++++++++++++++++++++++++-----
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 src/timers/peer.rs

diff --git a/src/timers/mod.rs b/src/timers/mod.rs
index 0527b0c..0bac45a 100644
--- a/src/timers/mod.rs
+++ b/src/timers/mod.rs
@@ -1 +1,4 @@
-mod timer;
\ No newline at end of file
+mod peer;
+mod timer;
+
+pub use timer::{Timer, Runner};
\ No newline at end of file
diff --git a/src/timers/peer.rs b/src/timers/peer.rs
new file mode 100644
index 0000000..9859e6b
--- /dev/null
+++ b/src/timers/peer.rs
@@ -0,0 +1,8 @@
+use super::timer::Timer;
+
+struct PeerTimers {
+    pub send_keepalive: Timer,
+    pub new_handshake: Timer,
+    pub zero_key_material: Timer,
+    pub persistent_keepalive: Timer,
+}
diff --git a/src/timers/timer.rs b/src/timers/timer.rs
index 484a5c2..5426c79 100644
--- a/src/timers/timer.rs
+++ b/src/timers/timer.rs
@@ -8,6 +8,8 @@ use std::thread;
 use std::time::{Duration, Instant};
 use std::u64;
 
+extern crate test;
+
 type TimerID = u64;
 type TimerKey = (u64, usize);
 type Callback = (Arc<AtomicBool>, Box<dyn Fn() -> () + Send + 'static>);
@@ -29,10 +31,10 @@ pub struct Timer {
     cnt: AtomicUsize,
 }
 
-struct Runner(Arc<RunnerInner>, Option<thread::JoinHandle<()>>);
+pub struct Runner(Arc<RunnerInner>, Option<thread::JoinHandle<()>>);
 
 impl Runner {
-    fn new() -> Self {
+    pub fn new() -> Self {
         let inner = Arc::new(RunnerInner {
             running: AtomicBool::new(true),
             callback: spin::Mutex::new(HashMap::new()),
@@ -50,12 +52,12 @@ impl Runner {
             thread::spawn(move || {
                 let mut next = Instant::now() + ACCURACY;
                 while inner.running.load(Ordering::Acquire) {
-                    // sleep
+                    // sleep for 1 tick
                     let now = Instant::now();
                     if next > now {
                         thread::sleep(next - now);
                     }
-                    next = next + ACCURACY;
+                    next = now + ACCURACY;
 
                     // extract expired events
                     let expired = inner.wheel.lock().expire();
@@ -137,10 +139,35 @@ impl Timer {
 
 impl Drop for Runner {
     fn drop(&mut self) {
-        // stop the callback thread
         self.0.running.store(false, Ordering::SeqCst);
         if let Some(handle) = mem::replace(&mut self.1, None) {
             handle.join().unwrap();
         }
     }
 }
+
+impl Drop for Timer {
+    fn drop(&mut self) {
+        self.stop();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use test::Bencher;
+
+    #[bench]
+    fn bench_reset(b: &mut Bencher) {
+        let runner = Runner::new();
+        let timer = runner.timer(Box::new(|| {}));
+        b.iter(|| timer.reset(Duration::from_millis(1000)));
+    }
+
+    #[bench]
+    fn bench_start(b: &mut Bencher) {
+        let runner = Runner::new();
+        let timer = runner.timer(Box::new(|| {}));
+        b.iter(|| timer.start(Duration::from_millis(1000)));
+    }
+}
-- 
cgit v1.2.3-59-g8ed1b