Changeset 4d11204 in mainline

Timestamp:

2015-06-06T14:41:16Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0453261, 048cd69

Parents:

87a2f9b

Message:

Protect accesses to fibril_list by fibril_futex.

Location:

uspace/lib/c

Files:

• generic/fibril.c (modified) (5 diffs)
• generic/libc.c (modified) (1 diff)
• generic/thread.c (modified) (1 diff)
• include/fibril.h (modified) (1 diff)

uspace/lib/c/generic/fibril.c

@@ -57 +57 @@
 /**
  * This futex serializes access to ready_list,
- * serialized_list and manager_list.
+ * serialized_list, manager_list and fibril_list.
  */
 static futex_t fibril_futex = FUTEX_INITIALIZER;
@@ -126 +126 @@
         
         fibril->waits_for = NULL;
+
+        futex_lock(&fibril_futex);
         list_append(&fibril->all_link, &fibril_list);
+        futex_unlock(&fibril_futex);
         
         return fibril;
 }
 
-void fibril_teardown(fibril_t *fibril)
-{
+void fibril_teardown(fibril_t *fibril, bool locked)
+{       
+        if (!locked)
+                futex_lock(&fibril_futex);
         list_remove(&fibril->all_link);
+        if (!locked)
+                futex_unlock(&fibril_futex);
         tls_free(fibril->tcb);
         free(fibril);
@@ -208 +215 @@
                                         as_area_destroy(stack);
                                 }
-                                fibril_teardown(srcf->clean_after_me);
+                                fibril_teardown(srcf->clean_after_me, true);
                                 srcf->clean_after_me = NULL;
                         }
@@ -294 +301 @@
             AS_AREA_LATE_RESERVE);
         if (fibril->stack == (void *) -1) {
-                fibril_teardown(fibril);
+                fibril_teardown(fibril, false);
                 return 0;
         }
@@ -321 +328 @@
         
         as_area_destroy(fibril->stack);
-        fibril_teardown(fibril);
+        fibril_teardown(fibril, false);
 }
 

uspace/lib/c/generic/libc.c

@@ -122 +122 @@
                 __stdio_done();
                 task_retval(status);
-                fibril_teardown(__tcb_get()->fibril_data);
+                fibril_teardown(__tcb_get()->fibril_data, false);
         }
         

uspace/lib/c/generic/thread.c

@@ -88 +88 @@
 #endif
         
-        fibril_teardown(fibril);
+        fibril_teardown(fibril, false);
         
         thread_exit(0);

uspace/lib/c/include/fibril.h

@@ -94 +94 @@
 extern void fibril_destroy(fid_t fid);
 extern fibril_t *fibril_setup(void);
-extern void fibril_teardown(fibril_t *f);
+extern void fibril_teardown(fibril_t *f, bool locked);
 extern int fibril_switch(fibril_switch_type_t stype);
 extern void fibril_add_ready(fid_t fid);