godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly unlock mutex

This commit is contained in:
qarmin 2019-05-30 10:28:03 +02:00
parent 8c923fc617
commit a32f020b53
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/command_queue_mt.h
View File

@ -406,8 +406,10 @@ class CommandQueueMT {
tryagain: tryagain:
// tried to read an empty queue // tried to read an empty queue
if (read_ptr == write_ptr) if (read_ptr == write_ptr) {
if (p_lock) unlock();
return false; return false;
}
uint32_t size_ptr = read_ptr; uint32_t size_ptr = read_ptr;
uint32_t size = *(uint32_t *)&command_mem[read_ptr] >> 1; uint32_t size = *(uint32_t *)&command_mem[read_ptr] >> 1;

3
core/io/file_access_network.cpp
View File

@ -118,8 +118,11 @@ void FileAccessNetworkClient::_thread_func() {
FileAccessNetwork *fa = NULL; FileAccessNetwork *fa = NULL;
if (response != FileAccessNetwork::RESPONSE_DATA) { if (response != FileAccessNetwork::RESPONSE_DATA) {
if (!accesses.has(id)) {
unlock_mutex();
ERR_FAIL_COND(!accesses.has(id)); ERR_FAIL_COND(!accesses.has(id));
} }
}
if (accesses.has(id)) if (accesses.has(id))
fa = accesses[id]; fa = accesses[id];

2
core/print_string.cpp
View File

@ -68,8 +68,8 @@ void remove_print_handler(PrintHandlerList *p_handler) {
} }
//OS::get_singleton()->print("print handler list is %p\n",print_handler_list); //OS::get_singleton()->print("print handler list is %p\n",print_handler_list);
ERR_FAIL_COND(l == NULL);
_global_unlock(); _global_unlock();
ERR_FAIL_COND(l == NULL);
} }
void print_line(String p_string) { void print_line(String p_string) {