fix timer wheel

Author: tickbh

Cargo.lock

@@ -3,7 +3,7 @@ members = ["algorithm-macro"]
 
 [package]
 name = "algorithm"
-version = "0.1.17"
+version = "0.1.18"
 edition = "2021"
 authors = ["tickbh <tickdream125@hotmail.com>"]
 description = "about algorithm data structure, now has ttl with lru/lru-k/lfu/arc and slab/rbtree/roaring_bitmap/timer_wheelss, 关于算法常用的数据结构"
@@ -16,7 +16,7 @@ keywords = ["arc", "lru", "lfu", "timerwheel", "slab"]
 [dependencies]
 lazy_static = "1.5.0"
 hashbrown = "0.15.2"
-log = "0.4.25"
+log = "0.4.26"
 
 [dependencies.algorithm-macro]
 # path = "algorithm-macro"

Cargo.toml

@@ -1,33 +1,49 @@
 use algorithm::TimerWheel;
 
 fn main() {
+    // let mut timer = TimerWheel::new();
+    // timer.append_timer_wheel(60, "SecondWheel");
+    // timer.append_timer_wheel(60, "MinuteWheel");
+    // timer.append_timer_wheel(12, "HourWheel");
+
+    // timer.add_timer(30);
+    // assert_eq!(timer.get_delay_id(), 30);
+    // timer.add_timer(149);
+    // assert_eq!(timer.get_delay_id(), 30);
+    // let t = timer.add_timer(600);
+    // assert_eq!(timer.get_delay_id(), 30);
+    // timer.add_timer(1);
+    // assert_eq!(timer.get_delay_id(), 1);
+    // timer.del_timer(t);
+    // timer.add_timer(150);
+    // assert_eq!(timer.get_delay_id(), 1);
+
+    // let val = timer.update_deltatime(30).unwrap();
+    // assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![1, 30]);
+
+    // timer.add_timer(2);
+
+    // let val = timer.update_deltatime(119).unwrap();
+    // assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![2, 149]);
+
+    // let val = timer.update_deltatime(1).unwrap();
+    // assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![150]);
+    
+    // assert!(timer.is_empty());
+
     let mut timer = TimerWheel::new();
+    timer.set_one_step(5);
+    timer.append_timer_wheel(200, "MillisWheel");
     timer.append_timer_wheel(60, "SecondWheel");
     timer.append_timer_wheel(60, "MinuteWheel");
-    timer.append_timer_wheel(12, "HourWheel");
-
-    timer.add_timer(30);
-    assert_eq!(timer.get_delay_id(), 30);
-    timer.add_timer(149);
-    assert_eq!(timer.get_delay_id(), 30);
-    let t = timer.add_timer(600);
-    assert_eq!(timer.get_delay_id(), 30);
-    timer.add_timer(1);
-    assert_eq!(timer.get_delay_id(), 1);
-    timer.del_timer(t);
-    timer.add_timer(150);
-    assert_eq!(timer.get_delay_id(), 1);
-
-    let val = timer.update_deltatime(30).unwrap();
-    assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![1, 30]);
-
-    timer.add_timer(2);
-
-    let val = timer.update_deltatime(119).unwrap();
-    assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![2, 149]);
-
-    let val = timer.update_deltatime(1).unwrap();
-    assert_eq!(val.iter().map(|(_, v)| *v).collect::<Vec<usize>>(), vec![150]);
+
+    timer.add_timer(1000);
+
+    let val = timer.update_deltatime(2000).unwrap();
+    println!("val = {:?}", val);
+
+    
+    let val = timer.update_deltatime(2000);
+    println!("val = {:?}", val);
 
-    assert!(timer.is_empty());
 }

examples/timer.rs

@@ -1,6 +1,8 @@
 
 mod bitmap;
 mod roaring_bitmap;
+mod ttl_hashmap;
 
 pub use bitmap::BitMap;
-pub use roaring_bitmap::RoaringBitMap;
+pub use roaring_bitmap::RoaringBitMap;
+pub use ttl_hashmap::TtlHashMap;

src/map/mod.rs

@@ -0,0 +1,4 @@
+
+pub struct TtlHashMap {
+    
+}

src/map/ttl_hashmap.rs

@@ -128,13 +128,13 @@ impl<T: Timer> OneTimerWheel<T> {
         if offset > self.capation {
             let index = (self.index + self.num - 1) % self.num;
             self.slots[index as usize].push(entry);
-        } else if offset < self.fix_step && !self.child.is_null() {
+        } else if offset <= self.fix_step && !self.child.is_null() {
             unsafe {
                 (*self.child).add_timer_with_offset(entry, offset);
             }
         } else {
             // 当前偏差值还在自己的容纳范围之前，做容错，排在最后处理位
-            let index = (offset - 1) / self.step;
+            let index = (offset - 1) / self.fix_step;
             let index = (index + self.index) % self.num;
             self.slots[index as usize].push(entry);
         }