* @copyright Copyright (c) 2022
*
*/
+#include <klibc/strfmt.h>
#include <klibc/string.h>
#include <lunaix/clock.h>
#include <lunaix/fs.h>
#include <lunaix/fs/twifs.h>
+#include <lunaix/fs/twimap.h>
#include <lunaix/mm/cake.h>
#include <lunaix/mm/valloc.h>
+#include <lunaix/spike.h>
+
+#include <sys/mm/mempart.h>
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;
__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);
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);
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, MEM_PAGE, fpos);
+}
+
int
__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t 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, MEM_PAGE, fpos);
+}
+
struct twifs_node*
__twifs_get_node(struct twifs_node* parent, struct hstr* name)
{
{
struct twifs_node* twi_node = (struct twifs_node*)inode->data;
- if (!(twi_node->itype & VFS_IFDIR)) {
+ if ((twi_node->itype & F_FILE)) {
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;
}
- 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;
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;
}
}
int
twifs_rm_node(struct twifs_node* node)
{
- if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) {
+ if (!(node->itype & F_FILE) && !llist_empty(&node->children)) {
return ENOTEMPTY;
}
llist_delete(&node->siblings);
}
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*
-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 = 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
fs_root = twifs_dir_node(NULL, NULL, 0, 0);
}
+EXPORT_FILE_SYSTEM(twifs, twifs_init);
+
+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);
+}
+
+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_pg,
.write = __twifs_fwrite,
+ .write_page = __twifs_fwrite_pg,
.readdir = __twifs_iterate_dir };
const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,
git://scm.lunaixsky.com / lunaix-os.git / blobdiff