ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

another pass over ctrl process memory cache lookup, prevent another deadlock case

Browse Source
This commit is contained in:
Ryan Fleury
2025-06-03 12:06:02 -07:00
parent 594594ec72
commit b57deebd03
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ctrl/ctrl_core.c
+16 -8
View File
@@ -1654,11 +1654,11 @@ ctrl_key_from_process_vaddr_range(CTRL_Handle process, Rng1U64 vaddr_range, B32
B32 key_is_stale = 0; B32 key_is_stale = 0;
for(;;) for(;;)
{ {
//- rjf: step 1: [read-only] try to look for current results for key's ID //- rjf: step 1: [read-only] try to look for current results for key's ID; wait if working & retry
B32 id_exists = 0; B32 id_exists = 0;
B32 id_stale = 0; B32 id_stale = 0;
B32 id_working = 0; B32 id_working = 0;
OS_MutexScopeR(process_stripe->rw_mutex) OS_MutexScopeR(process_stripe->rw_mutex) for(;;)
{ {
for(CTRL_ProcessMemoryCacheNode *process_n = process_slot->first; process_n != 0; process_n = process_n->next) for(CTRL_ProcessMemoryCacheNode *process_n = process_slot->first; process_n != 0; process_n = process_n->next)
{ {
@@ -1679,6 +1679,14 @@ ctrl_key_from_process_vaddr_range(CTRL_Handle process, Rng1U64 vaddr_range, B32
} }
} }
end_fast_lookup:; end_fast_lookup:;
if(os_now_microseconds() >= endt_us || !id_working)
{
break;
}
else
{
os_condition_variable_wait_rw_r(process_stripe->cv, process_stripe->rw_mutex, endt_us);
}
} }
key_is_stale = id_stale; key_is_stale = id_stale;
@@ -1694,6 +1702,7 @@ ctrl_key_from_process_vaddr_range(CTRL_Handle process, Rng1U64 vaddr_range, B32
// need to build a node for it. if that, or if the ID is stale, then also // need to build a node for it. if that, or if the ID is stale, then also
// request that that range is streamed & wait for its result (for as long // request that that range is streamed & wait for its result (for as long
// as we have.) // as we have.)
B32 requested = 0;
if(!id_exists || (id_exists && id_stale && !id_working)) if(!id_exists || (id_exists && id_stale && !id_working))
{ {
B32 node_needs_stream = 0; B32 node_needs_stream = 0;
@@ -1737,15 +1746,14 @@ ctrl_key_from_process_vaddr_range(CTRL_Handle process, Rng1U64 vaddr_range, B32
} }
} }
} }
if(node_needs_stream) OS_MutexScopeR(process_stripe->rw_mutex) if(node_needs_stream)
{ {
if(ctrl_u2ms_enqueue_req(key, process, vaddr_range, zero_terminated, endt_us)) if(ctrl_u2ms_enqueue_req(key, process, vaddr_range, zero_terminated, endt_us))
{ {
async_push_work(ctrl_mem_stream_work, .working_counter = node_working_count); async_push_work(ctrl_mem_stream_work, .working_counter = node_working_count);
os_condition_variable_wait_rw_r(process_stripe->cv, process_stripe->rw_mutex, endt_us); requested = 1;
id_working = 1;
} }
else else OS_MutexScopeR(process_stripe->rw_mutex)
{ {
for(CTRL_ProcessMemoryCacheNode *process_n = process_slot->first; process_n != 0; process_n = process_n->next) for(CTRL_ProcessMemoryCacheNode *process_n = process_slot->first; process_n != 0; process_n = process_n->next)
{ {
@@ -1768,8 +1776,8 @@ ctrl_key_from_process_vaddr_range(CTRL_Handle process, Rng1U64 vaddr_range, B32
} }
} }
//- rjf: step 4: if we have no time to wait, or no results & no progress, then abort //- rjf: step 4: if we didn't request, and if we aren't working, then exit
if(os_now_microseconds() >= endt_us || !id_working) if(!requested && !id_working)
{ {
break; break;
} }