ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 05:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rom_to_file: use VFS instead of fs session

Browse Source 
This patch replaces the former direct use of a file-system session by
the use of the VFS API.

Issue #4390
This commit is contained in:
Norman Feske 2022-01-26 17:32:34 +01:00
parent 84f8305cdf
commit 0f56e76e7a
9 changed files with 53 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/libports/run/fs_rom_update_fat.run
View File

@ -93,7 +93,9 @@ append config {
</start>
<start name="rom_to_file">
<resource name="RAM" quantum="2M"/>
<config rom="dynamic_rom"/>
<config rom="dynamic_rom">
<vfs> <fs/> </vfs>
</config>
<route>
<service name="ROM" label="dynamic_rom"> <child name="dynamic_rom"/> </service>
<service name="File_system" > <child name="vfs"/> </service>

4
repos/os/recipes/pkg/test-fs_rom_update/runtime
View File

@ -69,7 +69,9 @@
</start>
<start name="rom_to_file">
<resource name="RAM" quantum="2M"/>
<config rom="dynamic_rom"/>
<config rom="dynamic_rom">
<vfs> <fs/> </vfs>
</config>
<route>
<service name="ROM" label="dynamic_rom"> <child name="dynamic_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>

22
repos/os/recipes/pkg/test-fs_rom_update_fs/runtime
View File

@ -4,7 +4,7 @@
<events>
<timeout meaning="failed" sec="20" />
<log meaning="succeeded">&lt;config iteration="4" /></log>
<log meaning="succeeded">&lt;config iteration="4"/></log>
</events>
<content>
@ -63,27 +63,29 @@
<config verbose="yes">
<rom name="dynamic_rom">
<inline description="iteration 1">
<config iteration="1" />
<config iteration="1"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 2">
<config iteration="2" />
<config iteration="2"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 3">
<config iteration="3" />
<config iteration="3"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 4">
<config iteration="4" />
<config iteration="4"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
</rom>
</config>
</start>
<start name="rom_to_file">
<resource name="RAM" quantum="2M"/>
<config rom="dynamic_rom"/>
<config rom="dynamic_rom">
<vfs> <fs/> </vfs>
</config>
<route>
<service name="ROM" label="dynamic_rom"> <child name="dynamic_rom"/> </service>
<service name="File_system" > <child name="vfs_1"/> </service>

22
repos/os/recipes/pkg/test-fs_rom_update_ram/runtime
View File

@ -4,7 +4,7 @@
<events>
<timeout meaning="failed" sec="35" />
<log meaning="succeeded">&lt;config iteration="4" /></log>
<log meaning="succeeded">&lt;config iteration="4"/></log>
</events>
<content>
@ -48,27 +48,29 @@
<config verbose="yes">
<rom name="dynamic_rom">
<inline description="iteration 1">
<config iteration="1" />
<config iteration="1"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 2">
<config iteration="2" />
<config iteration="2"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 3">
<config iteration="3" />
<config iteration="3"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
<inline description="iteration 4">
<config iteration="4" />
<config iteration="4"/>
</inline>
<sleep milliseconds="2000" />
<sleep milliseconds="2000"/>
</rom>
</config>
</start>
<start name="rom_to_file">
<resource name="RAM" quantum="2M"/>
<config rom="dynamic_rom"/>
<config rom="dynamic_rom">
<vfs> <fs/> </vfs>
</config>
<route>
<service name="ROM" label="dynamic_rom"> <child name="dynamic_rom"/> </service>
<service name="File_system" > <child name="vfs"/> </service>

3
repos/os/recipes/src/rom_to_file/used_apis
View File

@ -1,4 +1,3 @@
base
os
file_system
file_system_session
vfs

6
repos/os/run/rom_to_file.run
View File

@ -28,6 +28,7 @@ install_config {
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
@ -53,7 +54,9 @@ install_config {
</start>
<start name="rom_to_file">
<resource name="RAM" quantum="4M"/>
<config rom="test" />
<config rom="test">
<vfs> <fs/> </vfs>
</config>
<route>
<service name="ROM" label="test"> <child name="dynamic_rom"/> </service>
<service name="File_system"> <child name="lx_fs"/> </service>
@ -73,6 +76,7 @@ build_boot_image { core ld.lib.so init timer
rom_to_file
lx_fs
fs_test
vfs.lib.so
}
append qemu_args " -nographic "

4
repos/os/src/app/rom_to_file/README
View File

@ -5,6 +5,8 @@ updates.
The name of the ROM module must be specified via the 'rom' attribute of the
components '<config>' node
! <config rom="pointer"/>
! <config rom="pointer">
! <vfs> <fs/> </vfs>
! </config>
See run/rom_to_file.run for an example.

78
repos/os/src/app/rom_to_file/main.cc
View File

@ -14,17 +14,9 @@
/* Genode includes */
#include <base/component.h>
#include <base/heap.h>
#include <rom_session/connection.h>
#include <base/signal.h>
#include <base/attached_rom_dataspace.h>
#include <util/print_lines.h>
#include <util/reconstructible.h>
#include <base/heap.h>
#include <base/allocator_avl.h>
#include <file_system_session/connection.h>
#include <file_system/util.h>
#include <os/vfs.h>
namespace Rom_to_file {
@ -32,29 +24,21 @@ namespace Rom_to_file {
using namespace Genode;
struct Main;
enum {
BLOCK_SIZE = 512,
QUEUE_SIZE = File_system::Session::TX_QUEUE_SIZE,
TX_BUF_SIZE = BLOCK_SIZE * (QUEUE_SIZE*2 + 1)
};
}
struct Rom_to_file::Main
{
Genode::Env &_env;
Genode::Heap _heap { _env.ram(), _env.rm() };
Env &_env;
Heap _heap { _env.ram(), _env.rm() };
Genode::Attached_rom_dataspace _config_rom { _env, "config" };
Attached_rom_dataspace _config_rom { _env, "config" };
Allocator_avl _alloc { &_heap };
File_system::Connection _fs { _env, _alloc, "", "/", true, TX_BUF_SIZE };
Root_directory _root_dir { _env, _heap, _config_rom.xml().sub_node("vfs") };
Constructible<Attached_rom_dataspace> _rom_ds { };
typedef Genode::String<100> Rom_name;
typedef String<100> Rom_name;
/**
* Name of currently requested ROM module
@ -72,7 +56,7 @@ struct Rom_to_file::Main
Signal_handler<Main> _update_dispatcher {
_env.ep(), *this, &Main::_handle_update };
Main(Genode::Env &env) : _env(env)
Main(Env &env) : _env(env)
{
_config_rom.sigh(_update_dispatcher);
_handle_update();
@ -84,7 +68,7 @@ void Rom_to_file::Main::_handle_update()
{
_config_rom.update();
Genode::Xml_node config = _config_rom.xml();
Xml_node config = _config_rom.xml();
/*
* Query name of ROM module from config
@ -114,53 +98,17 @@ void Rom_to_file::Main::_handle_update()
_rom_ds->update();
if (_rom_ds->valid()) {
using namespace File_system;
char dir_path[] = "/";
const char *file_name = _rom_name.string();
try {
Dir_handle dir_handle = ensure_dir(_fs, dir_path);
Handle_guard dir_guard(_fs, dir_handle);
Constructible<File_handle> handle;
New_file new_file { _root_dir, _rom_name };
try {
handle.construct(_fs.file(dir_handle, file_name, File_system::WRITE_ONLY, true));
} catch (Node_already_exists) {
handle.construct(_fs.file(dir_handle, file_name, File_system::WRITE_ONLY, false));
}
size_t const len = max(strlen(_rom_ds->local_addr<char>()),
_rom_ds->size());
_fs.truncate(*handle, 0);
size_t len = max(strlen(_rom_ds->local_addr<char>()), _rom_ds->size());
size_t written = write(_fs, *handle, _rom_ds->local_addr<void>(), len, 0);
if (written < len) {
warning(written, " of ", len, " bytes have been written");
}
_fs.close(*handle);
} catch (Permission_denied) {
error(Cstring(dir_path), file_name, ": permission denied");
} catch (No_space) {
error("file system out of space");
} catch (Out_of_ram) {
error("server ran out of RAM");
} catch (Out_of_caps) {
error("server ran out of caps");
} catch (Invalid_name) {
error(Cstring(dir_path), file_name, ": invalid path");
} catch (Name_too_long) {
error(Cstring(dir_path), file_name, ": name too long");
new_file.append(_rom_ds->local_addr<char>(), len);
} catch (...) {
error("cannot open file ", Cstring(dir_path), file_name);
error("cannot create file ", _rom_name);
throw;
}
} else {

2
repos/os/src/app/rom_to_file/target.mk
View File

@ -1,3 +1,3 @@
TARGET = rom_to_file
SRC_CC = main.cc
LIBS = base
LIBS = base vfs