Changeset 3ac5086 in mainline for kernel/generic/include

Timestamp:

2012-11-24T02:08: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:

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.

Location:

kernel/generic/include

Files:

• adt/cht.h (modified) (1 diff)
• proc/task.h (modified) (1 diff)

kernel/generic/include/adt/cht.h

@@ -136 +136 @@
         size_t max_load, bool can_block, cht_ops_t *op);
 extern void cht_destroy(cht_t *h);
+extern void cht_destroy_unsafe(cht_t *h);
 
 extern cht_link_t *cht_find(cht_t *h, void *key);

kernel/generic/include/proc/task.h

@@ -129 +129 @@
         task_arch_t arch;
         
-        /** Serializes access to futex_list (independent of the task spinlock). */
-        mutex_t futex_list_lock;
-        /** List of all futexes accesses by this task. */
-        list_t futex_list;
-        /** CHT mapping virtual addresses of futex variables to futex objects. */
         struct futex_cache {
+                /** CHT mapping virtual addresses of futex variables to futex objects.*/
+                cht_t ht;
+                /** Serializes access to futex_list.*/
+                mutex_t list_lock;
+                /** List of all futexes accesses by this task. */
+                list_t list;
                 work_t destroy_work;
-                cht_t ht;
         } *futexes;