Changeset 5726a1a3 in mainline

Timestamp:

2011-10-08T12:48:12Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ee6d9dd

Parents:

36cb22f

Message:

mkmfs improvements:

• Be more verbose.
• num_of_set_bits() is not used, replace it with is_power_of_two()

File:

• uspace/app/mkmfs/mkmfs.c (modified) (7 diffs)

uspace/app/mkmfs/mkmfs.c

@@ -84 +84 @@
 
 static void     help_cmd_mkmfs(help_level_t level);
-static int      num_of_set_bits(uint32_t n);
+static bool     is_power_of_two(uint32_t n);
 static int      init_superblock(struct mfs_sb_info *sb);
 static int      write_superblock(const struct mfs_sb_info *sbi);
@@ -172 +172 @@
                 printf(NAME ":Error! Invalid block size.\n");
                 exit(0);
-        } else if (num_of_set_bits(sb.block_size) != 1) {
+        } else if (!is_power_of_two(sb.block_size)) {
                 /*Block size must be a power of 2.*/
                 printf(NAME ":Error! Invalid block size.\n");
@@ -236 +236 @@
 
         printf(NAME ": Creating Minix file system on device\n");
+        printf(NAME ": Writing superblock\n");
 
         /*Initialize superblock*/
@@ -243 +244 @@
         }
 
+        printf(NAME ": Initializing bitmaps\n");
+
         /*Initialize bitmaps*/
         if (init_bitmaps(&sb) != EOK) {
@@ -249 +252 @@
         }
 
+        printf(NAME ": Initializing the inode table\n");
+
         /*Init inode table*/
         if (init_inode_table(&sb) != EOK) {
@@ -254 +259 @@
                 return 2;
         }
+
+        printf(NAME ": Creating the root directory inode\n");
 
         /*Make the root inode*/
@@ -720 +727 @@
 }
 
-static int num_of_set_bits(uint32_t n)
-{
-        n = n - ((n >> 1) & 0x55555555);
-        n = (n & 0x33333333) + ((n >> 2) & 0x33333333);
-        return (((n + (n >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24;
+static bool is_power_of_two(uint32_t n)
+{
+        if (n == 0)
+                return false;
+
+        return (n & (n - 1)) == 0;
 }