ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-07 11:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make gems/vfs.h utils fit for use in VFS plugins

Browse Source 
This patch enhances the VFS access utilities of gems/vfs.h to be usable
with a prior created root directory. It also adds a
'File_content::bytes' method for operating of the raw content, which is
needed in situations where the data pointer is passed to a third-party
parser.
This commit is contained in:
Norman Feske 2018-03-26 16:01:08 +02:00 committed by Christian Helmuth
parent 23f07331c8
commit c5066a7317
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
repos/gems/include/gems/vfs.h
View File

@ -91,15 +91,6 @@ struct Genode::Directory : Noncopyable, Interface
friend class Readonly_file; friend class Readonly_file;
friend class Root_directory; friend class Root_directory;
/**
* Constructor used by 'Root_directory'
*
* \throw Open_failed
*/
Directory(Vfs::File_system &fs, Entrypoint &ep, Allocator &alloc)
: _path(""), _fs(fs), _ep(ep), _alloc(alloc)
{ }
/* /*
* Operations such as 'file_size' that are expected to be 'const' at * Operations such as 'file_size' that are expected to be 'const' at
* the API level, do internally require I/O with the outside world, * the API level, do internally require I/O with the outside world,
@ -128,12 +119,21 @@ struct Genode::Directory : Noncopyable, Interface
struct Nonexistent_file : Exception { }; struct Nonexistent_file : Exception { };
struct Nonexistent_directory : Exception { }; struct Nonexistent_directory : Exception { };
/**
* Constructor used by 'Root_directory'
*
* \throw Open_failed
*/
Directory(Vfs::File_system &fs, Entrypoint &ep, Allocator &alloc)
: _path(""), _fs(fs), _ep(ep), _alloc(alloc)
{ }
/** /**
* Open sub directory * Open sub directory
* *
* \throw Nonexistent_directory * \throw Nonexistent_directory
*/ */
Directory(Directory &other, Path const &rel_path) Directory(Directory const &other, Path const &rel_path)
: _path(other._path, "/", rel_path), _fs(other._fs), _ep(other._ep), : _path(other._path, "/", rel_path), _fs(other._fs), _ep(other._ep),
_alloc(other._alloc) _alloc(other._alloc)
{ {
@ -142,7 +142,7 @@ struct Genode::Directory : Noncopyable, Interface
throw Nonexistent_directory(); throw Nonexistent_directory();
} }
~Directory() { _handle->ds().close(_handle); } ~Directory() { if (_handle) _handle->ds().close(_handle); }
template <typename FN> template <typename FN>
void for_each_entry(FN const &fn) void for_each_entry(FN const &fn)
@ -258,7 +258,8 @@ class Genode::Readonly_file : public File
Readonly_file(Readonly_file const &); Readonly_file(Readonly_file const &);
Readonly_file &operator = (Readonly_file const &); Readonly_file &operator = (Readonly_file const &);
Vfs::Vfs_handle *_handle = nullptr; Vfs::Vfs_handle mutable *_handle = nullptr;
Genode::Entrypoint &_ep; Genode::Entrypoint &_ep;
void _open(Vfs::File_system &fs, Allocator &alloc, Path const path) void _open(Vfs::File_system &fs, Allocator &alloc, Path const path)
@ -310,15 +311,19 @@ class Genode::Readonly_file : public File
~Readonly_file() { _handle->ds().close(_handle); } ~Readonly_file() { _handle->ds().close(_handle); }
struct At { Vfs::file_size value; };
/** /**
* Read number of 'bytes' from file into local memory buffer 'dst' * Read number of 'bytes' from file into local memory buffer 'dst'
* *
* \throw Truncated_during_read * \throw Truncated_during_read
*/ */
size_t read(char *dst, size_t bytes) size_t read(At at, char *dst, size_t bytes) const
{ {
Vfs::file_size out_count = 0; Vfs::file_size out_count = 0;
_handle->seek(at.value);
while (!_handle->fs().queue_read(_handle, bytes)) while (!_handle->fs().queue_read(_handle, bytes))
_ep.wait_and_dispatch_one_io_signal(); _ep.wait_and_dispatch_one_io_signal();
@ -343,6 +348,17 @@ class Genode::Readonly_file : public File
return out_count; return out_count;
} }
/**
* Read number of 'bytes' from the start of the file into local memory
* buffer 'dst'
*
* \throw Truncated_during_read
*/
size_t read(char *dst, size_t bytes) const
{
return read(At{0}, dst, bytes);
}
}; };
@ -435,6 +451,12 @@ class Genode::File_content
curr_line_len = 0; curr_line_len = 0;
} }
} }
/**
* Call functor 'fn' with the data pointer and size in bytes
*/
template <typename FN>
void bytes(FN const &fn) const { fn((char const *)_buffer, _size); }
}; };
#endif /* _INCLUDE__GEMS__VFS_H_ */ #endif /* _INCLUDE__GEMS__VFS_H_ */