bugfix: reused the iterator object. (#13)

* bugfix: reused the iterator object.

Author: membphis

lib/resty/radixtree.lua

@@ -74,10 +74,13 @@ ffi_cdef[[
     int radix_tree_insert(void *t, const unsigned char *buf, size_t len,
         void *data);
     void *radix_tree_find(void *t, const unsigned char *buf, size_t len);
-    void *radix_tree_search(void *t, const unsigned char *buf, size_t len);
+    void *radix_tree_search(void *t, void *it, const unsigned char *buf,
+        size_t len);
     void *radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
     void *radix_tree_next(void *it, const unsigned char *buf, size_t len);
     int radix_tree_stop(void *it);
+
+    void *radix_tree_new_it();
 ]]
 
 
@@ -429,6 +432,13 @@ end
 
 
     local matched_routes = {}
+    local radix_it = radix.radix_tree_new_it()
+    if radix_it == nil then
+        error("failed to new radixtree it")
+    end
+    -- use gc to free
+    ffi.gc(radix_it, ffi.C.free)
+
 local function match_route(self, path, opts)
     clear_tab(matched_routes)
     local routes = self.hash_path[path]
@@ -448,7 +458,7 @@ local function match_route(self, path, opts)
         clear_tab(matched_routes)
     end
 
-    local it = radix.radix_tree_search(self.tree, path, #path)
+    local it = radix.radix_tree_search(self.tree, radix_it, path, #path)
     if not it then
         return nil, "failed to match"
     end

src/easy_rax.c

@@ -55,19 +55,31 @@ radix_tree_find(void *t, const unsigned char *buf, size_t len)
 
 
 void *
-radix_tree_search(void *t, const unsigned char *buf, size_t len)
+radix_tree_new_it()
 {
     raxIterator *it = malloc(sizeof(raxIterator));
     if (it == NULL) {
         return NULL;
     }
 
-    raxStart(it, t);
-    raxSeek(it, "<=", (unsigned char *)buf, len);
     return (void *)it;
 }
 
 
+void *
+radix_tree_search(void *t, void *it, const unsigned char *buf, size_t len)
+{
+    raxIterator *iter = (raxIterator *)it;
+    if (it == NULL) {
+        return NULL;
+    }
+
+    raxStart(iter, t);
+    raxSeek(iter, "<=", (unsigned char *)buf, len);
+    return (void *)iter;
+}
+
+
 void *
 radix_tree_next(void *it, const unsigned char *buf, size_t len)
 {
@@ -117,6 +129,10 @@ radix_tree_pcre(void *it, const unsigned char *buf, size_t len)
 int
 radix_tree_stop(void *it)
 {
+    if (!it) {
+        return 0;
+    }
+
     raxStop(it);
     return 0;
 }

src/easy_rax.h

@@ -34,11 +34,13 @@ int radix_tree_destroy(void *t);
 int radix_tree_insert(void *t, const unsigned char *buf, size_t len,
     void *data);
 void *radix_tree_find(void *t, const unsigned char *buf, size_t len);
-void *radix_tree_search(void *t, const unsigned char *buf, size_t len);
+void *radix_tree_search(void *t, void *it, const unsigned char *buf, size_t len);
 void *radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
 void *radix_tree_next(void *it, const unsigned char *buf, size_t len);
 int radix_tree_stop(void *it);
 
+void *radix_tree_new_it();
+
 #ifdef __cplusplus
 }
 #endif