fixup! feat: wrapper for ngx_rbtree_t

Author: bavshin-f5

src/core/rbtree.rs

@@ -8,9 +8,8 @@ use core::ptr::{self, NonNull};
 use core::{borrow, mem};
 
 use nginx_sys::{
-    ngx_rbtree_data, ngx_rbtree_delete, ngx_rbtree_init, ngx_rbtree_insert,
-    ngx_rbtree_insert_value, ngx_rbtree_key_t, ngx_rbtree_min, ngx_rbtree_next, ngx_rbtree_node_t,
-    ngx_rbtree_t,
+    ngx_rbt_red, ngx_rbtree_data, ngx_rbtree_delete, ngx_rbtree_init, ngx_rbtree_insert,
+    ngx_rbtree_key_t, ngx_rbtree_min, ngx_rbtree_next, ngx_rbtree_node_t, ngx_rbtree_t,
 };
 
 use crate::allocator::{self, AllocError, Allocator};
@@ -147,29 +146,6 @@ where
         &self.alloc
     }
 
-    /// Attempts to create and initialize a new RbTree with specified allocator.
-    pub fn try_new_in(alloc: A) -> Result<Self, AllocError> {
-        let layout = Layout::new::<ngx_rbtree_node_t>();
-        let sentinel: NonNull<ngx_rbtree_node_t> = alloc.allocate_zeroed(layout)?.cast();
-
-        let mut this = RbTree {
-            tree: unsafe { mem::zeroed() },
-            sentinel,
-            alloc,
-            _ph: Default::default(),
-        };
-
-        unsafe {
-            ngx_rbtree_init(
-                &mut this.tree,
-                this.sentinel.as_ptr(),
-                Some(ngx_rbtree_insert_value),
-            )
-        };
-
-        Ok(this)
-    }
-
     /// Clears the tree, removing all elements.
     pub fn clear(&mut self) {
         let iter = RawIter::new(NonNull::from(&self.tree));
@@ -211,6 +187,23 @@ where
     A: Allocator,
     K: Hash + Ord,
 {
+    /// Attempts to create and initialize a new RbTree with specified allocator.
+    pub fn try_new_in(alloc: A) -> Result<Self, AllocError> {
+        let layout = Layout::new::<ngx_rbtree_node_t>();
+        let sentinel: NonNull<ngx_rbtree_node_t> = alloc.allocate_zeroed(layout)?.cast();
+
+        let mut this = RbTree {
+            tree: unsafe { mem::zeroed() },
+            sentinel,
+            alloc,
+            _ph: Default::default(),
+        };
+
+        unsafe { ngx_rbtree_init(&mut this.tree, this.sentinel.as_ptr(), Some(Self::insert)) };
+
+        Ok(this)
+    }
+
     /// Returns a reference to the value corresponding to the key.
     pub fn get<Q>(&self, key: &Q) -> Option<&V>
     where
@@ -274,6 +267,40 @@ where
         Ok(unsafe { &mut node.as_mut().value })
     }
 
+    unsafe extern "C" fn insert(
+        mut temp: *mut ngx_rbtree_node_t,
+        node: *mut ngx_rbtree_node_t,
+        sentinel: *mut ngx_rbtree_node_t,
+    ) {
+        let n = &mut *ngx_rbtree_data!(node, Node<K, V>, node);
+
+        loop {
+            let t = &mut *ngx_rbtree_data!(temp, Node<K, V>, node);
+            let p = match Ord::cmp(&n.node.key, &t.node.key) {
+                Ordering::Less => &mut t.node.left,
+                Ordering::Greater => &mut t.node.right,
+                Ordering::Equal => match Ord::cmp(&n.key, &t.key) {
+                    Ordering::Less => &mut t.node.left,
+                    Ordering::Greater => &mut t.node.right,
+                    // should be handled in try_insert
+                    Ordering::Equal => &mut t.node.right,
+                },
+            };
+
+            if ptr::addr_eq(*p, sentinel) {
+                *p = node;
+                break;
+            }
+
+            temp = *p;
+        }
+
+        n.node.parent = temp;
+        n.node.left = sentinel;
+        n.node.right = sentinel;
+        ngx_rbt_red(node);
+    }
+
     fn lookup<Q>(&self, key: &Q) -> Option<NonNull<Node<K, V>>>
     where
         K: borrow::Borrow<Q>,