Changeset 04d66804 in mainline for kernel/test/cht/cht1.c

Timestamp:

2012-11-20T17:35:55Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

669f3d32

Parents:

0adfc9d

Message:

cht: Expanded cht_insert_unique() to return a duplicate if found.

File:

• kernel/test/cht/cht1.c (modified) (3 diffs)

kernel/test/cht/cht1.c

@@ -124 +124 @@
         set_val(v[4], 2, key[4]);
         set_val(v[5], 3, key[5]);
+        
+        cht_link_t *dup;
                         
-        if (!cht_insert_unique(h, &v[0]->link))
+        if (!cht_insert_unique(h, &v[0]->link, &dup))
                 return "Duplicates in empty";
 
-        if (cht_insert_unique(h, &v[1]->link))
+        if (cht_insert_unique(h, &v[1]->link, &dup))
                 return "Inserted a duplicate";
-
-        if (!cht_insert_unique(h, &v[3]->link))
+        
+        if (dup != &v[0]->link)
+                return "Returned wrong duplicate";
+
+        if (!cht_insert_unique(h, &v[3]->link, &dup))
                 return "Refused non-equal item but with a hash in table.";
         
@@ -138 +143 @@
         
         bool ok = true;
-        ok = ok && cht_insert_unique(h, &v[4]->link);
-        ok = ok && cht_insert_unique(h, &v[5]->link);
+        ok = ok && cht_insert_unique(h, &v[4]->link, &dup);
+        ok = ok && cht_insert_unique(h, &v[5]->link, &dup);
         
         if (!ok)
@@ -398 +403 @@
                                 
                                 if (item_op) {
-                                        if (!cht_insert_unique(work->h, &work->elem[elem_idx].link)) {
+                                        rcu_read_lock();
+                                        cht_link_t *dup;
+                                        if (!cht_insert_unique(work->h, &work->elem[elem_idx].link, 
+                                                &dup)) {
                                                 TPRINTF("Err: already inserted\n");
                                                 work->failed = true;
                                         }
+                                        rcu_read_unlock();
                                 } else {
                                         cht_insert(work->h, &work->elem[elem_idx].link);