diff --git a/src/dbg_engine/dbg_engine_ctrl.c b/src/dbg_engine/dbg_engine_ctrl.c index 091ffc61..a386e67a 100644 --- a/src/dbg_engine/dbg_engine_ctrl.c +++ b/src/dbg_engine/dbg_engine_ctrl.c @@ -3199,7 +3199,7 @@ d_ctrl_thread__next_dmn_event(Arena *arena, DMN_CtrlCtx *ctrl_ctx, D_Msg *msg, D } //- rjf: compute local symbol server cache path for this debug info - String8 local_symbol_server_cache_path = smsv_local_path_from_key(scratch2.arena, str8_skip_last_slash(module_info->debug_info_path), module_info->debug_info_guid, module_info->debug_info_age); + String8 local_symbol_server_cache_path = smsv_local_debug_info_path_from_key(scratch2.arena, str8_skip_last_slash(module_info->debug_info_path), module_info->debug_info_guid, module_info->debug_info_age); //- rjf: pick default initial debug info path String8 initial_debug_info_path = {0}; @@ -4185,6 +4185,35 @@ d_ctrl_thread__open_crash_dump(DMN_CtrlCtx *ctrl_ctx, D_Msg *msg) } } + // rjf: check if the local module matches the dump's version + B32 local_module_matches = 1; + { + File file = file_open(AccessFlag_Read|AccessFlag_ShareRead, module_name); + if(file_match(file, file_zero())) + { + local_module_matches = 0; + } + else + { + FileProperties props = properties_from_file(file); + FileMap map = file_map_open(AccessFlag_Read, file); + void *base = file_map_view_open(map, AccessFlag_Read, r1u64(0, props.size)); + String8 data = str8((U8 *)base, props.size); + PE_BinInfo pe = pe_bin_info_from_data(scratch.arena, data); + local_module_matches = (pe.timestamp == module->time_date_stamp); + } + file_close(file); + } + + // rjf: download module if needed +#if defined(SYMBOL_SERVER_H) + if(!local_module_matches) + { + module_name = smsv_local_module_path_from_key(scratch.arena, str8_skip_last_slash(module_name), module->time_date_stamp, module->image_size); + smsv_fill_local_path(module_name); + } +#endif + // rjf: unpack module file File module_file = file_open(AccessFlag_Read|AccessFlag_ShareRead, module_name); FileProperties module_props = properties_from_file(module_file); diff --git a/src/dbg_engine/dbg_engine_user.c b/src/dbg_engine/dbg_engine_user.c index 0702e9b5..4ea507a3 100644 --- a/src/dbg_engine/dbg_engine_user.c +++ b/src/dbg_engine/dbg_engine_user.c @@ -2153,7 +2153,7 @@ d_tick(Arena *arena, D_TargetArray *targets, D_BreakpointArray *breakpoints, D_P { Access *access = access_open(); D_ModuleInfo *info = d_info_from_module(access, params->entity); - String8 symbol_server_local_cache_path = smsv_local_path_from_key(scratch.arena, info->dbg_name, info->dbg_guid, info->dbg_age); + String8 symbol_server_local_cache_path = smsv_local_debug_info_path_from_key(scratch.arena, info->dbg_name, info->dbg_guid, info->dbg_age); smsv_fill_local_path(symbol_server_local_cache_path); D_Msg *msg = d_msg_list_push(scratch.arena, &ctrl_msgs); msg->kind = D_MsgKind_SetModuleDebugInfoPath; diff --git a/src/pe/pe.c b/src/pe/pe.c index 90a06fbd..e4eebb7a 100644 --- a/src/pe/pe.c +++ b/src/pe/pe.c @@ -627,6 +627,7 @@ pe_bin_info_from_data(Arena *arena, String8 data) info.arch = arch_from_coff_machine(file_header.machine); info.image_base = image_base; info.entry_point = entry_point; + info.timestamp = file_header.time_stamp; info.is_pe32 = (optional_magic == PE_PE32_MAGIC); info.subsystem = subsystem; info.check_sum = check_sum; diff --git a/src/pe/pe.h b/src/pe/pe.h index 84caf572..169b47c1 100644 --- a/src/pe/pe.h +++ b/src/pe/pe.h @@ -1009,6 +1009,7 @@ struct PE_BinInfo Arch arch; U64 image_base; U64 entry_point; + U32 timestamp; B32 is_pe32; PE_WindowsSubsystem subsystem; U32 *check_sum; diff --git a/src/symbol_server/symbol_server.h b/src/symbol_server/symbol_server.h index 2d9951bb..747005f4 100644 --- a/src/symbol_server/symbol_server.h +++ b/src/symbol_server/symbol_server.h @@ -18,7 +18,8 @@ SMSV_Status; internal void smsv_init(void); internal void smsv_async_tick(void); internal String8 smsv_cache_path(void); -internal String8 smsv_local_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age); +internal String8 smsv_local_module_path_from_key(Arena *arena, String8 module_name, U32 timestamp, U32 size_of_image); +internal String8 smsv_local_debug_info_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age); internal void smsv_fill_local_path(String8 path); internal SMSV_Status smsv_status_from_local_path(String8 path); diff --git a/src/symbol_server/symbol_server_stub.c b/src/symbol_server/symbol_server_stub.c index bbd71e35..ce691ce2 100644 --- a/src/symbol_server/symbol_server_stub.c +++ b/src/symbol_server/symbol_server_stub.c @@ -18,7 +18,13 @@ smsv_cache_path(void) } internal String8 -smsv_local_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age) +smsv_local_module_path_from_key(Arena *arena, String8 module_name, U32 timestamp, U32 size_of_image) +{ + return s(""); +} + +internal String8 +smsv_local_debug_info_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age) { return s(""); } diff --git a/src/win32/symbol_server/win32_symbol_server.c b/src/win32/symbol_server/win32_symbol_server.c index 74f5149c..52e19b88 100644 --- a/src/win32/symbol_server/win32_symbol_server.c +++ b/src/win32/symbol_server/win32_symbol_server.c @@ -359,7 +359,15 @@ smsv_cache_path(void) } internal String8 -smsv_local_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age) +smsv_local_module_path_from_key(Arena *arena, String8 module_name, U32 timestamp, U32 size_of_image) +{ + String8 symbol_cache_path = w32_smsv_state->symbol_cache_path; + String8 result = str8f(arena, "%S/%S/%08X%x/%S", symbol_cache_path, module_name, timestamp, size_of_image, module_name); + return result; +} + +internal String8 +smsv_local_debug_info_path_from_key(Arena *arena, String8 dbg_name, Guid guid, U64 age) { String8 result = {0}; Temp scratch = scratch_begin(&arena, 1);