Code-base clean-up and refactoring (#47)

[lunaix-os.git] / lunaix-os / kernel / fs / twifs / twifs.c

diff --git a/lunaix-os/kernel/fs/twifs/twifs.c b/lunaix-os/kernel/fs/twifs/twifs.c
index d452d0b876606363388884d3fdac96413cbfdb09..165d0bd0a17070c6099717ec06c3d11cff21a85c 100644 (file)
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -8,18 +8,23 @@
  * @copyright Copyright (c) 2022
  *
  */
  * @copyright Copyright (c) 2022
  *
  */

+#include <klibc/strfmt.h>

 #include <klibc/string.h>
 #include <lunaix/clock.h>
 #include <klibc/string.h>
 #include <lunaix/clock.h>

-#include <lunaix/fs.h>
+#include <lunaix/fs/api.h>

 #include <lunaix/fs/twifs.h>
 #include <lunaix/fs/twifs.h>

+#include <lunaix/fs/twimap.h>

 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>

+#include <lunaix/spike.h>
+
+#include <asm/pagetable.h>

 
 static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 
 
 static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 

-static volatile uint32_t inode_id = 0;
+static volatile u32_t inode_id = 0;

 
 extern const struct v_file_ops twifs_file_ops;
 extern const struct v_inode_ops twifs_inode_ops;
 
 extern const struct v_file_ops twifs_file_ops;
 extern const struct v_inode_ops twifs_inode_ops;


@@ -28,12 +33,14 @@ struct twifs_node*
 __twifs_new_node(struct twifs_node* parent,
                  const char* name,
                  int name_len,
 __twifs_new_node(struct twifs_node* parent,
                  const char* name,
                  int name_len,

-                 uint32_t itype)
+                 u32_t itype)

 {
     struct twifs_node* node = cake_grab(twi_pile);
     memset(node, 0, sizeof(*node));
 
 {
     struct twifs_node* node = cake_grab(twi_pile);
     memset(node, 0, sizeof(*node));
 

-    node->name = HSTR(name, name_len);
+    strncpy(node->name_val, name, VFS_NAME_MAXLEN);
+
+    node->name = HSTR(node->name_val, MIN(name_len, VFS_NAME_MAXLEN));

     node->itype = itype;
     node->ino_id = inode_id++;
     hstr_rehash(&node->name, HSTR_FULL_HASH);
     node->itype = itype;
     node->ino_id = inode_id++;
     hstr_rehash(&node->name, HSTR_FULL_HASH);


@@ -49,14 +56,13 @@ __twifs_new_node(struct twifs_node* parent,
 void
 __twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode)
 {
 void
 __twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode)
 {

-    inode->ops = &twifs_inode_ops;
-    inode->default_fops = &twifs_file_ops;
+    inode->ops = (struct v_inode_ops*)&twifs_inode_ops;
+    inode->default_fops = (struct v_file_ops*)&twifs_file_ops;

 }
 
 int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
 {
 }
 
 int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
 {

-    vsb->dev = 1;

     vsb->ops.init_inode = __twifs_init_inode;
 
     struct v_inode* inode = vfs_i_alloc(vsb);
     vsb->ops.init_inode = __twifs_init_inode;
 
     struct v_inode* inode = vfs_i_alloc(vsb);


@@ -73,6 +79,12 @@ __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
     return 0;
 }
 
     return 0;
 }
 

+int
+__twifs_unmount(struct v_superblock* vsb)
+{
+    return 0;
+}
+

 int
 __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
 int
 __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {


@@ -83,6 +95,12 @@ __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
     return twi_node->ops.write(inode, buffer, len, fpos);
 }
 
     return twi_node->ops.write(inode, buffer, len, fpos);
 }
 

+int
+__twifs_fwrite_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    return __twifs_fwrite(inode, buffer, PAGE_SIZE, fpos);
+}
+

 int
 __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
 int
 __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {


@@ -93,6 +111,12 @@ __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
     return twi_node->ops.read(inode, buffer, len, fpos);
 }
 
     return twi_node->ops.read(inode, buffer, len, fpos);
 }
 

+int
+__twifs_fread_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+    return __twifs_fread(inode, buffer, PAGE_SIZE, fpos);
+}
+

 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 {
 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 {


@@ -114,30 +138,30 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode)
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 

-    if (!(twi_node->itype & VFS_IFDIR)) {
+    if (!check_directory_node(inode)) {

         return ENOTDIR;
     }
 
     struct twifs_node* child_node = __twifs_get_node(twi_node, &dnode->name);
     if (child_node) {
         return ENOTDIR;
     }
 
     struct twifs_node* child_node = __twifs_get_node(twi_node, &dnode->name);
     if (child_node) {

-        struct v_inode* inode = vfs_i_find(inode->sb, child_node->ino_id);
-        if (inode) {
+        struct v_inode* child_inode = vfs_i_find(inode->sb, child_node->ino_id);
+        if (child_inode) {

             goto done;
         }
 
             goto done;
         }
 

-        if (!(inode = vfs_i_alloc(inode->sb))) {
+        if (!(child_inode = vfs_i_alloc(inode->sb))) {

             return ENOENT;
         }
 
             return ENOENT;
         }
 

-        inode->id = child_node->ino_id;
-        inode->itype = child_node->itype;
-        inode->data = child_node;
+        child_inode->id = child_node->ino_id;
+        child_inode->itype = child_node->itype;
+        child_inode->data = child_node;

 
 

-        vfs_i_addhash(inode);
+        vfs_i_addhash(child_inode);

 
     done:
         dnode->data = child_node->data;
 
     done:
         dnode->data = child_node->data;

-        vfs_assign_inode(dnode, inode);
+        vfs_assign_inode(dnode, child_inode);

         return 0;
     }
     return ENOENT;
         return 0;
     }
     return ENOENT;


@@ -147,15 +171,18 @@ int
 __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
 {
     struct twifs_node* twi_node = (struct twifs_node*)(file->inode->data);
 __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
 {
     struct twifs_node* twi_node = (struct twifs_node*)(file->inode->data);

-    int counter = 0;
+    unsigned int counter = 2;

     struct twifs_node *pos, *n;
 
     struct twifs_node *pos, *n;
 

+    if (fsapi_handle_pseudo_dirent(file, dctx)) {
+        return 1;
+    }
+

     llist_for_each(pos, n, &twi_node->children, siblings)
     {
     llist_for_each(pos, n, &twi_node->children, siblings)
     {

-        if (counter++ >= dctx->index) {
-            dctx->index = counter;
-            dctx->read_complete_callback(
-              dctx, pos->name.value, pos->name.len, pos->itype);
+        if (counter++ >= file->f_pos) {
+            fsapi_dir_report(
+              dctx, pos->name.value, pos->name.len, vfs_get_dtype(pos->itype));

             return 1;
         }
     }
             return 1;
         }
     }


@@ -176,7 +203,7 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file)
 int
 twifs_rm_node(struct twifs_node* node)
 {
 int
 twifs_rm_node(struct twifs_node* node)
 {

-    if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) {
+    if (check_itype(node->itype, VFS_IFDIR) && !llist_empty(&node->children)) {

         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);


@@ -185,61 +212,92 @@ twifs_rm_node(struct twifs_node* node)
 }
 
 struct twifs_node*
 }
 
 struct twifs_node*

-twifs_file_node(struct twifs_node* parent,
-                const char* name,
-                int name_len,
-                uint32_t itype)
+twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args)

 {
 {

-    struct twifs_node* twi_node =
-      __twifs_new_node(parent, name, name_len, VFS_IFFILE | itype);
+    char buf[VFS_NAME_MAXLEN];
+    size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args);

 
 

-    return twi_node;
+    return __twifs_new_node(parent ? parent : fs_root, buf, len, F_FILE);

 }
 
 struct twifs_node*
 }
 
 struct twifs_node*

-twifs_dir_node(struct twifs_node* parent,
-               const char* name,
-               int name_len,
-               uint32_t itype)
-{
-    struct hstr hname = HSTR(name, name_len);
-    hstr_rehash(&hname, HSTR_FULL_HASH);
-    struct twifs_node* node = __twifs_get_node(parent, &hname);
-    if (node) {
-        return node;
-    }
+twifs_file_node(struct twifs_node* parent, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);

 
 

-    struct twifs_node* twi_node =
-      __twifs_new_node(parent, name, name_len, VFS_IFDIR | itype);
+    struct twifs_node* twi_node = twifs_file_node_vargs(parent, fmt, args);
+
+    va_end(args);

 
     return twi_node;
 }
 
 struct twifs_node*
 
     return twi_node;
 }
 
 struct twifs_node*

-twifs_toplevel_node(const char* name, int name_len, uint32_t itype)
+twifs_dir_node(struct twifs_node* parent, const char* fmt, ...)

 {
 {

-    return twifs_dir_node(fs_root, name, name_len, itype);
+    va_list args;
+    va_start(args, fmt);
+
+    char buf[VFS_NAME_MAXLEN];
+    size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args);
+    struct twifs_node* twi_node =
+      __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFDIR);
+
+    va_end(args);
+
+    return twi_node;

 }
 
 void
 twifs_init()
 {
 }
 
 void
 twifs_init()
 {

+    struct filesystem* fs;
+    fs = fsapi_fs_declare("twifs", FSTYPE_PSEUDO | FSTYPE_ROFS);
+    
+    fsapi_fs_set_mntops(fs, __twifs_mount, __twifs_unmount);
+    fsapi_fs_finalise(fs);
+

     twi_pile = cake_new_pile("twifs_node", sizeof(struct twifs_node), 1, 0);
     twi_pile = cake_new_pile("twifs_node", sizeof(struct twifs_node), 1, 0);

+    fs_root = twifs_dir_node(NULL, NULL, 0, 0);
+}
+EXPORT_FILE_SYSTEM(twifs, twifs_init);

 
 

-    struct filesystem* twifs = vzalloc(sizeof(struct filesystem));
-    twifs->fs_name = HSTR("twifs", 5);
-    twifs->mount = __twifs_mount;
-    twifs->types = FSTYPE_ROFS;
-    twifs->fs_id = 0;
+void
+twifs_register_plugins()
+{
+    ldga_invoke_fn0(twiplugin_inits);
+}
+
+int
+__twifs_twimap_file_read(struct v_inode* inode,
+                         void* buf,
+                         size_t len,
+                         size_t fpos)
+{
+    struct twimap* map = twinode_getdata(inode, struct twimap*);
+    return twimap_read(map, buf, len, fpos);
+}

 
 

-    fsm_register(twifs);
+struct twimap*
+twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);

 
 

-    fs_root = twifs_dir_node(NULL, NULL, 0, 0);
+    struct twimap* map = twimap_create(data);
+    struct twifs_node* node = twifs_file_node_vargs(parent, fmt, args);
+    node->ops.read = __twifs_twimap_file_read;
+    node->data = map;
+
+    return map;

 }
 
 const struct v_file_ops twifs_file_ops = { .close = default_file_close,
                                            .read = __twifs_fread,
 }
 
 const struct v_file_ops twifs_file_ops = { .close = default_file_close,
                                            .read = __twifs_fread,

+                                           .read_page = __twifs_fread_pg,

                                            .write = __twifs_fwrite,
                                            .write = __twifs_fwrite,

+                                           .write_page = __twifs_fwrite_pg,

                                            .readdir = __twifs_iterate_dir };
 
 const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,
                                            .readdir = __twifs_iterate_dir };
 
 const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,