Changeset 12956e57 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2009-06-20T19:31:19Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

2dfd9fa

Parents:

ac47b7c2

Message:

Use fibril synchronization in bd drivers. Use per-disk locks.

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (6 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -45 +45 @@
 #include <async.h>
 #include <as.h>
-#include <futex.h>
+#include <fibril_sync.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -57 +57 @@
 
 static dev_handle_t dev_handle;
-static atomic_t dev_futex = FUTEX_INITIALIZER;
+static fibril_mutex_t dev_lock;
 
 static int file_bd_init(const char *fname);
@@ -106 +106 @@
         if (img == NULL)
                 return EINVAL;
+
+        fibril_mutex_initialize(&dev_lock);
 
         return EOK;
@@ -170 +172 @@
         size_t n_rd;
 
-        printf("file_bd_read\n");
-        futex_down(&dev_futex);
-
-        printf("seek\n");
+        fibril_mutex_lock(&dev_lock);
+
         fseek(img, blk_idx * size, SEEK_SET);
-        printf("read\n");
         n_rd = fread(buf, 1, size, img);
-        printf("done\n");
-
-        printf("done\n");
 
         if (ferror(img)) {
-                futex_up(&dev_futex);
+                fibril_mutex_unlock(&dev_lock);
                 return EIO;     /* Read error */
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&dev_lock);
 
         if (n_rd < size) 
@@ -198 +194 @@
         size_t n_wr;
 
-        futex_down(&dev_futex);
+        fibril_mutex_lock(&dev_lock);
 
         fseek(img, blk_idx * size, SEEK_SET);
@@ -204 +200 @@
 
         if (ferror(img) || n_wr < size) {
-                futex_up(&dev_futex);
+                fibril_mutex_unlock(&dev_lock);
                 return EIO;     /* Write error */
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&dev_lock);
 
         return EOK;