ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs_rom: retry watching a path element after watching its parent dir 

If a path element cannot be watched because it does not exist yet, the next
available parent directory is watched to detect the creation of the missing
path element. If a missing path element got created just between the failed
watch request for the element and the successful watch request for its parent
directory, the creation of the path element could remain unnoticed.

With this commit, 'fs_rom' tries to watch a path element again if the watch
request for its parent directory was successful.

Fixes #3398
This commit is contained in:
Christian Prochaska 2019-06-06 19:40:40 +02:00 committed by Christian Helmuth
parent a25c656b1a
commit 62232f9a35
1 changed files with 73 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
repos/os/src/server/fs_rom/main.cc
View File

@ -112,6 +112,72 @@ class Fs_rom::Rom_session_component : public Rpc_object<Rom_session>
*/
struct Watch_failed { };
/**
* Watch a path or some parent directory
*
* If the given path or a parent directory could be watched, the
* corresponding watch handle is returned and 'path_watched' returns if
* the watch handle refers to the given path (true) or to a parent
* directory (false). Otherwise, 'Watch_failed' is thrown.
*/
File_system::Watch_handle _open_watch_handle_helper(Path watch_path,
bool &path_watched)
{
try {
File_system::Watch_handle watch_handle = _fs.watch(watch_path.base());
path_watched = true;
return watch_handle;
}
catch (File_system::Lookup_failed) { }
catch (File_system::Unavailable) { }
/* watching the given path failed, try to watch a parent directory */
if (watch_path == "/")
throw Watch_failed();
try {
Path immediate_parent_watch_path { watch_path };
immediate_parent_watch_path.strip_last_element();
bool immediate_parent_watched = false;
File_system::Watch_handle some_parent_watch_handle =
_open_watch_handle_helper(immediate_parent_watch_path,
immediate_parent_watched);
if (immediate_parent_watched) {
/*
* Watching the immediate parent directory succeeded, now
* try to watch the original path again, in case it has
* been created in the meantime.
*/
try {
File_system::Watch_handle watch_handle = _fs.watch(watch_path.base());
_fs.close(some_parent_watch_handle);
path_watched = true;
return watch_handle;
}
catch (File_system::Lookup_failed) { }
catch (File_system::Unavailable) { }
}
/*
* Watching the immediate parent directory or the original path
* again failed, so pass on the received parent watch handle.
*/
path_watched = false;
return some_parent_watch_handle;
} catch (Watch_failed) {
/* None of the parent directories could be watched */
throw;
}
}
/**
* Watch the session ROM file or some parent directory
*/
@ -123,28 +189,15 @@ class Fs_rom::Rom_session_component : public Rpc_object<Rom_session>
Path watch_path(_file_path);
/* track if we can open the file or resort to a parent */
bool at_the_file = true;
_watching_file = false;
try {
while (true) {
try {
_watch_handle.construct(_fs.watch(watch_path.base()));
_watch_elem.construct(
*this, _sessions, Sessions::Id{_watch_handle->value});
_watching_file = at_the_file;
return;
}
catch (File_system::Lookup_failed) { }
catch (File_system::Unavailable) { }
if (watch_path == "/")
throw Watch_failed();
watch_path.strip_last_element();
/* keep looping, but only directories will be opened */
at_the_file = false;
}
Watch_handle watch_handle = _open_watch_handle_helper(watch_path.base(),
_watching_file);
_watch_handle.construct(watch_handle);
_watch_elem.construct(
*this, _sessions, Sessions::Id{_watch_handle->value});
return;
} catch (File_system::Out_of_ram) {
error("not enough RAM to watch '", watch_path, "'");
} catch (File_system::Out_of_caps) {