Changeset 3ac5086 in mainline for kernel/generic/src/adt/cht.c

Timestamp:

2012-11-24T02:08:55Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

5d230a30

Parents:

d04e46e

Message:

Fixed kernel futex cleanup: now walks list via correct links and frees items once it is sure cht is not resizing.

File:

• kernel/generic/src/adt/cht.c (modified) (2 diffs)

kernel/generic/src/adt/cht.c

@@ -617 +617 @@
 void cht_destroy(cht_t *h)
 {
+        cht_destroy_unsafe(h);
+        
+        /* You must clear the table of items. Otherwise cht_destroy will leak. */
+        ASSERT(atomic_get(&h->item_cnt) == 0);
+}
+
+/** Destroys a successfully created CHT but does no error checking. */
+void cht_destroy_unsafe(cht_t *h)
+{
         /* Wait for resize to complete. */
         while (0 < atomic_get(&h->resize_reqs)) {
@@ -627 +636 @@
         free(h->b);
         h->b = NULL;
-        
-        /* You must clear the table of items. Otherwise cht_destroy will leak. */
-        ASSERT(atomic_get(&h->item_cnt) == 0);
 }