Changeset 66366470 in mainline

Timestamp:

2013-07-04T18:55:31Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

9dc6083

Parents:

d8b47eca

Message:

Start to implement df command line tool.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/df/Makefile (added)
• uspace/app/df/df.c (added)
• uspace/lib/c/generic/vfs/vfs.c (modified) (1 diff)
• uspace/lib/c/include/ipc/vfs.h (modified) (1 diff)
• uspace/lib/c/include/vfs/vfs.h (modified) (2 diffs)
• uspace/lib/fs/libfs.h (modified) (1 diff)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (3 diffs)
• uspace/srv/vfs/vfs.c (modified) (1 diff)
• uspace/srv/vfs/vfs.h (modified) (1 diff)
• uspace/srv/vfs/vfs_ops.c (modified) (1 diff)

boot/Makefile.common

@@ -202 +202 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo
+        $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/df/df
 
 ifeq ($(CONFIG_PCC),y)

uspace/Makefile

@@ -80 +80 @@
         app/vlaunch \
         app/vterm \
+        app/df \
         srv/clipboard \
         srv/locsrv \

uspace/lib/c/generic/vfs/vfs.c

@@ -892 +892 @@
 }
 
+int statfs(const char *path, struct statfs *buf)
+{
+        sysarg_t rc;
+        //aid_t req;
+
+        if ( NULL == buf )
+                return 1;
+
+        sysarg_t value;
+        async_exch_t *exch = vfs_exchange_begin();      
+        rc = async_req_0_1(exch, VFS_IN_STATFS, &value);
+        if (rc != EOK)
+                goto exit;
+
+        buf->f_bsize = value;
+exit:
+        vfs_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vfs.h

@@ -82 +82 @@
         VFS_IN_WAIT_HANDLE,
         VFS_IN_MTAB_GET,
+        VFS_IN_STATFS
 } vfs_in_request_t;
 

uspace/lib/c/include/vfs/vfs.h

@@ -44 +44 @@
 #include "vfs_mtab.h"
 
+
 enum vfs_change_state_type {
         VFS_PASS_HANDLE
 };
+
+struct statfs { 
+        short   f_type;     /* type of file system  */
+        long    f_bsize;    /* fundamental file system block size */
+        long    f_blocks;   /* total data blocks in file system */
+        long    f_bfree;    /* free blocks in fs */
+};
+
 
 extern char *absolutize(const char *, size_t *);
@@ -61 +70 @@
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);
-
+extern int statfs(const char *path, struct statfs *buf);
 #endif
 

uspace/lib/fs/libfs.h

@@ -93 +93 @@
         bool (* is_file)(fs_node_t *);
         service_id_t (* service_get)(fs_node_t *);
+        unsigned int (* size_block)(fs_node_t *);
 } libfs_ops_t;
 

uspace/srv/fs/mfs/mfs_ops.c

@@ -64 +64 @@
 static int mfs_check_sanity(struct mfs_sb_info *sbi);
 static bool is_power_of_two(uint32_t n);
+static unsigned int mfs_size_block(fs_node_t *fsnode);
 
 static hash_table_t open_nodes;
@@ -84 +85 @@
         .destroy = mfs_destroy_node,
         .has_children = mfs_has_children,
-        .lnkcnt_get = mfs_lnkcnt_get
+        .lnkcnt_get = mfs_lnkcnt_get,
+        .size_block = mfs_size_block
 };
 
@@ -1136 +1138 @@
 }
 
+static unsigned int
+mfs_size_block(fs_node_t *fsnode)
+{
+        if ( NULL == fsnode )
+                return 0;
+        /* Get block size from superblock */
+        return 512;
+}
+
 vfs_out_ops_t mfs_ops = {
         .mounted = mfs_mounted,

uspace/srv/vfs/vfs.c

@@ -130 +130 @@
                         vfs_get_mtab(callid, &call);
                         break;
+                case VFS_IN_STATFS:
+                        vfs_statfs(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/srv/vfs/vfs.h

@@ -222 +222 @@
 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
 extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *);
+extern void vfs_statfs(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/vfs/vfs_ops.c

@@ -1418 +1418 @@
 }
 
+void vfs_statfs(ipc_callid_t rid, ipc_call_t *request)
+{
+        long long reply;
+
+        /* Get information about fs */
+        reply = 512;
+        async_answer_1(rid, EOK, reply);
+}
+
 /**
  * @}