diff --git a/src/lib_raddbgi_make/raddbgi_make.c b/src/lib_raddbgi_make/raddbgi_make.c index 257fa4e6..af479b17 100644 --- a/src/lib_raddbgi_make/raddbgi_make.c +++ b/src/lib_raddbgi_make/raddbgi_make.c @@ -1257,7 +1257,7 @@ rdim_bake_string_map_insert(RDIM_Arena *arena, RDIM_BakeStringMap *map, RDIM_Str if(node == 0) { node = rdim_push_array(arena, RDIM_BakeStringNode, 1); - node->string = rdim_str8_copy(arena, string); + node->string = string; node->hash = hash; node->idx = map->count; map->count += 1; diff --git a/src/lib_raddbgi_make/raddbgi_make.h b/src/lib_raddbgi_make/raddbgi_make.h index b6ca35ba..474ed2bb 100644 --- a/src/lib_raddbgi_make/raddbgi_make.h +++ b/src/lib_raddbgi_make/raddbgi_make.h @@ -1194,11 +1194,4 @@ RDI_PROC RDIM_BakeSectionList rdim_bake_idx_run_section_list_from_idx_run_map(RD RDI_PROC RDIM_String8List rdim_serialized_strings_from_params_bake_section_list(RDIM_Arena *arena, RDIM_BakeParams *params, RDIM_BakeSectionList *sections); -//////////////////////////////// -//~ rjf: [OLD] Baking - -#if 0 -RDI_PROC RDIM_String8List rdim_blobs_from_bake_sections(RDIM_Arena *arena, RDIM_BakeSectionList *sections); -#endif - #endif // RADDBGI_MAKE_H diff --git a/src/os/core/os_core.c b/src/os/core/os_core.c index e1429d1d..db67d314 100644 --- a/src/os/core/os_core.c +++ b/src/os/core/os_core.c @@ -163,67 +163,49 @@ os_string_from_file_range(Arena *arena, OS_Handle file, Rng1U64 range) internal void os_mutex_take(OS_Handle mutex){ - ProfBeginLockWait((void *)(mutex.u64[0]), "take mutex"); os_mutex_take_(mutex); - ProfEndLockWait(); - ProfLockTake((void *)(mutex.u64[0]), "take mutex"); } internal void os_mutex_drop(OS_Handle mutex){ os_mutex_drop_(mutex); - ProfLockDrop((void *)(mutex.u64[0])); } internal void os_rw_mutex_take_r(OS_Handle rw_mutex){ - ProfBeginLockWait((void *)(rw_mutex.u64[0]), "rw mutex take r"); os_rw_mutex_take_r_(rw_mutex); - ProfEndLockWait(); - ProfLockTake((void *)(rw_mutex.u64[0]), "rw mutex take r"); } internal void os_rw_mutex_drop_r(OS_Handle rw_mutex){ os_rw_mutex_drop_r_(rw_mutex); - ProfLockDrop((void *)(rw_mutex.u64[0])); } internal void os_rw_mutex_take_w(OS_Handle rw_mutex){ - ProfBeginLockWait((void *)(rw_mutex.u64[0]), "rw mutex take rw"); os_rw_mutex_take_w_(rw_mutex); - ProfEndLockWait(); - ProfLockTake((void *)(rw_mutex.u64[0]), "rw mutex take rw"); } internal void os_rw_mutex_drop_w(OS_Handle rw_mutex){ os_rw_mutex_drop_w_(rw_mutex); - ProfLockDrop((void *)(rw_mutex.u64[0])); } internal B32 os_condition_variable_wait(OS_Handle cv, OS_Handle mutex, U64 endt_us){ - ProfLockDrop((void *)(mutex.u64[0])); B32 result = os_condition_variable_wait_(cv, mutex, endt_us); - ProfLockTake((void *)(mutex.u64[0]), "wait cv"); return(result); } internal B32 os_condition_variable_wait_rw_r(OS_Handle cv, OS_Handle mutex_rw, U64 endt_us){ - ProfLockDrop((void *)(mutex_rw.u64[0])); B32 result = os_condition_variable_wait_rw_r_(cv, mutex_rw, endt_us); - ProfLockTake((void *)(mutex_rw.u64[0]), "wait cv rw r"); return(result); } internal B32 os_condition_variable_wait_rw_w(OS_Handle cv, OS_Handle mutex_rw, U64 endt_us){ - ProfLockDrop((void *)(mutex_rw.u64[0])); B32 result = os_condition_variable_wait_rw_w_(cv, mutex_rw, endt_us); - ProfLockTake((void *)(mutex_rw.u64[0]), "wait cv rw w"); return(result); }