Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 19:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix thread crash

Browse Source
This commit is contained in:
blueloveTH 2022-12-01 16:48:57 +08:00
parent 274a25c736
commit 79fd466f1f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vm.h
View File

@ -928,6 +928,7 @@ public:
} }
virtual ~VM() { virtual ~VM() {
callstack.clear();
if(!use_stdio){ if(!use_stdio){
delete _stdout; delete _stdout;
delete _stderr; delete _stderr;
@ -1082,6 +1083,7 @@ class ThreadedVM : public VM {
std::thread* _thread = nullptr; std::thread* _thread = nullptr;
std::atomic<ThreadState> _state = THREAD_READY; std::atomic<ThreadState> _state = THREAD_READY;
std::optional<_Str> _sharedStr = {}; std::optional<_Str> _sharedStr = {};
std::atomic<bool> _stopFlag = false;
PyVar jsonRpc(const _Str& _json){ PyVar jsonRpc(const _Str& _json){
_sharedStr = _json; _sharedStr = _json;
@ -1093,8 +1095,9 @@ class ThreadedVM : public VM {
void __deleteThread(){ void __deleteThread(){
if(_thread != nullptr){ if(_thread != nullptr){
if(!_thread->joinable()) UNREACHABLE(); _stopFlag = true;
_thread->join(); _thread->join();
_stopFlag = false;
delete _thread; delete _thread;
_thread = nullptr; _thread = nullptr;
} }
@ -1122,7 +1125,10 @@ public:
if(_state != THREAD_RUNNING) UNREACHABLE(); if(_state != THREAD_RUNNING) UNREACHABLE();
_state = THREAD_SUSPENDED; _state = THREAD_SUSPENDED;
// 50 fps is enough // 50 fps is enough
while(_state == THREAD_SUSPENDED) std::this_thread::sleep_for(std::chrono::milliseconds(20)); while(_state == THREAD_SUSPENDED){
if(_stopFlag) std::terminate();
std::this_thread::sleep_for(std::chrono::milliseconds(20));
}
} }
std::optional<_Str> readSharedStr(){ std::optional<_Str> readSharedStr(){