Changeset 67f63c4 in mainline

Timestamp:

2008-01-08T20:47:39Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

861e7d1

Parents:

7fff5eab

Message:

Make uspace rwlock API naming conventions consistent with kernel rwlock API.

Location:

uspace

Files:

• lib/libc/include/rwlock.h (modified) (1 diff)
• srv/vfs/vfs_mount.c (modified) (4 diffs)
• srv/vfs/vfs_open.c (modified) (3 diffs)
• srv/vfs/vfs_rdwr.c (modified) (3 diffs)

uspace/lib/libc/include/rwlock.h

@@ -49 +49 @@
 
 #define rwlock_initialize(rwlock)       futex_initialize((rwlock), 1)
-#define rwlock_reader_lock(rwlock)      futex_down((rwlock))
-#define rwlock_writer_lock(rwlock)      futex_down((rwlock))
-#define rwlock_reader_unlock(rwlock)    futex_up((rwlock))
-#define rwlock_writer_unlock(rwlock)    futex_up((rwlock))
+#define rwlock_read_lock(rwlock)        futex_down((rwlock))
+#define rwlock_write_lock(rwlock)       futex_down((rwlock))
+#define rwlock_read_unlock(rwlock)      futex_up((rwlock))
+#define rwlock_write_unlock(rwlock)     futex_up((rwlock))
 
 #endif

uspace/srv/vfs/vfs_mount.c

@@ -186 +186 @@
                  * We already have the root FS.
                  */
-                rwlock_writer_lock(&namespace_rwlock);
+                rwlock_write_lock(&namespace_rwlock);
                 rc = vfs_lookup_internal(buf, size, &mp, &mpsz, NULL);
                 if (rc != EOK) {
@@ -192 +192 @@
                          * The lookup failed for some reason.
                          */
-                        rwlock_writer_unlock(&namespace_rwlock);
+                        rwlock_write_unlock(&namespace_rwlock);
                         futex_up(&rootfs_futex);
                         vfs_node_put(mr_node);  /* failed -> drop reference */
@@ -201 +201 @@
                 mp_node = vfs_node_get(&mp, mpsz);
                 if (!mp_node) {
-                        rwlock_writer_unlock(&namespace_rwlock);
+                        rwlock_write_unlock(&namespace_rwlock);
                         futex_up(&rootfs_futex);
                         vfs_node_put(mr_node);  /* failed -> drop reference */
@@ -213 +213 @@
                  * This prevents the mount point from being deleted.
                  */
-                rwlock_writer_unlock(&namespace_rwlock);
+                rwlock_write_unlock(&namespace_rwlock);
         } else {
                 /*

uspace/srv/vfs/vfs_open.c

@@ -94 +94 @@
          * triplet.
          */
-        rwlock_reader_lock(&namespace_rwlock);
+        rwlock_read_lock(&namespace_rwlock);
 
         /*
@@ -103 +103 @@
         rc = vfs_lookup_internal(path, len, &triplet, &size, NULL);
         if (rc) {
-                rwlock_reader_unlock(&namespace_rwlock);
+                rwlock_read_unlock(&namespace_rwlock);
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -115 +115 @@
 
         vfs_node_t *node = vfs_node_get(&triplet, size);
-        rwlock_reader_unlock(&namespace_rwlock);
+        rwlock_read_unlock(&namespace_rwlock);
 
         /*

uspace/srv/vfs/vfs_rdwr.c

@@ -94 +94 @@
          */
         if (read)
-                rwlock_reader_lock(&file->node->contents_rwlock);
+                rwlock_read_lock(&file->node->contents_rwlock);
         else
-                rwlock_writer_lock(&file->node->contents_rwlock);
+                rwlock_write_lock(&file->node->contents_rwlock);
 
         int fs_phone = vfs_grab_phone(file->node->fs_handle);   
@@ -129 +129 @@
          */
         if (read)
-                rwlock_reader_unlock(&file->node->contents_rwlock);
+                rwlock_read_unlock(&file->node->contents_rwlock);
         else {
                 /* Update the cached version of node's size. */
                 file->node->size = IPC_GET_ARG2(answer); 
-                rwlock_writer_unlock(&file->node->contents_rwlock);
+                rwlock_write_unlock(&file->node->contents_rwlock);
         }
 
@@ -197 +197 @@
         }
         if (whence == SEEK_END) {
-                rwlock_reader_lock(&file->node->contents_rwlock);
+                rwlock_read_lock(&file->node->contents_rwlock);
                 size_t size = file->node->size;
-                rwlock_reader_unlock(&file->node->contents_rwlock);
+                rwlock_read_unlock(&file->node->contents_rwlock);
                 if (size + off < size) {
                         futex_up(&file->lock);