maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mRestart flag to immediately request the thread exits to force a commit frame

Browse Source
This commit is contained in:
Nick Fisher
2025-06-23 12:42:53 +08:00
parent c81f2f225c
commit a8a7f11d44
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
thermion_dart/native/src/rendering/RenderThread.cpp
View File

@@ -27,24 +27,20 @@ static void mainLoop(void* arg) {
auto startTime = std::chrono::high_resolution_clock::now(); auto startTime = std::chrono::high_resolution_clock::now();
auto timeSinceLastLoopStart = std::chrono::duration_cast<std::chrono::milliseconds>(startTime - loopStart).count(); auto timeSinceLastLoopStart = std::chrono::duration_cast<std::chrono::milliseconds>(startTime - loopStart).count();
// if(timeSinceLastLoopStart > 20) {
// Log("%dms elapsed since last loop", timeSinceLastLoopStart);
// }
loopStart = startTime; loopStart = startTime;
rt->mRestart = false;
rt->mRendered = false; rt->mRendered = false;
long long elapsed = 0; long long elapsed = 0;
int numIters = 0; int numIters = 0;
while (!rt->_stop && elapsed < 12) { while (!rt->mStop && !rt->mRestart && elapsed < 12) {
rt->iter(); rt->iter();
numIters++; numIters++;
auto now = std::chrono::high_resolution_clock::now(); auto now = std::chrono::high_resolution_clock::now();
elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - startTime).count(); elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - startTime).count();
} }
// if(!rt->mRendered) {
// Log("Spent %lldms processing, %d iters, rendered %s, render requested %s, context lost %s", elapsed, numIters, rt->mRendered ? "true" : "false", rt->mRender ? "true" : "false", emscripten_is_webgl_context_lost(Thermion_getGLContext()) ? "yes" : "no"); if(rt->mStop) {
// }
if(rt->_stop) {
Log("RenderThread stopped") Log("RenderThread stopped")
emscripten_set_main_loop_arg(nullptr, nullptr, 0, true); emscripten_set_main_loop_arg(nullptr, nullptr, 0, true);
} }
@@ -59,6 +55,12 @@ static void *startHelper(void * parm) {
#endif #endif
void RenderThread::restart() {
#ifdef __EMSCRIPTEN__
mRestart = true;
#endif
}
RenderThread::RenderThread() RenderThread::RenderThread()
{ {
srand(time(NULL)); srand(time(NULL));
@@ -70,7 +72,7 @@ RenderThread::RenderThread()
pthread_create(&t, &attr, startHelper, this); pthread_create(&t, &attr, startHelper, this);
#else #else
t = new std::thread([this]() { t = new std::thread([this]() {
while (!_stop) { while (!mStop) {
iter(); iter();
mRendered = false; mRendered = false;
} }
@@ -83,7 +85,7 @@ RenderThread::RenderThread()
RenderThread::~RenderThread() RenderThread::~RenderThread()
{ {
Log("Destroying RenderThread (%d tasks remaining)", _tasks.size()); Log("Destroying RenderThread (%d tasks remaining)", _tasks.size());
_stop = true; mStop = true;
_cv.notify_one(); _cv.notify_one();
TRACE("Joining RenderThread thread.."); TRACE("Joining RenderThread thread..");
@@ -154,7 +156,7 @@ void RenderThread::iter()
} }
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
_cv.wait_for(taskLock, std::chrono::microseconds(2000), [this] _cv.wait_for(taskLock, std::chrono::microseconds(2000), [this]
{ return !_tasks.empty() || _stop; }); { return !_tasks.empty() || mStop; });
#endif #endif
} }