Route app thread orchestration through app core

This commit is contained in:
2026-06-05 07:01:51 +02:00
parent 32c95b224f
commit c50ea14a2a
12 changed files with 749 additions and 64 deletions

View File

@@ -25,6 +25,7 @@
#include "node_panel_animation.h"
#include "layout.h"
#include "app_core/document_session.h"
#include "app_core/app_thread.h"
namespace pp::platform {
class PlatformServices;
@@ -374,21 +375,36 @@ public:
{
AppTask pt(task);
auto f = pt.get_future();
if (is_render_thread())
const auto dispatch = pp::app::plan_app_task_dispatch(
is_render_thread(),
unique,
0U,
render_running,
false,
false);
if (dispatch.execute_immediately)
{
pt();
}
else
else if (dispatch.queue_task)
{
{
std::lock_guard<std::mutex> lock(render_task_mutex);
const auto queue_dispatch = pp::app::plan_app_task_dispatch(
false,
unique,
render_tasklist.size(),
render_running,
false,
false);
// remove any previously queued task from the same lambda
if (unique && !render_tasklist.empty())
if (queue_dispatch.remove_matching_unique_task)
render_tasklist.erase(std::remove_if(render_tasklist.begin(), render_tasklist.end(),
[id = pt.task_id](AppTask const& t){ return t.task_id == id; }), render_tasklist.end());
render_tasklist.push_back(std::move(pt));
}
render_cv.notify_all();
if (dispatch.notify_worker)
render_cv.notify_all();
}
return f;
}
@@ -398,19 +414,27 @@ public:
{
AppTask pt(task);
auto f = pt.get_future();
if (is_render_thread())
const auto dispatch = pp::app::plan_app_task_dispatch(
is_render_thread(),
false,
0U,
render_running,
true,
false);
if (dispatch.execute_immediately)
{
pt();
}
else
else if (dispatch.queue_task)
{
{
std::lock_guard<std::mutex> lock(render_task_mutex);
render_tasklist.push_back(std::move(pt));
}
render_cv.notify_all();
if (dispatch.notify_worker)
render_cv.notify_all();
}
if (render_running)
if (dispatch.wait_for_completion)
f.get();
}
@@ -446,21 +470,36 @@ public:
{
AppTask pt(task);
auto f = pt.get_future();
if (is_ui_thread())
const auto dispatch = pp::app::plan_app_task_dispatch(
is_ui_thread(),
unique,
0U,
ui_running,
false,
false);
if (dispatch.execute_immediately)
{
pt();
}
else
else if (dispatch.queue_task)
{
{
std::lock_guard<std::mutex> lock(ui_task_mutex);
const auto queue_dispatch = pp::app::plan_app_task_dispatch(
false,
unique,
ui_tasklist.size(),
ui_running,
false,
false);
// remove any previously queued task from the same lambda
if (unique && !ui_tasklist.empty())
if (queue_dispatch.remove_matching_unique_task)
ui_tasklist.erase(std::remove_if(ui_tasklist.begin(), ui_tasklist.end(),
[id = pt.task_id](AppTask const& t){ return t.task_id == id; }), ui_tasklist.end());
ui_tasklist.push_back(std::move(pt));
}
ui_cv.notify_all();
if (dispatch.notify_worker)
ui_cv.notify_all();
}
return f;
}
@@ -470,21 +509,30 @@ public:
{
AppTask pt(task);
auto f = pt.get_future();
if (is_ui_thread())
const auto dispatch = pp::app::plan_app_task_dispatch(
is_ui_thread(),
false,
0U,
ui_running,
true,
true);
if (dispatch.execute_immediately)
{
pt();
}
else
else if (dispatch.queue_task)
{
{
std::lock_guard<std::mutex> lock(ui_task_mutex);
ui_tasklist.push_back(std::move(pt));
}
ui_cv.notify_all();
if (dispatch.notify_worker)
ui_cv.notify_all();
}
if (ui_running)
if (dispatch.wait_for_completion)
f.get();
redraw = true;
if (dispatch.request_redraw)
redraw = true;
}
void ui_sync()