Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #36556 from RandomShaper/rework_mutex

Browse source 
Reimplement `Mutex` with C++'s `<mutex>` (plus more)
This commit is contained in:
Rémi Verschelde 2020-02-28 00:26:01 +01:00 • committed by GitHub
commit b7b3978684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 739 additions and 1754 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/visual_script/visual_script.cpp
View file

@ -928,13 +928,11 @@ ScriptInstance *VisualScript::instance_create(Object *p_this) {
VisualScriptInstance *instance = memnew(VisualScriptInstance);
instance->create(Ref<VisualScript>(this), p_this);
if (VisualScriptLanguage::singleton->lock)
VisualScriptLanguage::singleton->lock->lock();
{
MutexLock lock(VisualScriptLanguage::singleton->lock);
instances[p_this] = instance;
if (VisualScriptLanguage::singleton->lock)
VisualScriptLanguage::singleton->lock->unlock();
instances[p_this] = instance;
}
return instance;
}
@ -2391,13 +2389,11 @@ VisualScriptInstance::VisualScriptInstance() {
VisualScriptInstance::~VisualScriptInstance() {
if (VisualScriptLanguage::singleton->lock)
VisualScriptLanguage::singleton->lock->lock();
{
MutexLock lock(VisualScriptLanguage::singleton->lock);
script->instances.erase(owner);
if (VisualScriptLanguage::singleton->lock)
VisualScriptLanguage::singleton->lock->unlock();
script->instances.erase(owner);
}
for (Map<int, VisualScriptNodeInstance *>::Element *E = instances.front(); E; E = E->next()) {
memdelete(E->get());
@ -2836,9 +2832,6 @@ VisualScriptLanguage::VisualScriptLanguage() {
_step = "_step";
_subcall = "_subcall";
singleton = this;
#ifndef NO_THREADS
lock = Mutex::create();
#endif
_debug_parse_err_node = -1;
_debug_parse_err_file = "";
@ -2859,9 +2852,6 @@ VisualScriptLanguage::VisualScriptLanguage() {
VisualScriptLanguage::~VisualScriptLanguage() {
if (lock)
memdelete(lock);
if (_call_stack) {
memdelete_arr(_call_stack);
}

2
modules/visual_script/visual_script.h
View file

@ -530,7 +530,7 @@ public:
static VisualScriptLanguage *singleton;
Mutex *lock;
Mutex lock;
bool debug_break(const String &p_error, bool p_allow_continue = true);
bool debug_break_parse(const String &p_file, int p_node, const String &p_error);