Changeset 152610a8 in mainline

Timestamp:

2011-03-29T18:03:51Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ba5beaf

Parents:

1f1cc9d

Message:

Improves read_map() to avoid the need to call the read_ind_block() function.

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_ops.c (modified) (1 diff)
• mfs_read.c (modified) (5 diffs)
• mfs_utils.c (modified) (1 diff)
• mfs_utils.h (modified) (1 diff)

uspace/srv/fs/minixfs/mfs.h

@@ -57 +57 @@
 
 GLOBAL fs_reg_t mfs_reg;
+
+typedef uint32_t bitchunk_t;
 
 typedef enum {

uspace/srv/fs/minixfs/mfs_ops.c

@@ -438 +438 @@
                 if (!d_info) {
                         /*Reached the end of the dentries list*/
-                        goto out;
+                        break;
                 }
 

uspace/srv/fs/minixfs/mfs_read.c

@@ -74 +74 @@
         int r, nr_direct;
         int ptrs_per_block;
-        uint32_t *bi1 = NULL;
-        uint32_t *bi2 = NULL;
+        block_t *bi1;
+        block_t *bi2;
 
         assert(mnode);
@@ -83 +83 @@
         assert(mnode->instance);
 
-        const struct mfs_sb_info *sbi = mnode->instance->sbi;
+        const struct mfs_instance *inst = mnode->instance;
+        const struct mfs_sb_info *sbi = inst->sbi;
         assert(sbi);
 
@@ -111 +112 @@
                 }
 
-                bi1 = (uint32_t *) malloc(sbi->block_size);
-                r = read_ind_block(bi1, mnode->instance, ino_i->i_izone[0],
-                                        fs_version);
+                r = block_get(&bi1, inst->handle, ino_i->i_izone[0],
+                                BLOCK_FLAGS_NONE);
+                if (r != EOK)
+                        goto out;
 
-                if (fs_version == MFS_VERSION_V1)
-                        *b = ((uint16_t *) bi1)[rblock];
-                else
-                        *b = bi1[rblock];
+                if (fs_version == MFS_VERSION_V1) {
+                        uint16_t tmp = ((uint16_t *) bi1->data)[rblock];
+                        *b = conv16(sbi->native, tmp);
+                } else {
+                        uint32_t tmp = ((uint32_t *) bi1->data)[rblock];
+                        *b = conv32(sbi->native, tmp);
+                }
 
-                goto out;
+                goto out_put_1;
         }
 
@@ -133 +138 @@
         }
 
-        bi1 = (uint32_t *) malloc(sbi->block_size);
-        bi2 = (uint32_t *) malloc(sbi->block_size);
-
-        r = read_ind_block(bi1, mnode->instance, ino_i->i_izone[1],
-                                fs_version);
+        r = block_get(&bi1, inst->handle, ino_i->i_izone[1],
+                        BLOCK_FLAGS_NONE);
 
         if (r != EOK)
@@ -150 +152 @@
         /*read the second indirect zone of the chain*/
         if (fs_version == MFS_VERSION_V1) {
-                r = read_ind_block(bi2, mnode->instance,
-                        ((uint16_t *) bi1)[di_block], fs_version);
+                uint16_t *pt16 = bi1->data;
+                uint16_t blk = conv16(sbi->native, pt16[di_block]);
+                r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE);
 
                 if (r != EOK)
-                        goto out;
+                        goto out_put_1;
 
-                *b = ((uint16_t *) bi2)[rblock % ptrs_per_block];
+                pt16 = bi2->data;
+                blk = conv16(sbi->native, pt16[di_block % ptrs_per_block]);
+                *b = blk;
         } else {
-                r = read_ind_block(bi2, mnode->instance,
-                        ((uint32_t *) bi1)[di_block], fs_version);
+                uint32_t *pt32 = bi1->data;
+                uint32_t blk = conv32(sbi->native, pt32[di_block]);
+                r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE);
 
                 if (r != EOK)
-                        goto out;
+                        goto out_put_1;
 
-                *b = bi2[rblock % ptrs_per_block];
+                pt32 = bi2->data;
+                blk = conv32(sbi->native, pt32[di_block % ptrs_per_block]);
+                *b = blk;
         }
         r = EOK;
 
+        block_put(bi2);
+out_put_1:
+        block_put(bi1);
 out:
-        if (bi1)
-                free(bi1);
-        if (bi2)
-                free(bi2);
         return r;
 }

uspace/srv/fs/minixfs/mfs_utils.c

@@ -61 +61 @@
 }
 
-/*
- *Read an indirect block from disk and convert its
- *content to the native endian format.
- */
-int
-read_ind_block(void *data, struct mfs_instance *inst,
-                        uint32_t block, mfs_version_t version)
-{
-        int rc;
-        unsigned i;
-        block_t *b;
-        uint32_t *ptr32;
-        uint16_t *ptr16;
-
-        assert(inst);
-        devmap_handle_t handle = inst->handle;
-        struct mfs_sb_info *sbi = inst->sbi;
-
-        assert(sbi);
-
-        rc = block_get(&b, handle, block, BLOCK_FLAGS_NONE);
-
-        if (rc != EOK)
-                goto out;
-
-        if (version == MFS_VERSION_V1) {
-                uint16_t *p = b->data;
-                ptr16 = data;
-                for (i = 0; i < sbi->block_size / sizeof(uint16_t); ++i)
-                        ptr16[i] = conv16(sbi->native, p[i]);
-        } else {
-                uint32_t *p = b->data;
-                ptr32 = data;
-                for (i = 0; i < sbi->block_size / sizeof(uint32_t); ++i)
-                        ptr32[i] = conv32(sbi->native, p[i]);
-
-        }
-
-        rc = EOK;
-
-out:
-        block_put(b);
-        return rc;
-}
-
 /**
  * @}

uspace/srv/fs/minixfs/mfs_utils.h

@@ -47 +47 @@
 conv64(bool native, uint64_t n);
 
-extern int
-read_ind_block(void *data, struct mfs_instance *inst,
-                uint32_t block, mfs_version_t version);
-
 #endif