Changeset 250 for test

Timestamp:

05/05/11 00:00:24 (14 years ago)

Author:

tim

Message:

added key caching
readded SK caching
fixed races and deadlocks

File:

• test/regfi-threadtest.c (modified) (8 diffs)

test/regfi-threadtest.c

@@ -44 +44 @@
 #include "common.c"
 
-
+static bool keysEqual(const REGFI_NK* x, const REGFI_NK* y)
+{
+  return (x != NULL && y != NULL && x->offset == y->offset);
+}
 
 void traverseValueList(REGFI_ITERATOR* iter)
@@ -57 +60 @@
     value = regfi_iterator_cur_value(iter);
     printMsgs(iter->f);
-    regfi_free_record(value);
+    regfi_free_record(iter->f, value);
   }
 }
@@ -70 +73 @@
   bool print_this = true;
 
-  root = cur = regfi_iterator_cur_key(iter);
+  root = regfi_iterator_cur_key(iter);
+  regfi_reference_record(iter->f, root);
+  cur = root;
   regfi_iterator_first_subkey(iter);
   sub = regfi_iterator_cur_subkey(iter);
@@ -85 +90 @@
     if(sub == NULL)
     {
-      if(cur != root)
+      if(!keysEqual(cur,root))
       {
         /* We're done with this sub-tree, going up and hitting other branches. */
-        regfi_free_record(cur);
+        regfi_free_record(iter->f, cur);
+        cur = NULL;
         if(!regfi_iterator_up(iter))
         {
@@ -102 +108 @@
         sk = regfi_fetch_sk(iter->f, cur);
         printMsgs(iter->f);
-        regfi_free_record(sk);
+        regfi_free_record(iter->f, sk);
 
         regfi_iterator_next_subkey(iter);
@@ -113 +119 @@
        * Let's move down and print this first sub-tree out. 
        */
-      regfi_free_record(cur);
+      regfi_free_record(iter->f, cur);
+      cur = NULL;
       if(!regfi_iterator_down(iter))
       {
@@ -122 +129 @@
       cur = regfi_iterator_cur_key(iter);
       printMsgs(iter->f);
-      regfi_free_record(sub);
+      regfi_free_record(iter->f, sub);
 
       regfi_iterator_first_subkey(iter);
@@ -130 +137 @@
     }
     printMsgs(iter->f);
-  } while(!((cur == root) && (sub == NULL)));
-  regfi_free_record(root);
+  } while(!(keysEqual(cur,root) && (sub == NULL)));
+  if(cur != NULL)
+    regfi_free_record(iter->f, cur);
+  regfi_free_record(iter->f, root);
 
   if(print_verbose)