0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-04 13:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibCore+Userland: Implement Core::deferred_invoke

Browse source 
Core::deferred_invoke is a way of executing an action after previously
queued events have been processed. It removes the requirement of
having/being a Core::Object subclass in order to defer invocation
through Core::Object::deferred_invoke.

Core::Object::deferred_invoke now delegates to Core::deferred_invoke.
The version with the Object& argument is still present but will be
removed in the following commits.

This commit additionally fixes a new places where the
DeferredInvocationEvent was dispatched to the event loop directly, and
replaces them with the Core::deferred_invoke equivalent.
This commit is contained in:
sin-ack 2021-08-30 10:43:28 +00:00 committed by Ali Mohammad Pur
parent ac24842f48
commit e9121f8b1f
Notes: sideshowbarker 2024-07-18 04:55:10 +09:00 
Author: https://github.com/sin-ack
Commit: https://github.com/SerenityOS/serenity/commit/e9121f8b1f9
Pull-request: https://github.com/SerenityOS/serenity/pull/9683
Reviewed-by: https://github.com/alimpfard
9 changed files with 63 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -793,32 +793,29 @@ void HackStudioWidget::initialize_debugger()
}
dbgln("Debugger stopped at source position: {}:{}", source_position.value().file_path, source_position.value().line_number);
Core::EventLoop::main().post_event(
*window(),
make<Core::DeferredInvocationEvent>(
[this, source_position, &regs](auto&) {
m_current_editor_in_execution = get_editor_of_file(source_position.value().file_path);
if (m_current_editor_in_execution)
m_current_editor_in_execution->editor().set_execution_position(source_position.value().line_number - 1);
m_debug_info_widget->update_state(*Debugger::the().session(), regs);
m_debug_info_widget->set_debug_actions_enabled(true);
m_disassembly_widget->update_state(*Debugger::the().session(), regs);
HackStudioWidget::reveal_action_tab(*m_debug_info_widget);
}));
deferred_invoke([this, source_position, &regs] {
m_current_editor_in_execution = get_editor_of_file(source_position.value().file_path);
if (m_current_editor_in_execution)
m_current_editor_in_execution->editor().set_execution_position(source_position.value().line_number - 1);
m_debug_info_widget->update_state(*Debugger::the().session(), regs);
m_debug_info_widget->set_debug_actions_enabled(true);
m_disassembly_widget->update_state(*Debugger::the().session(), regs);
HackStudioWidget::reveal_action_tab(*m_debug_info_widget);
});
Core::EventLoop::wake();
return Debugger::HasControlPassedToUser::Yes;
},
[this]() {
Core::EventLoop::main().post_event(*window(), make<Core::DeferredInvocationEvent>([this](auto&) {
deferred_invoke([this] {
m_debug_info_widget->set_debug_actions_enabled(false);
if (m_current_editor_in_execution)
m_current_editor_in_execution->editor().clear_execution_position();
}));
});
Core::EventLoop::wake();
},
[this]() {
Core::EventLoop::main().post_event(*window(), make<Core::DeferredInvocationEvent>([this](auto&) {
deferred_invoke([this] {
m_debug_info_widget->set_debug_actions_enabled(false);
if (m_current_editor_in_execution)
m_current_editor_in_execution->editor().clear_execution_position();
@ -834,7 +831,7 @@ void HackStudioWidget::initialize_debugger()
HackStudioWidget::hide_action_tabs();
GUI::MessageBox::show(window(), "Program Exited", "Debugger", GUI::MessageBox::Type::Information);
}));
});
Core::EventLoop::wake();
});
}

19
Userland/Libraries/LibCore/DeferredInvocationContext.h Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2018-2020, sin-ack <sin-ack@protonmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibCore/Object.h>
namespace Core {
class DeferredInvocationContext final : public Core::Object {
C_OBJECT(DeferredInvocationContext)
private:
DeferredInvocationContext() { }
};
}

7
Userland/Libraries/LibCore/Event.h
View file

@ -10,6 +10,7 @@
#include <AK/String.h>
#include <AK/Types.h>
#include <AK/WeakPtr.h>
#include <LibCore/DeferredInvocationContext.h>
#include <LibCore/Forward.h>
namespace Core {
@ -50,14 +51,16 @@ class DeferredInvocationEvent : public Event {
friend class EventLoop;
public:
DeferredInvocationEvent(Function<void(Object&)> invokee)
DeferredInvocationEvent(NonnullRefPtr<DeferredInvocationContext> context, Function<void()> invokee)
: Event(Event::Type::DeferredInvoke)
, m_context(move(context))
, m_invokee(move(invokee))
{
}
private:
Function<void(Object&)> m_invokee;
NonnullRefPtr<DeferredInvocationContext> m_context;
Function<void()> m_invokee;
};
class TimerEvent final : public Event {

2
Userland/Libraries/LibCore/EventLoop.cpp
View file

@ -394,7 +394,7 @@ void EventLoop::pump(WaitMode mode)
}
} else if (event.type() == Event::Type::DeferredInvoke) {
dbgln_if(DEFERRED_INVOKE_DEBUG, "DeferredInvoke: receiver = {}", *receiver);
static_cast<DeferredInvocationEvent&>(event).m_invokee(*receiver);
static_cast<DeferredInvocationEvent&>(event).m_invokee();
} else {
NonnullRefPtr<Object> protector(*receiver);
receiver->dispatch_event(event);

14
Userland/Libraries/LibCore/EventLoop.h
View file

@ -11,9 +11,12 @@
#include <AK/HashMap.h>
#include <AK/Noncopyable.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/NonnullRefPtr.h>
#include <AK/Time.h>
#include <AK/Vector.h>
#include <AK/WeakPtr.h>
#include <LibCore/DeferredInvocationContext.h>
#include <LibCore/Event.h>
#include <LibCore/Forward.h>
#include <sys/time.h>
#include <sys/types.h>
@ -76,6 +79,12 @@ public:
static bool has_been_instantiated();
void deferred_invoke(Function<void()> invokee)
{
auto context = DeferredInvocationContext::construct();
post_event(context, make<Core::DeferredInvocationEvent>(context, move(invokee)));
}
private:
void wait_for_event(WaitMode);
Optional<Time> get_next_timer_expiration();
@ -106,4 +115,9 @@ private:
NonnullOwnPtr<Private> m_private;
};
inline void deferred_invoke(Function<void()> invokee)
{
EventLoop::current().deferred_invoke(move(invokee));
}
}

1
Userland/Libraries/LibCore/Forward.h
View file

@ -15,6 +15,7 @@ class ConfigFile;
class CustomEvent;
class DateTime;
class DirIterator;
class DeferredInvocationContext;
class ElapsedTimer;
class Event;
class EventLoop;

7
Userland/Libraries/LibCore/Object.cpp
View file

@ -164,7 +164,12 @@ void Object::dump_tree(int indent)
void Object::deferred_invoke(Function<void(Object&)> invokee)
{
Core::EventLoop::current().post_event(*this, make<Core::DeferredInvocationEvent>(move(invokee)));
deferred_invoke([invokee = move(invokee), this] { invokee(*this); });
}
void Object::deferred_invoke(Function<void()> invokee)
{
Core::deferred_invoke([invokee = move(invokee), strong_this = NonnullRefPtr(*this)] { invokee(); });
}
void Object::save_to(JsonObject& json)

1
Userland/Libraries/LibCore/Object.h
View file

@ -130,6 +130,7 @@ public:
void dump_tree(int indent = 0);
void deferred_invoke(Function<void(Object&)>);
void deferred_invoke(Function<void()>);
void save_to(JsonObject&);

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

@ -66,10 +66,10 @@ private:
enqueue_work([this] {
m_result = m_action(*this);
if (m_on_complete) {
Core::EventLoop::current().post_event(*this, make<Core::DeferredInvocationEvent>([this](auto&) {
deferred_invoke([this] {
m_on_complete(m_result.release_value());
this->remove_from_parent();
}));
remove_from_parent();
});
Core::EventLoop::wake();
} else {
this->remove_from_parent();