From 0b160f488bda588a2cf6c1690277e86ca2e356cc Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 8 Jun 2020 13:05:39 +0530 Subject: [PATCH] vfs_import: log each copy and the completion of import --- packages/genodelabs/targets.nix | 1 + packages/genodelabs/vfs_import.patch | 33 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 packages/genodelabs/vfs_import.patch diff --git a/packages/genodelabs/targets.nix b/packages/genodelabs/targets.nix index d7bc6c4..183baec 100644 --- a/packages/genodelabs/targets.nix +++ b/packages/genodelabs/targets.nix @@ -65,6 +65,7 @@ with ports; { vfs.outputs = [ "out" "lib" ]; + vfs_import.patches = [ ./vfs_import.patch ]; vfs_jitterentropy.portInputs = [ jitterentropy libc ]; vfs_lwip.portInputs = [ lwip ]; vfs_ttf.portInputs = [ libc stb ]; diff --git a/packages/genodelabs/vfs_import.patch b/packages/genodelabs/vfs_import.patch new file mode 100644 index 0000000..291a1d6 --- /dev/null +++ b/packages/genodelabs/vfs_import.patch @@ -0,0 +1,33 @@ +commit 45eefd57af801b23bee5e7a587f91f888acfca84 +Author: Emery Hemingway +Date: Mon Jun 8 13:02:24 2020 +0530 + + vfs_import: log each copy and the completion of import + +diff --git a/repos/gems/src/lib/vfs/import/plugin.cc b/repos/gems/src/lib/vfs/import/plugin.cc +index 0309346c21..0708563667 100644 +--- a/repos/gems/src/lib/vfs/import/plugin.cc ++++ b/repos/gems/src/lib/vfs/import/plugin.cc +@@ -213,12 +213,14 @@ class Vfs_import::File_system : public Vfs::File_system + switch (e.type()) { + case Dirent_type::TRANSACTIONAL_FILE: + case Dirent_type::CONTINUOUS_FILE: ++ Genode::log("VFS: importing \"", entry_path, "\"…"); + copy_file(env, src, entry_path, alloc, overwrite); + return; + case Dirent_type::DIRECTORY: + copy_dir(env, src, entry_path, alloc, overwrite); + return; + case Dirent_type::SYMLINK: ++ Genode::log("VFS: importing \"", entry_path, "\"…"); + copy_symlink(env, src, entry_path, alloc, overwrite); + return; + case Dirent_type::END: +@@ -238,6 +240,7 @@ class Vfs_import::File_system : public Vfs::File_system + + Root_directory content(env.env(), _heap, config); + copy_dir(env, content, Directory::Path(""), _heap, overwrite); ++ Genode::log("VFS: import complete"); + } + + const char* type() override { return "import"; }