CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-17 00:07:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2943 from sronsse/fixes_for_team

Browse Source 
Fix deadlock due to missing slock_unlock in task threaded find function.
This commit is contained in:
Twinaphex 2016-05-04 14:28:10 +02:00
commit dce7730928
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretro-common/queues/task_queue.c
View File

@ -270,16 +270,20 @@ static bool retro_task_threaded_find(
retro_task_finder_t func, void *user_data)
{
retro_task_t *task = NULL;
bool result = false;
slock_lock(running_lock);
for (task = tasks_running.front; task; task = task->next)
{
if (func(task, user_data))
return true;
{
result = true;
break;
}
}
slock_unlock(running_lock);
return false;
return result;
}
static void threaded_worker(void *userdata)

8
menu/cbs/menu_cbs_ok.c
View File

@ -1393,8 +1393,12 @@ static void cb_generic_download(void *task_data,
if (string_is_equal_noncase(file_ext, "zip"))
{
rarch_task_push_decompress(output_path, dir_path, NULL, NULL, NULL,
cb_decompressed, (void*)(uintptr_t)transf->type_hash);
if (!rarch_task_push_decompress(output_path, dir_path, NULL, NULL, NULL,
cb_decompressed, (void*)(uintptr_t)transf->type_hash))
{
err = "Decompression failed.";
goto finish;
}
}
#else
switch (transf->type_hash)