RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:18:11 +00:00
Code Issues Activity Actions

FileSystemAccessServer: Manage concurrent file requests

Browse source 
Before this patch, when you called FileSystemAccessServer::Client::try_*
twice, the second call used the same variable to store the promise. This
"race condition" is now solved using a HashMap, to store multiple
parallel requests.
This commit is contained in:
Lucas CHOLLET 2022-02-26 17:24:22 +01:00 • committed by Linus Groh
parent e432a284d7
commit 9521952f36
6 changed files with 88 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Userland/Libraries/LibFileSystemAccessClient/Client.cpp
View file

@ -28,8 +28,8 @@ Client& Client::the()
Result Client::try_request_file_read_only_approved(GUI::Window* parent_window, String const& path)
{
m_promise = Core::Promise<Result>::construct();
m_parent_window = parent_window;
auto const id = get_new_id();
m_promises.set(id, PromiseAndWindow { Core::Promise<Result>::construct(), parent_window });
auto parent_window_server_client_id = GUI::ConnectionToWindowServer::the().expose_client_id();
auto child_window_server_client_id = expose_window_server_client_id();
@ -42,19 +42,19 @@ Result Client::try_request_file_read_only_approved(GUI::Window* parent_window, S
});
if (path.starts_with('/')) {
async_request_file_read_only_approved(parent_window_server_client_id, parent_window_id, path);
async_request_file_read_only_approved(id, parent_window_server_client_id, parent_window_id, path);
} else {
auto full_path = LexicalPath::join(Core::File::current_working_directory(), path).string();
async_request_file_read_only_approved(parent_window_server_client_id, parent_window_id, full_path);
async_request_file_read_only_approved(id, parent_window_server_client_id, parent_window_id, full_path);
}
return m_promise->await();
return handle_promise(id);
}
Result Client::try_request_file(GUI::Window* parent_window, String const& path, Core::OpenMode mode)
{
m_promise = Core::Promise<Result>::construct();
m_parent_window = parent_window;
auto const id = get_new_id();
m_promises.set(id, PromiseAndWindow { Core::Promise<Result>::construct(), parent_window });
auto parent_window_server_client_id = GUI::ConnectionToWindowServer::the().expose_client_id();
auto child_window_server_client_id = expose_window_server_client_id();
@ -67,19 +67,19 @@ Result Client::try_request_file(GUI::Window* parent_window, String const& path,
});
if (path.starts_with('/')) {
async_request_file(parent_window_server_client_id, parent_window_id, path, mode);
async_request_file(id, parent_window_server_client_id, parent_window_id, path, mode);
} else {
auto full_path = LexicalPath::join(Core::File::current_working_directory(), path).string();
async_request_file(parent_window_server_client_id, parent_window_id, full_path, mode);
async_request_file(id, parent_window_server_client_id, parent_window_id, full_path, mode);
}
return m_promise->await();
return handle_promise(id);
}
Result Client::try_open_file(GUI::Window* parent_window, String const& window_title, StringView path, Core::OpenMode requested_access)
{
m_promise = Core::Promise<Result>::construct();
m_parent_window = parent_window;
auto const id = get_new_id();
m_promises.set(id, PromiseAndWindow { Core::Promise<Result>::construct(), parent_window });
auto parent_window_server_client_id = GUI::ConnectionToWindowServer::the().expose_client_id();
auto child_window_server_client_id = expose_window_server_client_id();
@ -91,15 +91,15 @@ Result Client::try_open_file(GUI::Window* parent_window, String const& window_ti
GUI::ConnectionToWindowServer::the().async_remove_window_stealing_for_client(child_window_server_client_id, parent_window_id);
});
async_prompt_open_file(parent_window_server_client_id, parent_window_id, window_title, path, requested_access);
async_prompt_open_file(id, parent_window_server_client_id, parent_window_id, window_title, path, requested_access);
return m_promise->await();
return handle_promise(id);
}
Result Client::try_save_file(GUI::Window* parent_window, String const& name, String const ext, Core::OpenMode requested_access)
{
m_promise = Core::Promise<Result>::construct();
m_parent_window = parent_window;
auto const id = get_new_id();
m_promises.set(id, PromiseAndWindow { Core::Promise<Result>::construct(), parent_window });
auto parent_window_server_client_id = GUI::ConnectionToWindowServer::the().expose_client_id();
auto child_window_server_client_id = expose_window_server_client_id();
@ -111,51 +111,69 @@ Result Client::try_save_file(GUI::Window* parent_window, String const& name, Str
GUI::ConnectionToWindowServer::the().async_remove_window_stealing_for_client(child_window_server_client_id, parent_window_id);
});
async_prompt_save_file(parent_window_server_client_id, parent_window_id, name.is_null() ? "Untitled" : name, ext.is_null() ? "txt" : ext, Core::StandardPaths::home_directory(), requested_access);
async_prompt_save_file(id, parent_window_server_client_id, parent_window_id, name.is_null() ? "Untitled" : name, ext.is_null() ? "txt" : ext, Core::StandardPaths::home_directory(), requested_access);
return m_promise->await();
return handle_promise(id);
}
void Client::handle_prompt_end(i32 error, Optional<IPC::File> const& ipc_file, Optional<String> const& chosen_file)
void Client::handle_prompt_end(i32 request_id, i32 error, Optional<IPC::File> const& ipc_file, Optional<String> const& chosen_file)
{
VERIFY(m_promise);
auto potential_data = m_promises.get(request_id);
VERIFY(potential_data.has_value());
auto& request_data = potential_data.value();
if (error != 0) {
// We don't want to show an error message for non-existent files since some applications may want
// to handle it as opening a new, named file.
if (error != -1 && error != ENOENT)
GUI::MessageBox::show_error(m_parent_window, String::formatted("Opening \"{}\" failed: {}", *chosen_file, strerror(error)));
m_promise->resolve(Error::from_errno(error));
GUI::MessageBox::show_error(request_data.parent_window, String::formatted("Opening \"{}\" failed: {}", *chosen_file, strerror(error)));
request_data.promise->resolve(Error::from_errno(error));
return;
}
auto file = Core::File::construct();
auto fd = ipc_file->take_fd();
if (!file->open(fd, Core::OpenMode::ReadWrite, Core::File::ShouldCloseFileDescriptor::Yes) && file->error() != ENOENT) {
GUI::MessageBox::show_error(m_parent_window, String::formatted("Opening \"{}\" failed: {}", *chosen_file, strerror(error)));
m_promise->resolve(Error::from_errno(file->error()));
GUI::MessageBox::show_error(request_data.parent_window, String::formatted("Opening \"{}\" failed: {}", *chosen_file, strerror(error)));
request_data.promise->resolve(Error::from_errno(file->error()));
return;
}
if (file->is_device()) {
GUI::MessageBox::show_error(m_parent_window, String::formatted("Opening \"{}\" failed: Cannot open device files", *chosen_file));
m_promise->resolve(Error::from_string_literal("Cannot open device files"sv));
GUI::MessageBox::show_error(request_data.parent_window, String::formatted("Opening \"{}\" failed: Cannot open device files", *chosen_file));
request_data.promise->resolve(Error::from_string_literal("Cannot open device files"sv));
return;
}
if (file->is_directory()) {
GUI::MessageBox::show_error(m_parent_window, String::formatted("Opening \"{}\" failed: Cannot open directory", *chosen_file));
m_promise->resolve(Error::from_string_literal("Cannot open directory"sv));
GUI::MessageBox::show_error(request_data.parent_window, String::formatted("Opening \"{}\" failed: Cannot open directory", *chosen_file));
request_data.promise->resolve(Error::from_string_literal("Cannot open directory"sv));
return;
}
file->set_filename(move(*chosen_file));
m_promise->resolve(file);
request_data.promise->resolve(file);
}
void Client::die()
{
if (m_promise)
handle_prompt_end(ECONNRESET, {}, "");
for (auto const& entry : m_promises)
handle_prompt_end(entry.key, ECONNRESET, {}, "");
}
int Client::get_new_id()
{
auto const new_id = m_last_id++;
// Note: This verify shouldn't fail, and we should provide a valid ID
// But we probably have more issues if this test fails.
VERIFY(!m_promises.contains(new_id));
return new_id;
}
Result Client::handle_promise(int id)
{
auto result = m_promises.get(id)->promise->await();
m_promises.remove(id);
return result;
}
}