Changeset 9854a8f in mainline

Timestamp:

2015-10-24T22:06:34Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

03661d19

Parents:

ef9dac04

Message:

Capacity simplification, for display.

Location:

uspace

Files:

• app/fdisk/fdisk.c (modified) (8 diffs)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/imath.c (added)
• lib/c/include/imath.h (added)
• lib/fdisk/Makefile (modified) (1 diff)
• lib/fdisk/include/fdisk.h (modified) (1 diff)
• lib/fdisk/include/types/fdisk.h (modified) (1 diff)
• lib/fdisk/src/cap.c (added)
• lib/fdisk/src/fdisk.c (modified) (9 diffs)

uspace/app/fdisk/fdisk.c

@@ -167 +167 @@
                 }
 
+                fdisk_cap_simplify(&cap);
+
                 rc = fdisk_cap_format(&cap, &scap);
                 if (rc != EOK) {
@@ -518 +520 @@
                         goto error;
                 }
+
+                fdisk_cap_simplify(&pinfo.capacity);
 
                 rc = fdisk_cap_format(&pinfo.capacity, &scap);
@@ -662 +666 @@
         }
 
+        fdisk_cap_simplify(&cap);
+
         rc = fdisk_cap_format(&cap, &sdcap);
         if (rc != EOK) {
@@ -713 +719 @@
                         goto error;
                 }
+
+                fdisk_cap_simplify(&pinfo.capacity);
 
                 rc = fdisk_cap_format(&pinfo.capacity, &scap);
@@ -774 +782 @@
                 }
 
+                fdisk_cap_simplify(&mcap);
+
                 rc = fdisk_cap_format(&mcap, &smcap);
                 if (rc != EOK) {
@@ -794 +804 @@
                 }
 
+                fdisk_cap_simplify(&mcap);
+
                 rc = fdisk_cap_format(&mcap, &smcap);
                 if (rc != EOK) {
@@ -817 +829 @@
                 }
 
+                fdisk_cap_simplify(&mcap);
+
                 rc = fdisk_cap_format(&mcap, &smcap);
                 if (rc != EOK) {
@@ -832 +846 @@
                         goto error;
                 }
+
+                fdisk_cap_simplify(&mcap);
 
                 rc = fdisk_cap_format(&mcap, &smcap);

uspace/lib/c/Makefile

@@ -96 +96 @@
         generic/task.c \
         generic/futex.c \
+        generic/imath.c \
         generic/inet/addr.c \
         generic/inet/endpoint.c \

uspace/lib/fdisk/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        src/cap.c \
         src/fdisk.c
 

uspace/lib/fdisk/include/fdisk.h

@@ -73 +73 @@
 extern int fdisk_cap_format(fdisk_cap_t *, char **);
 extern int fdisk_cap_parse(const char *, fdisk_cap_t *);
+extern void fdisk_cap_simplify(fdisk_cap_t *);
+extern void fdisk_cap_from_blocks(uint64_t, size_t, fdisk_cap_t *);
+extern int fdisk_cap_to_blocks(fdisk_cap_t *, size_t, uint64_t *);
+
 extern int fdisk_ltype_format(label_type_t, char **);
 extern int fdisk_fstype_format(vol_fstype_t, char **);

uspace/lib/fdisk/include/types/fdisk.h

@@ -77 +77 @@
 #define CU_LIMIT (cu_ybyte + 1)
 
-/** Partition capacity */
-typedef struct {
-        uint64_t value;
+/** Partition capacity.
+ *
+ * Partition capacity represents both value and precision.
+ * It is a decimal floating point value combined with a decimal
+ * capacity unit. There is an integer mantisa @c m which in combination
+ * with the number of decimal positions @c dp gives a decimal floating-point
+ * number. E.g. for m = 1025 and dp = 2 the number is 10.25. If the unit
+ * cunit = cu_kbyte, the capacity is 10.25 kByte, i.e. 10 250 bytes.
+ *
+ * Note that 1.000 kByte is equivalent to 1000 Byte, but 1 kByte is less
+ * precise.
+ */
+typedef struct {
+        /** Mantisa */
+        uint64_t m;
+        /** Decimal positions */
+        unsigned dp;
+        /** Capacity unit */
         fdisk_cunit_t cunit;
 } fdisk_cap_t;

uspace/lib/fdisk/src/fdisk.c

@@ -46 +46 @@
 #include <vol.h>
 
-static const char *cu_str[] = {
-        [cu_byte] = "B",
-        [cu_kbyte] = "kB",
-        [cu_mbyte] = "MB",
-        [cu_gbyte] = "GB",
-        [cu_tbyte] = "TB",
-        [cu_pbyte] = "PB",
-        [cu_ebyte] = "EB",
-        [cu_zbyte] = "ZB",
-        [cu_ybyte] = "YB"
-};
-
 static int fdisk_dev_add_parts(fdisk_dev_t *);
 static void fdisk_dev_remove_parts(fdisk_dev_t *);
@@ -257 +245 @@
                 return EIO;
 
-        cap->value = bsize * nblocks;
-        cap->cunit = cu_byte;
-
+        fdisk_cap_from_blocks(nblocks, bsize, cap);
         return EOK;
 }
@@ -330 +316 @@
                 dev->ext_part = part;
 
-        part->capacity.cunit = cu_byte;
-        part->capacity.value = part->nblocks * dev->dinfo.block_size;
+        fdisk_cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+            &part->capacity);
         part->part_id = partid;
 
@@ -619 +605 @@
         block_fini(dev->sid);
 
-        cap->value = bsize * nblocks;
-        cap->cunit = cu_byte;
-
+        fdisk_cap_from_blocks(nblocks, bsize, cap);
         return EOK;
 }
@@ -783 +767 @@
         }
 
-        cap->value = nb * dev->dinfo.block_size;
-        cap->cunit = cu_byte;
+        fdisk_cap_from_blocks(nb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -812 +795 @@
         } while (fdisk_free_range_next(&fr));
 
-        cap->value = totb * dev->dinfo.block_size;
-        cap->cunit = cu_byte;
+        fdisk_cap_from_blocks(totb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -882 +864 @@
 {
         memset(pspec, 0, sizeof(fdisk_part_spec_t));
-}
-
-int fdisk_cap_format(fdisk_cap_t *cap, char **rstr)
-{
-        int rc;
-        const char *sunit;
-
-        sunit = NULL;
-
-        if (cap->cunit < 0 || cap->cunit >= CU_LIMIT)
-                assert(false);
-
-        sunit = cu_str[cap->cunit];
-        rc = asprintf(rstr, "%" PRIu64 " %s", cap->value, sunit);
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
-int fdisk_cap_parse(const char *str, fdisk_cap_t *cap)
-{
-        char *eptr;
-        char *p;
-        unsigned long val;
-        int i;
-
-        val = strtoul(str, &eptr, 10);
-
-        while (*eptr == ' ')
-                ++eptr;
-
-        if (*eptr == '\0') {
-                cap->cunit = cu_byte;
-        } else {
-                for (i = 0; i < CU_LIMIT; i++) {
-                        if (str_lcasecmp(eptr, cu_str[i],
-                            str_length(cu_str[i])) == 0) {
-                                p = eptr + str_size(cu_str[i]);
-                                while (*p == ' ')
-                                        ++p;
-                                if (*p == '\0')
-                                        goto found;
-                        }
-                }
-
-                return EINVAL;
-found:
-                cap->cunit = i;
-        }
-
-        cap->value = val;
-        return EOK;
 }
 
@@ -1108 +1037 @@
     vbd_part_spec_t *vpspec)
 {
-        uint64_t cbytes;
         aoff64_t req_blocks;
         aoff64_t fblock0;
         aoff64_t fnblocks;
         aoff64_t hdrb;
-        uint64_t block_size;
         label_pcnt_t pcnt;
-        unsigned i;
         int index;
         int rc;
@@ -1121 +1047 @@
         printf("fdisk_part_spec_prepare() - dev=%p pspec=%p vpspec=%p\n", dev, pspec,
             vpspec);
-        printf("fdisk_part_spec_prepare() - block size\n");
-        block_size = dev->dinfo.block_size;
-        printf("fdisk_part_spec_prepare() - cbytes\n");
-        cbytes = pspec->capacity.value;
-        printf("fdisk_part_spec_prepare() - cunit\n");
-        for (i = 0; i < pspec->capacity.cunit; i++)
-                cbytes = cbytes * 1000;
-
-        printf("fdisk_part_spec_prepare() - req_blocks block_size=%zu\n",
-            block_size);
-        req_blocks = (cbytes + block_size - 1) / block_size;
+        fdisk_cap_to_blocks(&pspec->capacity, dev->dinfo.block_size, &req_blocks);
+
         req_blocks = fdisk_ba_align_up(dev, req_blocks);