beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibThreading+Everywhere: Support returning error from BackgroundAction

Browse source 
This patch allows returning an `Error` from the `on_complete` callback
in `BackgroundAction`.

It also adds a custom callback to manage errors returned during its
execution.
This commit is contained in:
Lucas CHOLLET 2022-12-12 23:34:28 +01:00 committed by Linus Groh
parent 664117564a
commit 2693745336
Notes: sideshowbarker 2024-07-17 03:07:45 +09:00 
Author: https://github.com/LucasChollet
Commit: https://github.com/SerenityOS/serenity/commit/2693745336
Pull-request: https://github.com/SerenityOS/serenity/pull/16457
6 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/Assistant/Providers.cpp
View file

@ -144,8 +144,9 @@ void FileProvider::query(DeprecatedString const& query, Function<void(NonnullRef
}
return results;
},
[on_complete = move(on_complete)](auto results) {
[on_complete = move(on_complete)](auto results) -> ErrorOr<void> {
on_complete(move(results));
return {};
});
}
@ -192,8 +193,9 @@ void FileProvider::build_filesystem_cache()
dbgln("Built cache in {} ms", timer.elapsed());
return 0;
},
[this](auto) {
[this](auto) -> ErrorOr<void> {
m_building_cache = false;
return {};
});
}

23
Userland/Applications/CrashReporter/main.cpp
View file

@ -308,26 +308,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
});
return results;
},
[&](auto results) {
// FIXME: Make BackgroundAction propagate ErrorOr values so we can replace these MUSTs with TRYs.
[&](auto results) -> ErrorOr<void> {
for (auto& backtrace : results.thread_backtraces) {
auto container = MUST(backtrace_tab_widget->try_add_tab<GUI::Widget>(backtrace.title));
(void)MUST(container->template try_set_layout<GUI::VerticalBoxLayout>());
auto container = TRY(backtrace_tab_widget->try_add_tab<GUI::Widget>(backtrace.title));
(void)TRY(container->template try_set_layout<GUI::VerticalBoxLayout>());
container->layout()->set_margins(4);
auto backtrace_text_editor = MUST(container->template try_add<GUI::TextEditor>());
auto backtrace_text_editor = TRY(container->template try_add<GUI::TextEditor>());
backtrace_text_editor->set_text(backtrace.text);
backtrace_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly);
backtrace_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
backtrace_text_editor->set_should_hide_unnecessary_scrollbars(true);
full_backtrace.appendff("==== {} ====\n{}\n", backtrace.title, backtrace.text);
TRY(full_backtrace.try_appendff("==== {} ====\n{}\n", backtrace.title, backtrace.text));
}
for (auto& cpu_registers : results.thread_cpu_registers) {
auto container = MUST(cpu_registers_tab_widget->try_add_tab<GUI::Widget>(cpu_registers.title));
(void)MUST(container->template try_set_layout<GUI::VerticalBoxLayout>());
auto container = TRY(cpu_registers_tab_widget->try_add_tab<GUI::Widget>(cpu_registers.title));
(void)TRY(container->template try_set_layout<GUI::VerticalBoxLayout>());
container->layout()->set_margins(4);
auto cpu_registers_text_editor = MUST(container->template try_add<GUI::TextEditor>());
auto cpu_registers_text_editor = TRY(container->template try_add<GUI::TextEditor>());
cpu_registers_text_editor->set_text(cpu_registers.text);
cpu_registers_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly);
cpu_registers_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
@ -339,6 +337,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
save_backtrace_button.set_enabled(true);
window->resize(window->width(), max(340, window->height()));
window->set_progress(0);
return {};
},
[window](Error error) {
dbgln("Error while parsing the coredump: {}", error);
window->close();
});
window->show();

6
Userland/Applications/DisplaySettings/MonitorWidget.cpp
View file

@ -37,17 +37,19 @@ bool MonitorWidget::set_wallpaper(DeprecatedString path)
return Gfx::Bitmap::try_load_from_file(path);
},
[this, path](ErrorOr<NonnullRefPtr<Gfx::Bitmap>> bitmap_or_error) {
[this, path](ErrorOr<NonnullRefPtr<Gfx::Bitmap>> bitmap_or_error) -> ErrorOr<void> {
// If we've been requested to change while we were loading the bitmap, don't bother spending the cost to
// move and render the now stale bitmap.
if (is_different_to_current_wallpaper_path(path))
return;
return {};
if (bitmap_or_error.is_error())
m_wallpaper_bitmap = nullptr;
else
m_wallpaper_bitmap = bitmap_or_error.release_value();
m_desktop_dirty = true;
update();
return bitmap_or_error.is_error() ? bitmap_or_error.release_error() : ErrorOr<void> {};
});
if (path.is_empty())

5
Userland/Applications/SystemMonitor/ThreadStackWidget.cpp
View file

@ -120,10 +120,11 @@ void ThreadStackWidget::refresh()
return Symbolication::symbolicate_thread(pid, tid, Symbolication::IncludeSourcePosition::No);
},
[weak_this = make_weak_ptr()](auto result) {
[weak_this = make_weak_ptr()](auto result) -> ErrorOr<void> {
if (!weak_this)
return;
return {};
Core::EventLoop::current().post_event(const_cast<Core::Object&>(*weak_this), make<CompletionEvent>(move(result)));
return {};
});
}

5
Userland/Libraries/LibGUI/FileSystemModel.cpp
View file

@ -670,7 +670,7 @@ bool FileSystemModel::fetch_thumbnail_for(Node const& node)
return render_thumbnail(path);
},
[this, path, weak_this](auto thumbnail_or_error) {
[this, path, weak_this](auto thumbnail_or_error) -> ErrorOr<void> {
if (thumbnail_or_error.is_error()) {
s_thumbnail_cache.set(path, nullptr);
dbgln("Failed to load thumbnail for {}: {}", path, thumbnail_or_error.error());
@ -681,7 +681,7 @@ bool FileSystemModel::fetch_thumbnail_for(Node const& node)
// The model was destroyed, no need to update
// progress or call any event handlers.
if (weak_this.is_null())
return;
return {};
m_thumbnail_progress++;
if (on_thumbnail_progress)
@ -692,6 +692,7 @@ bool FileSystemModel::fetch_thumbnail_for(Node const& node)
}
did_update(UpdateFlag::DontInvalidateIndices);
return {};
});
return false;

14
Userland/Libraries/LibThreading/BackgroundAction.h
View file

@ -52,16 +52,21 @@ public:
virtual ~BackgroundAction() = default;
private:
BackgroundAction(Function<Result(BackgroundAction&)> action, Function<void(Result)> on_complete)
BackgroundAction(Function<Result(BackgroundAction&)> action, Function<ErrorOr<void>(Result)> on_complete, Optional<Function<void(Error)>> on_error = {})
: Core::Object(&background_thread())
, m_action(move(action))
, m_on_complete(move(on_complete))
{
if (on_error.has_value())
m_on_error = on_error.release_value();
enqueue_work([this, origin_event_loop = &Core::EventLoop::current()] {
m_result = m_action(*this);
if (m_on_complete) {
origin_event_loop->deferred_invoke([this] {
m_on_complete(m_result.release_value());
auto maybe_error = m_on_complete(m_result.release_value());
if (maybe_error.is_error())
m_on_error(maybe_error.release_error());
remove_from_parent();
});
origin_event_loop->wake();
@ -73,7 +78,10 @@ private:
bool m_cancelled { false };
Function<Result(BackgroundAction&)> m_action;
Function<void(Result)> m_on_complete;
Function<ErrorOr<void>(Result)> m_on_complete;
Function<void(Error)> m_on_error = [](Error error) {
dbgln("Error occurred while running a BackgroundAction: {}", error);
};
Optional<Result> m_result;
};