X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a7384053efe345d199440720b437a28e91058ff3..1fe5f5eb5378a47bf0f3451762743c162e40faad:/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 d452d0b..729b5f7 100644 --- a/lunaix-os/kernel/fs/twifs/twifs.c +++ b/lunaix-os/kernel/fs/twifs/twifs.c @@ -8,18 +8,21 @@ * @copyright Copyright (c) 2022 * */ +#include #include #include #include #include +#include #include #include +#include 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; @@ -28,12 +31,14 @@ struct twifs_node* __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)); - 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); @@ -49,14 +54,13 @@ __twifs_new_node(struct twifs_node* parent, 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) { - vsb->dev = 1; vsb->ops.init_inode = __twifs_init_inode; struct v_inode* inode = vfs_i_alloc(vsb); @@ -120,24 +124,24 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode) 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; } - if (!(inode = vfs_i_alloc(inode->sb))) { + if (!(child_inode = vfs_i_alloc(inode->sb))) { 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; - vfs_assign_inode(dnode, inode); + vfs_assign_inode(dnode, child_inode); return 0; } return ENOENT; @@ -155,7 +159,7 @@ __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx) if (counter++ >= dctx->index) { dctx->index = counter; dctx->read_complete_callback( - dctx, pos->name.value, pos->name.len, pos->itype); + dctx, pos->name.value, pos->name.len, vfs_get_dtype(pos->itype)); return 1; } } @@ -185,40 +189,41 @@ twifs_rm_node(struct twifs_node* 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 = __ksprintf_internal(buf, fmt, VFS_NAME_MAXLEN, args); - return twi_node; + return __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFSEQDEV); } 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* -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 = __ksprintf_internal(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 @@ -237,9 +242,46 @@ twifs_init() fs_root = twifs_dir_node(NULL, NULL, 0, 0); } +void +twifs_register_plugins() +{ + int i = 0; + ptr_t init_twifs_plugin_fn; + ldga_foreach(twiplugin_inits, ptr_t, i, init_twifs_plugin_fn) + { + ((void (*)())init_twifs_plugin_fn)(); + } +} + +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); +} + +struct twimap* +twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + + 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, + .read_page = __twifs_fread, .write = __twifs_fwrite, + .write_page = __twifs_fwrite, .readdir = __twifs_iterate_dir }; const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,