Changeset 758f8d5 in mainline for uspace/lib

Timestamp:

2013-09-11T21:53:36Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e1ec5a2

Parents:

1e371cf (diff), 9dbdda9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge the df branch

Location:

uspace/lib

Files:

• c/generic/vfs/vfs.c (modified) (2 diffs)
• c/include/ipc/vfs.h (modified) (2 diffs)
• c/include/sys/statfs.h (added)
• c/include/vfs/vfs.h (modified) (2 diffs)
• fs/libfs.c (modified) (5 diffs)
• fs/libfs.h (modified) (1 diff)

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

@@ -43 +43 @@
 #include <stdio.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -892 +893 @@
 }
 
+int statfs(const char *path, struct statfs *statfs)
+{
+        sysarg_t rc;
+        sysarg_t rc_orig;
+        aid_t req;
+        size_t pa_size;
+        
+        char *pa = absolutize(path, &pa_size);
+        if (!pa)
+                return ENOMEM;
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        req = async_send_0(exch, VFS_IN_STATFS, NULL);
+        rc = async_data_write_start(exch, pa, pa_size);
+        if (rc != EOK) {
+                vfs_exchange_end(exch);
+                free(pa);
+                async_wait_for(req, &rc_orig);
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        rc = async_data_read_start(exch, (void *) statfs, sizeof(struct statfs));
+        if (rc != EOK) {
+                vfs_exchange_end(exch);
+                free(pa);
+                async_wait_for(req, &rc_orig);
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        vfs_exchange_end(exch);
+        free(pa);
+        async_wait_for(req, &rc);
+        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;
 
@@ -98 +99 @@
         VFS_OUT_LOOKUP,
         VFS_OUT_DESTROY,
+        VFS_OUT_STATFS,
         VFS_OUT_LAST
 } vfs_out_request_t;

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

@@ -44 +44 @@
 #include "vfs_mtab.h"
 
+
 enum vfs_change_state_type {
         VFS_PASS_HANDLE
 };
+
 
 extern char *absolutize(const char *, size_t *);
@@ -61 +63 @@
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);
-
 #endif
 

uspace/lib/fs/libfs.c

@@ -45 +45 @@
 #include <mem.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <stdlib.h>
 
@@ -74 +75 @@
 static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
     ipc_call_t *);
+static void libfs_statfs(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 
 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)
@@ -219 +221 @@
 }
 
+static void vfs_out_statfs(ipc_callid_t rid, ipc_call_t *req)
+{
+        libfs_statfs(libfs_ops, reg.fs_handle, rid, req);
+}
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -276 +282 @@
                 case VFS_OUT_SYNC:
                         vfs_out_sync(callid, &call);
+                        break;
+                case VFS_OUT_STATFS:
+                        vfs_out_statfs(callid, &call);
                         break;
                 default:
@@ -825 +834 @@
         
         ops->node_put(fn);
-        
+
+
         async_data_read_finalize(callid, &stat, sizeof(struct stat));
         async_answer_0(rid, EOK);
 }
+
+void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+    ipc_call_t *request)
+{
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        
+        fs_node_t *fn;
+        int rc = ops->node_get(&fn, service_id, index);
+        on_error(rc, answer_and_return(rid, rc));
+        
+        ipc_callid_t callid;
+        size_t size;
+        if ((!async_data_read_receive(&callid, &size)) ||
+            (size != sizeof(struct statfs))) {
+                ops->node_put(fn);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+        
+        struct statfs statfs;
+        memset(&statfs, 0, sizeof(struct statfs));
+
+        if (NULL != ops->size_block) {  
+                rc = ops->size_block(service_id, &statfs.f_bsize);
+                if (rc != EOK) goto error;
+        }
+
+        if (NULL != ops->total_block_count) {
+                rc = ops->total_block_count(service_id, &statfs.f_blocks);
+                if (rc != EOK) goto error;
+        }
+
+        if (NULL != ops->free_block_count) {
+                rc = ops->free_block_count(service_id, &statfs.f_bfree);
+                if (rc != EOK) goto error;
+        }
+
+        ops->node_put(fn);
+        async_data_read_finalize(callid, &statfs, sizeof(struct statfs));
+        async_answer_0(rid, EOK);
+        return;
+
+error:
+        ops->node_put(fn);
+        async_answer_0(callid, EINVAL);
+        async_answer_0(rid, EINVAL);
+}
+
 
 /** Open VFS triplet.

uspace/lib/fs/libfs.h

@@ -93 +93 @@
         bool (* is_file)(fs_node_t *);
         service_id_t (* service_get)(fs_node_t *);
+        int (* size_block)(service_id_t, uint32_t *);
+        int (* total_block_count)(service_id_t, uint64_t *);
+        int (* free_block_count)(service_id_t, uint64_t *);
 } libfs_ops_t;