Changeset 852664b9 in mainline

Timestamp:

2015-10-21T09:55:49Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

21f1543

Parents:

b598460a

Message:

Display total free space size.

Location:

uspace

Files:

• app/fdisk/fdisk.c (modified) (3 diffs)
• lib/fdisk/include/fdisk.h (modified) (1 diff)
• lib/fdisk/src/fdisk.c (modified) (2 diffs)

uspace/app/fdisk/fdisk.c

@@ -513 +513 @@
         fdisk_part_info_t pinfo;
         fdisk_cap_t cap;
+        fdisk_cap_t mcap;
         fdisk_dev_flags_t dflags;
         char *sltype = NULL;
         char *sdcap = NULL;
         char *scap = NULL;
+        char *smcap = NULL;
         char *sfstype = NULL;
         char *svcname = NULL;
@@ -646 +648 @@
 
                 part = fdisk_part_next(part);
+        }
+
+        /* Display available space */
+        if ((linfo.flags & lf_can_create_pri) != 0) {
+                rc = fdisk_part_get_max_avail(dev, spc_pri, &mcap);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = fdisk_cap_format(&mcap, &smcap);
+                if (rc != EOK) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                if ((linfo.flags & lf_ext_supp) != 0)
+                        printf("Maximum free primary block: %s\n", smcap);
+                else
+                        printf("Maximum free block: %s\n", smcap);
+
+                free(smcap);
+                smcap = NULL;
+
+                rc = fdisk_part_get_tot_avail(dev, spc_pri, &mcap);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = fdisk_cap_format(&mcap, &smcap);
+                if (rc != EOK) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                if ((linfo.flags & lf_ext_supp) != 0)
+                        printf("Total free primary space: %s\n", smcap);
+                else
+                        printf("Total free space: %s\n", smcap);
+
+                free(smcap);
+                smcap = NULL;
+        }
+
+        /* Display available space */
+        if ((linfo.flags & lf_can_create_log) != 0) {
+                rc = fdisk_part_get_max_avail(dev, spc_log, &mcap);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = fdisk_cap_format(&mcap, &smcap);
+                if (rc != EOK) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                printf("Maximum free logical block: %s\n", smcap);
+                free(smcap);
+                smcap = NULL;
+
+                rc = fdisk_part_get_tot_avail(dev, spc_log, &mcap);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = fdisk_cap_format(&mcap, &smcap);
+                if (rc != EOK) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                printf("Total free logical space: %s\n", smcap);
+                free(smcap);
+                smcap = NULL;
         }
 
@@ -785 +865 @@
         free(sdcap);
         free(scap);
+        free(smcap);
         free(sfstype);
         free(svcname);

uspace/lib/fdisk/include/fdisk.h

@@ -65 +65 @@
 extern int fdisk_part_get_info(fdisk_part_t *, fdisk_part_info_t *);
 extern int fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, fdisk_cap_t *);
+extern int fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, fdisk_cap_t *);
 extern int fdisk_part_create(fdisk_dev_t *, fdisk_part_spec_t *,
     fdisk_part_t **);

uspace/lib/fdisk/src/fdisk.c

@@ -763 +763 @@
 }
 
+/** Get size of largest free block. */
 int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, fdisk_cap_t *cap)
 {
@@ -783 +784 @@
 
         cap->value = nb * dev->dinfo.block_size;
+        cap->cunit = cu_byte;
+        return EOK;
+}
+
+/** Get total free space capacity. */
+int fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
+    fdisk_cap_t *cap)
+{
+        fdisk_free_range_t fr;
+        uint64_t hdrb;
+        uint64_t b0;
+        uint64_t nb;
+        uint64_t totb;
+
+        if (spc == spc_log)
+                hdrb = max(1, dev->align);
+        else
+                hdrb = 0;
+
+        totb = 0;
+        fdisk_free_range_first(dev, spc, &fr);
+        do {
+                if (fdisk_free_range_get(&fr, &b0, &nb)) {
+                        if (nb > hdrb)
+                                totb += nb - hdrb;
+                }
+        } while (fdisk_free_range_next(&fr));
+
+        cap->value = totb * dev->dinfo.block_size;
         cap->cunit = cu_byte;
         return EOK;