Changes in / [32efd86:0578271] in mainline

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -180 +180 @@
 void fibril_rwlock_read_lock(fibril_rwlock_t *frw)
 {
-        fibril_t *f = (fibril_t *) fibril_get_id();
-        
         futex_down(&async_futex);
         if (frw->writers) {
+                fibril_t *f = (fibril_t *) fibril_get_id();
                 awaiter_t wdata;
 
@@ -196 +195 @@
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
-                /* Consider the first reader the owner. */
-                if (frw->readers++ == 0)
-                        frw->oi.owned_by = f;
+                frw->readers++;
                 futex_up(&async_futex);
         }
@@ -232 +229 @@
         assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
-                if (--frw->readers) {
-                        if (frw->oi.owned_by == (fibril_t *) fibril_get_id()) {
-                                /*
-                                 * If this reader firbril was considered the
-                                 * owner of this rwlock, clear the ownership
-                                 * information even if there are still more
-                                 * readers.
-                                 *
-                                 * This is the limitation of the detection
-                                 * mechanism rooted in the fact that tracking
-                                 * all readers would require dynamically
-                                 * allocated memory for keeping linkage info.
-                                 */
-                                frw->oi.owned_by = NULL;
-                        }
+                if (--frw->readers)
                         goto out;
-                }
         } else {
                 frw->writers--;
@@ -283 +265 @@
                         list_remove(&wdp->wu_event.link);
                         fibril_add_ready(wdp->fid);
-                        if (frw->readers++ == 0) {
-                                /* Consider the first reader the owner. */
-                                frw->oi.owned_by = f;
-                        }
+                        frw->readers++;
                         optimize_execution_power();
                 }