ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-15 21:58:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VFS: construct file-systems using Vfs::Env object

Browse Source 
Reduce the size and forward compatibility of VFS file-system
constructors by passing an object holding accessors for 'Genode::Env',
'Genode::Allocator', response handlers, and the root file-system.

Fix #2742
This commit is contained in:
Emery Hemingway
2018-04-03 15:59:35 +02:00
committed by Christian Helmuth
parent 810f59b555
commit 82a683eccc
36 changed files with 482 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repos/os/include/vfs/dir_file_system.h
View File

@ -38,14 +38,14 @@ class Vfs::Dir_file_system : public File_system
Dir_file_system(Dir_file_system const &);
Dir_file_system &operator = (Dir_file_system const &);
Vfs::Env &_env;
/**
* This instance is the root of VFS
*
* Additionally, the root has an empty _name.
*/
bool _vfs_root = false;
File_system &_root_dir;
bool const _vfs_root { &_env.root_dir() == this };
struct Dir_vfs_handle : Vfs_handle
{
@ -363,14 +363,11 @@ class Vfs::Dir_file_system : public File_system
public:
Dir_file_system(Genode::Env &env,
Genode::Allocator &alloc,
Dir_file_system(Vfs::Env &env,
Genode::Xml_node node,
Io_response_handler &io_handler,
File_system_factory &fs_factory,
File_system &root_dir)
File_system_factory &fs_factory)
:
_root_dir(root_dir)
_env(env)
{
using namespace Genode;
@ -386,14 +383,13 @@ class Vfs::Dir_file_system : public File_system
/* traverse into <dir> nodes */
if (sub_node.has_type("dir")) {
_append_file_system(new (alloc)
Dir_file_system(env, alloc, sub_node, io_handler,
fs_factory, _root_dir));
_append_file_system(new (_env.alloc())
Dir_file_system(_env, sub_node, fs_factory));
continue;
}
File_system * const fs =
fs_factory.create(env, alloc, sub_node, io_handler, _root_dir);
fs_factory.create(_env, sub_node);
if (fs) {
_append_file_system(fs);
@ -413,20 +409,6 @@ class Vfs::Dir_file_system : public File_system
}
}
/**
* Constructor used for creating the root directory
*/
Dir_file_system(Genode::Env &env,
Genode::Allocator &alloc,
Genode::Xml_node node,
Io_response_handler &io_handler,
File_system_factory &fs_factory)
:
Dir_file_system(env, alloc, node, io_handler, fs_factory, *this)
{
_vfs_root = true;
}
/*********************************
** Directory-service interface **
*********************************/