Changeset 52e4f52 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2009-06-23T18:19:56Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

d4b9d28

Parents:

ed990cf

Message:

Use rwlock instead of futex for ramdisk.

File:

• uspace/srv/bd/rd/rd.c (modified) (5 diffs)

uspace/srv/bd/rd/rd.c

@@ -51 +51 @@
 #include <align.h>
 #include <async.h>
-#include <futex.h>
+#include <fibril_sync.h>
 #include <stdio.h>
 #include <devmap.h>
@@ -64 +64 @@
 
 /**
- * This futex protects the ramdisk's data.
+ * This rwlock protects the ramdisk's data.
  * If we were to serve multiple requests (read + write or several writes)
  * concurrently (i.e. from two or more threads), each read and write needs to be
- * protected by this futex.
+ * protected by this rwlock.
  */ 
-atomic_t rd_futex = FUTEX_INITIALIZER;
+fibril_rwlock_t rd_lock;
 
 /** Handle one connection to ramdisk.
@@ -140 +140 @@
                                 break;
                         }
-                        futex_down(&rd_futex);
+                        fibril_rwlock_read_lock(&rd_lock);
                         memcpy(fs_va, rd_addr + offset * block_size, block_size);
-                        futex_up(&rd_futex);
+                        fibril_rwlock_read_unlock(&rd_lock);
                         retval = EOK;
                         break;
@@ -162 +162 @@
                                 break;
                         }
-                        futex_up(&rd_futex);
+                        fibril_rwlock_write_lock(&rd_lock);
                         memcpy(rd_addr + offset * block_size, fs_va, block_size);
-                        futex_down(&rd_futex);
+                        fibril_rwlock_write_unlock(&rd_lock);
                         retval = EOK;
                         break;
@@ -217 +217 @@
                 return false;
         }
+
+        fibril_rwlock_initialize(&rd_lock);
         
         return true;