git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-15 04:24:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: fix the dead lock issue.

Browse source 
fully recovered from the scene clipping multi-tasksing.

@Issue: https://github.com/thorvg/thorvg/issues/1430
This commit is contained in:
Hermet Park 2023-05-08 23:05:24 +09:00 • committed by Hermet Park
parent ac86c522f1
commit 7956a21fc2
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/lib/sw_engine/tvgSwRenderer.cpp
View file

@ -173,8 +173,6 @@ struct SwShapeTask : SwTask
//Clip Path //Clip Path
for (auto clip = clips.data; clip < (clips.data + clips.count); ++clip) { for (auto clip = clips.data; clip < (clips.data + clips.count); ++clip) {
auto clipper = static_cast<SwTask*>(*clip); auto clipper = static_cast<SwTask*>(*clip);
//Guarantee composition targets get ready.
clipper->done(tid);
//Clip shape rle //Clip shape rle
if (shape.rle && !clipper->clip(shape.rle)) goto err; if (shape.rle && !clipper->clip(shape.rle)) goto err;
//Clip stroke rle //Clip stroke rle
@ -225,25 +223,17 @@ struct SwSceneTask : SwTask
if (!sceneRle) sceneRle = static_cast<SwRleData*>(calloc(1, sizeof(SwRleData))); if (!sceneRle) sceneRle = static_cast<SwRleData*>(calloc(1, sizeof(SwRleData)));
else rleReset(sceneRle); else rleReset(sceneRle);
//Only one shape
if (scene.count == 1) {
auto clipper = static_cast<SwTask*>(*scene.data);
clipper->done(tid);
//Merge shapes if it has more than one shapes //Merge shapes if it has more than one shapes
} else { if (scene.count > 1) {
//Merge first two clippers //Merge first two clippers
auto clipper1 = static_cast<SwTask*>(*scene.data); auto clipper1 = static_cast<SwTask*>(*scene.data);
clipper1->done(tid);
auto clipper2 = static_cast<SwTask*>(*(scene.data + 1)); auto clipper2 = static_cast<SwTask*>(*(scene.data + 1));
clipper2->done(tid);
rleMerge(sceneRle, clipper1->rle(), clipper2->rle()); rleMerge(sceneRle, clipper1->rle(), clipper2->rle());
//Unify the remained clippers //Unify the remained clippers
for (auto rd = scene.data + 2; rd < (scene.data + scene.count); ++rd) { for (auto rd = scene.data + 2; rd < (scene.data + scene.count); ++rd) {
auto clipper = static_cast<SwTask*>(*rd); auto clipper = static_cast<SwTask*>(*rd);
clipper->done(tid);
rleMerge(sceneRle, sceneRle, clipper->rle()); rleMerge(sceneRle, sceneRle, clipper->rle());
} }
} }
@ -306,8 +296,6 @@ struct SwImageTask : SwTask
imageDelOutline(&image, mpool, tid); imageDelOutline(&image, mpool, tid);
for (auto clip = clips.data; clip < (clips.data + clips.count); ++clip) { for (auto clip = clips.data; clip < (clips.data + clips.count); ++clip) {
auto clipper = static_cast<SwTask*>(*clip); auto clipper = static_cast<SwTask*>(*clip);
//Guarantee composition targets get ready.
clipper->done(tid);
if (!clipper->clip(image.rle)) goto err; if (!clipper->clip(image.rle)) goto err;
} }
return; return;
@ -694,6 +682,13 @@ void* SwRenderer::prepareCommon(SwTask* task, const RenderTransform* transform,
//Finish previous task if it has duplicated request. //Finish previous task if it has duplicated request.
task->done(); task->done();
//TODO: Failed threading them. It would be better if it's possible.
//See: https://github.com/thorvg/thorvg/issues/1409
//Guarantee composition targets get ready.
for (auto clip = clips.data; clip < (clips.data + clips.count); ++clip) {
static_cast<SwTask*>(*clip)->done();
}
task->clips = clips; task->clips = clips;
if (transform) { if (transform) {
@ -744,6 +739,12 @@ RenderData SwRenderer::prepare(const Array<RenderData>& scene, RenderData data,
if (!task) task = new SwSceneTask; if (!task) task = new SwSceneTask;
task->scene = scene; task->scene = scene;
//TODO: Failed threading them. It would be better if it's possible.
//See: https://github.com/thorvg/thorvg/issues/1409
//Guarantee composition targets get ready.
for (auto task = scene.data; task < (scene.data + scene.count); ++task) {
static_cast<SwTask*>(*task)->done();
}
return prepareCommon(task, transform, opacity, clips, flags); return prepareCommon(task, transform, opacity, clips, flags);
} }

2
src/lib/tvgTaskScheduler.h
View file

@ -51,7 +51,7 @@ private:
public: public:
virtual ~Task() = default; virtual ~Task() = default;
void done(unsigned tid = 0) void done()
{ {
if (!pending) return; if (!pending) return;