Changeset 525df28 in mainline

Timestamp:

2010-10-19T19:03:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1fa010c

Parents:

7f122e3

Message:

Record what synchronization primitive the fibril waits for.

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (4 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -65 +65 @@
 void fibril_mutex_lock(fibril_mutex_t *fm)
 {
+        fibril_t *f = (fibril_t *) fibril_get_id();
+
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
@@ -74 +76 @@
                 link_initialize(&wdata.wu_event.link);
                 list_append(&wdata.wu_event.link, &fm->waiters);
+
+                f->waits_for = &fm->oi;
+
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
-                fm->oi.owned_by = (fibril_t *) fibril_get_id();
+                fm->oi.owned_by = f;
                 futex_up(&async_futex);
         }
@@ -102 +107 @@
                 link_t *tmp;
                 awaiter_t *wdp;
+                fibril_t *f;
         
                 assert(!list_empty(&fm->waiters));
@@ -108 +114 @@
                 wdp->active = true;
                 wdp->wu_event.inlist = false;
-                fm->oi.owned_by = (fibril_t *) wdp->fid;
+
+                f = (fibril_t *) wdp->fid;
+                fm->oi.owned_by = f;
+                f->waits_for = NULL;
+
                 list_remove(&wdp->wu_event.link);
                 fibril_add_ready(wdp->fid);