From c1e32b93a7a75d68e33cbcb405e9a57952f25c39 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Thu, 2 Oct 2025 15:43:01 -0700 Subject: [PATCH] switch from variable size checksum data sections to just making well-defined fixed size ones for all of the concrete cases --- src/lib_rdi/rdi.c | 8 ++-- src/lib_rdi/rdi.h | 66 +++++++++++++++++-------- src/lib_rdi_make/rdi_make.c | 5 +- src/lib_rdi_make/rdi_make.h | 12 +++-- src/rdi/rdi.mdesk | 43 +++++++++++------ src/rdi_from_pdb/rdi_from_pdb.c | 4 +- src/rdi_make/rdi_make_local.c | 85 +++++++++++++++++++-------------- src/rdi_make/rdi_make_local.h | 9 ++-- 8 files changed, 145 insertions(+), 87 deletions(-) diff --git a/src/lib_rdi/rdi.c b/src/lib_rdi/rdi.c index 69e1b10a..444f43d4 100644 --- a/src/lib_rdi/rdi.c +++ b/src/lib_rdi/rdi.c @@ -10,7 +10,7 @@ #ifndef RDI_C #define RDI_C -RDI_U16 rdi_section_element_size_table[42] = +RDI_U16 rdi_section_element_size_table[44] = { sizeof(RDI_U8), sizeof(RDI_TopLevelInfo), @@ -48,8 +48,10 @@ sizeof(RDI_LocationBlock), sizeof(RDI_U8), sizeof(RDI_U8), sizeof(RDI_U32), -sizeof(RDI_U8), -sizeof(RDI_U32), +sizeof(RDI_MD5), +sizeof(RDI_SHA1), +sizeof(RDI_SHA256), +sizeof(RDI_U64), sizeof(RDI_NameMap), sizeof(RDI_NameMapBucket), sizeof(RDI_NameMapNode), diff --git a/src/lib_rdi/rdi.h b/src/lib_rdi/rdi.h index 37a77e9d..d782fb31 100644 --- a/src/lib_rdi/rdi.h +++ b/src/lib_rdi/rdi.h @@ -40,6 +40,18 @@ typedef int32_t RDI_S32; typedef int64_t RDI_S64; #endif +//////////////////////////////////////////////////////////////// +//~ Checksum Types + +typedef union RDI_MD5 RDI_MD5; +union RDI_MD5 {RDI_U8 u8[16]; RDI_U64 u64[2];}; + +typedef union RDI_SHA1 RDI_SHA1; +union RDI_SHA1 {RDI_U8 u8[20];}; + +typedef union RDI_SHA256 RDI_SHA256; +union RDI_SHA256 {RDI_U8 u8[32]; RDI_U64 u64[4];}; + //////////////////////////////////////////////////////////////// //~ Overridable Enabling/Disabling Of Table Index Typechecking @@ -52,7 +64,7 @@ typedef int64_t RDI_S64; // "raddbg\0\0" #define RDI_MAGIC_CONSTANT 0x0000676264646172 -#define RDI_ENCODING_VERSION 14 +#define RDI_ENCODING_VERSION 15 //////////////////////////////////////////////////////////////// //~ Format Types & Functions @@ -96,12 +108,14 @@ RDI_SectionKind_LocationBlocks = 0x0020, RDI_SectionKind_LocationData = 0x0021, RDI_SectionKind_ConstantValueData = 0x0022, RDI_SectionKind_ConstantValueTable = 0x0023, -RDI_SectionKind_ChecksumData = 0x0024, -RDI_SectionKind_ChecksumTable = 0x0025, -RDI_SectionKind_NameMaps = 0x0026, -RDI_SectionKind_NameMapBuckets = 0x0027, -RDI_SectionKind_NameMapNodes = 0x0028, -RDI_SectionKind_COUNT = 0x0029, +RDI_SectionKind_MD5Checksums = 0x0024, +RDI_SectionKind_SHA1Checksums = 0x0025, +RDI_SectionKind_SHA256Checksums = 0x0026, +RDI_SectionKind_Timestamps = 0x0027, +RDI_SectionKind_NameMaps = 0x0028, +RDI_SectionKind_NameMapBuckets = 0x0029, +RDI_SectionKind_NameMapNodes = 0x002A, +RDI_SectionKind_COUNT = 0x002B, } RDI_SectionKindEnum; typedef RDI_U32 RDI_SectionEncoding; @@ -310,11 +324,12 @@ RDI_BinarySectionFlag_Execute = 1<<2, typedef RDI_U16 RDI_ChecksumKind; typedef enum RDI_ChecksumKindEnum { -RDI_ChecksumKind_Null = 0, +RDI_ChecksumKind_NULL = 0, RDI_ChecksumKind_MD5 = 1, RDI_ChecksumKind_SHA1 = 2, RDI_ChecksumKind_SHA256 = 3, RDI_ChecksumKind_Timestamp = 4, +RDI_ChecksumKind_COUNT = 5, } RDI_ChecksumKindEnum; typedef RDI_U32 RDI_Language; @@ -590,8 +605,10 @@ X(LocationBlocks, location_blocks, RDI_LocationBlock)\ X(LocationData, location_data, RDI_U8)\ X(ConstantValueData, constant_value_data, RDI_U8)\ X(ConstantValueTable, constant_value_table, RDI_U32)\ -X(ChecksumData, checksum_data, RDI_U8)\ -X(ChecksumTable, checksum_table, RDI_U32)\ +X(MD5Checksums, md5_checksums, RDI_MD5)\ +X(SHA1Checksums, sha1_checksums, RDI_SHA1)\ +X(SHA256Checksums, sha256_checksums, RDI_SHA256)\ +X(Timestamps, timestamps, RDI_U64)\ X(NameMaps, name_maps, RDI_NameMap)\ X(NameMapBuckets, name_map_buckets, RDI_NameMapBucket)\ X(NameMapNodes, name_map_nodes, RDI_NameMapNode)\ @@ -805,11 +822,12 @@ X(RDI_U64, foff_first)\ X(RDI_U64, foff_opl)\ #define RDI_ChecksumKind_XList \ -X(Null)\ -X(MD5)\ -X(SHA1)\ -X(SHA256)\ -X(Timestamp)\ +X(NULL, NULL)\ +X(MD5, MD5Checksums)\ +X(SHA1, SHA1Checksums)\ +X(SHA256, SHA256Checksums)\ +X(Timestamp, Timestamps)\ +X(COUNT, NULL)\ #define RDI_FilePathNode_XList \ X(RDI_U32, name_string_idx)\ @@ -1173,7 +1191,10 @@ typedef struct RDI_U32_LocationBlocks { RDI_U32 v; } RDI_U32_Locati typedef struct RDI_U32_LocationData { RDI_U32 v; } RDI_U32_LocationData; typedef struct RDI_U32_ConstantValueData { RDI_U32 v; } RDI_U32_ConstantValueData; typedef struct RDI_U32_ConstantValueTable { RDI_U32 v; } RDI_U32_ConstantValueTable; -typedef struct RDI_U32_ChecksumTable { RDI_U32 v; } RDI_U32_ChecksumTable; +typedef struct RDI_U32_MD5Checksums { RDI_U32 v; } RDI_U32_MD5Checksums; +typedef struct RDI_U32_SHA1Checksums { RDI_U32 v; } RDI_U32_SHA1Checksums; +typedef struct RDI_U32_SHA256Checksums { RDI_U32 v; } RDI_U32_SHA256Checksums; +typedef struct RDI_U32_Timestamps { RDI_U32 v; } RDI_U32_Timestamps; typedef struct RDI_U32_NameMaps { RDI_U32 v; } RDI_U32_NameMaps; typedef struct RDI_U32_NameMapBuckets { RDI_U32 v; } RDI_U32_NameMapBuckets; typedef struct RDI_U32_NameMapNodes { RDI_U32 v; } RDI_U32_NameMapNodes; @@ -1210,7 +1231,10 @@ typedef RDI_U32_Table RDI_U32_LocationBlocks; typedef RDI_U32_Table RDI_U32_LocationData; typedef RDI_U32_Table RDI_U32_ConstantValueData; typedef RDI_U32_Table RDI_U32_ConstantValueTable; -typedef RDI_U32_Table RDI_U32_ChecksumTable; +typedef RDI_U32_Table RDI_U32_MD5Checksums; +typedef RDI_U32_Table RDI_U32_SHA1Checksums; +typedef RDI_U32_Table RDI_U32_SHA256Checksums; +typedef RDI_U32_Table RDI_U32_Timestamps; typedef RDI_U32_Table RDI_U32_NameMaps; typedef RDI_U32_Table RDI_U32_NameMapBuckets; typedef RDI_U32_Table RDI_U32_NameMapNodes; @@ -1578,8 +1602,10 @@ typedef RDI_LocationBlock RDI_SectionElementType_LocationBlocks; typedef RDI_U8 RDI_SectionElementType_LocationData; typedef RDI_U8 RDI_SectionElementType_ConstantValueData; typedef RDI_U32 RDI_SectionElementType_ConstantValueTable; -typedef RDI_U8 RDI_SectionElementType_ChecksumData; -typedef RDI_U32 RDI_SectionElementType_ChecksumTable; +typedef RDI_MD5 RDI_SectionElementType_MD5Checksums; +typedef RDI_SHA1 RDI_SectionElementType_SHA1Checksums; +typedef RDI_SHA256 RDI_SectionElementType_SHA256Checksums; +typedef RDI_U64 RDI_SectionElementType_Timestamps; typedef RDI_NameMap RDI_SectionElementType_NameMaps; typedef RDI_NameMapBucket RDI_SectionElementType_NameMapBuckets; typedef RDI_NameMapNode RDI_SectionElementType_NameMapNodes; @@ -1592,7 +1618,7 @@ RDI_PROC RDI_EvalConversionKind rdi_eval_conversion_kind_from_typegroups(RDI_Eva RDI_PROC RDI_S32 rdi_eval_op_typegroup_are_compatible(RDI_EvalOp op, RDI_EvalTypeGroup group); RDI_PROC RDI_U8 *rdi_explanation_string_from_eval_conversion_kind(RDI_EvalConversionKind kind, RDI_U64 *size_out); -extern RDI_U16 rdi_section_element_size_table[42]; +extern RDI_U16 rdi_section_element_size_table[44]; extern RDI_U16 rdi_eval_op_ctrlbits_table[52]; #endif // RDI_H diff --git a/src/lib_rdi_make/rdi_make.c b/src/lib_rdi_make/rdi_make.c index bfec01cb..25fc7f63 100644 --- a/src/lib_rdi_make/rdi_make.c +++ b/src/lib_rdi_make/rdi_make.c @@ -2026,8 +2026,9 @@ rdim_serialized_section_bundle_from_bake_results(RDIM_BakeResults *results) bundle.sections[RDI_SectionKind_LocationData] = rdim_serialized_section_make_unpacked_array(results->locations.location_data, results->locations.location_data_size); bundle.sections[RDI_SectionKind_ConstantValueData] = rdim_serialized_section_make_unpacked_array(results->constants.constant_value_data, results->constants.constant_value_data_size); bundle.sections[RDI_SectionKind_ConstantValueTable] = rdim_serialized_section_make_unpacked_array(results->constants.constant_values, results->constants.constant_values_count); - bundle.sections[RDI_SectionKind_ChecksumData] = rdim_serialized_section_make_unpacked_array(results->checksums.data, results->checksums.data_size); - bundle.sections[RDI_SectionKind_ChecksumTable] = rdim_serialized_section_make_unpacked_array(results->checksums.offs, results->checksums.offs_count); + bundle.sections[RDI_SectionKind_MD5Checksums] = rdim_serialized_section_make_unpacked_array(results->checksums.md5s, results->checksums.md5s_count); + bundle.sections[RDI_SectionKind_SHA1Checksums] = rdim_serialized_section_make_unpacked_array(results->checksums.sha1s, results->checksums.sha1s_count); + bundle.sections[RDI_SectionKind_SHA256Checksums] = rdim_serialized_section_make_unpacked_array(results->checksums.sha256s, results->checksums.sha256s_count); bundle.sections[RDI_SectionKind_NameMaps] = rdim_serialized_section_make_unpacked_array(results->top_level_name_maps.name_maps, results->top_level_name_maps.name_maps_count); bundle.sections[RDI_SectionKind_NameMapBuckets] = rdim_serialized_section_make_unpacked_array(results->name_maps.buckets, results->name_maps.buckets_count); bundle.sections[RDI_SectionKind_NameMapNodes] = rdim_serialized_section_make_unpacked_array(results->name_maps.nodes, results->name_maps.nodes_count); diff --git a/src/lib_rdi_make/rdi_make.h b/src/lib_rdi_make/rdi_make.h index 9f6eb541..cab8df40 100644 --- a/src/lib_rdi_make/rdi_make.h +++ b/src/lib_rdi_make/rdi_make.h @@ -1315,10 +1315,14 @@ struct RDIM_SrcFileBakeResult typedef struct RDIM_ChecksumBakeResult RDIM_ChecksumBakeResult; struct RDIM_ChecksumBakeResult { - RDI_U32 *offs; - RDI_U64 offs_count; - RDI_U8 *data; - RDI_U64 data_size; + RDI_MD5 *md5s; + RDI_U64 md5s_count; + RDI_SHA1 *sha1s; + RDI_U64 sha1s_count; + RDI_SHA256 *sha256s; + RDI_U64 sha256s_count; + RDI_U64 *timestamps; + RDI_U64 timestamps_count; }; typedef struct RDIM_LineTableBakeResult RDIM_LineTableBakeResult; diff --git a/src/rdi/rdi.mdesk b/src/rdi/rdi.mdesk index 7e8a8bc5..a4a219b2 100644 --- a/src/rdi/rdi.mdesk +++ b/src/rdi/rdi.mdesk @@ -51,6 +51,18 @@ "#endif"; ""; "////////////////////////////////////////////////////////////////"; + "//~ Checksum Types"; + ""; + "typedef union RDI_MD5 RDI_MD5;"; + "union RDI_MD5 {RDI_U8 u8[16]; RDI_U64 u64[2];};"; + ""; + "typedef union RDI_SHA1 RDI_SHA1;"; + "union RDI_SHA1 {RDI_U8 u8[20];};"; + ""; + "typedef union RDI_SHA256 RDI_SHA256;"; + "union RDI_SHA256 {RDI_U8 u8[32]; RDI_U64 u64[4];};"; + ""; + "////////////////////////////////////////////////////////////////"; "//~ Overridable Enabling/Disabling Of Table Index Typechecking"; ""; "#if !defined(RDI_DISABLE_TABLE_INDEX_TYPECHECKING)"; @@ -62,7 +74,7 @@ ""; "// \"raddbg\\0\\0\""; "#define RDI_MAGIC_CONSTANT 0x0000676264646172"; - "#define RDI_ENCODING_VERSION 14"; + "#define RDI_ENCODING_VERSION 15"; ""; "////////////////////////////////////////////////////////////////"; "//~ Format Types & Functions"; @@ -156,12 +168,14 @@ RDI_SectionTable: {LocationData location_data RDI_U8 0x0021 U32 ""} {ConstantValueData constant_value_data RDI_U8 0x0022 U32 ""} {ConstantValueTable constant_value_table RDI_U32 0x0023 U32 ""} - {ChecksumData checksum_data RDI_U8 0x0024 - ""} - {ChecksumTable checksum_table RDI_U32 0x0025 U32 ""} - {NameMaps name_maps RDI_NameMap 0x0026 U32 ""} - {NameMapBuckets name_map_buckets RDI_NameMapBucket 0x0027 U32 ""} - {NameMapNodes name_map_nodes RDI_NameMapNode 0x0028 U32 ""} - {COUNT count RDI_U8 0x0029 - ""} + {MD5Checksums md5_checksums RDI_MD5 0x0024 U32 ""} + {SHA1Checksums sha1_checksums RDI_SHA1 0x0025 U32 ""} + {SHA256Checksums sha256_checksums RDI_SHA256 0x0026 U32 ""} + {Timestamps timestamps RDI_U64 0x0027 U32 ""} + {NameMaps name_maps RDI_NameMap 0x0028 U32 ""} + {NameMapBuckets name_map_buckets RDI_NameMapBucket 0x0029 U32 ""} + {NameMapNodes name_map_nodes RDI_NameMapNode 0x002A U32 ""} + {COUNT count RDI_U8 0x002B - ""} } @table(name value) @@ -539,14 +553,15 @@ RDI_BinarySectionMemberTable: //////////////////////////////// //~ rjf: Checksum Type Tables -@table(name value) +@table(name value section) RDI_ChecksumKindTable: { - {Null 0} - {MD5 1} - {SHA1 2} - {SHA256 3} - {Timestamp 4} + {NULL 0 NULL } + {MD5 1 MD5Checksums } + {SHA1 2 SHA1Checksums } + {SHA256 3 SHA256Checksums} + {Timestamp 4 Timestamps } + {COUNT 5 NULL } } @enum(RDI_U16) RDI_ChecksumKind: @@ -556,7 +571,7 @@ RDI_ChecksumKindTable: @xlist RDI_ChecksumKind_XList: { - @expand(RDI_ChecksumKindTable a) `$(a.name)`; + @expand(RDI_ChecksumKindTable a) `$(a.name), $(a.section)`; } //////////////////////////////// diff --git a/src/rdi_from_pdb/rdi_from_pdb.c b/src/rdi_from_pdb/rdi_from_pdb.c index ca15f48a..ac59bb6f 100644 --- a/src/rdi_from_pdb/rdi_from_pdb.c +++ b/src/rdi_from_pdb/rdi_from_pdb.c @@ -267,10 +267,10 @@ p2r_rdi_type_kind_from_cv_basic_type(CV_BasicType basic_type) internal RDI_ChecksumKind p2r_rdi_from_cv_c13_checksum_kind(CV_C13ChecksumKind k) { - RDI_ChecksumKind result = RDI_ChecksumKind_Null; + RDI_ChecksumKind result = RDI_ChecksumKind_NULL; switch((CV_C13ChecksumKindEnum)k) { - case CV_C13ChecksumKind_Null: {result = RDI_ChecksumKind_Null;}break; + case CV_C13ChecksumKind_Null: {result = RDI_ChecksumKind_NULL;}break; case CV_C13ChecksumKind_MD5: {result = RDI_ChecksumKind_MD5;}break; case CV_C13ChecksumKind_SHA1: {result = RDI_ChecksumKind_SHA1;}break; case CV_C13ChecksumKind_SHA256:{result = RDI_ChecksumKind_SHA256;}break; diff --git a/src/rdi_make/rdi_make_local.c b/src/rdi_make/rdi_make_local.c index e6481551..f03b7614 100644 --- a/src/rdi_make/rdi_make_local.c +++ b/src/rdi_make/rdi_make_local.c @@ -1928,14 +1928,15 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) // rjf: allocate if(lane_idx() == 0) { - rdim_shared->lane_chunk_src_file_checksum_counts = push_array(arena, U64, lane_count()*params->src_files.chunk_count); - rdim_shared->lane_chunk_src_file_checksum_sizes = push_array(arena, U64, lane_count()*params->src_files.chunk_count); - rdim_shared->lane_chunk_src_file_checksum_off_offs = push_array(arena, U64, lane_count()*params->src_files.chunk_count); - rdim_shared->lane_chunk_src_file_checksum_data_offs = push_array(arena, U64, lane_count()*params->src_files.chunk_count); + for EachEnumVal(RDI_ChecksumKind, k) + { + rdim_shared->lane_chunk_src_file_checksum_counts[k] = push_array(arena, U64, lane_count()*params->src_files.chunk_count); + rdim_shared->lane_chunk_src_file_checksum_offs[k] = push_array(arena, U64, lane_count()*params->src_files.chunk_count); + } } lane_sync(); - // rjf: compute counts / sizes of all checksum data + // rjf: compute counts of all checksums { U64 chunk_idx = 0; for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first) @@ -1944,10 +1945,9 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) U64 slot_idx = lane_idx()*params->src_files.chunk_count + chunk_idx; for EachInRange(n_idx, range) { - if(n->v[n_idx].checksum_kind != RDI_ChecksumKind_Null && n->v[n_idx].checksum.size != 0) + if(RDI_ChecksumKind_NULL < n->v[n_idx].checksum_kind && n->v[n_idx].checksum_kind < RDI_ChecksumKind_COUNT && n->v[n_idx].checksum.size != 0) { - rdim_shared->lane_chunk_src_file_checksum_counts[slot_idx] += 1; - rdim_shared->lane_chunk_src_file_checksum_sizes[slot_idx] += n->v[n_idx].checksum.size; + rdim_shared->lane_chunk_src_file_checksum_counts[n->v[n_idx].checksum_kind][slot_idx] += 1; } } chunk_idx += 1; @@ -1958,23 +1958,22 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) // rjf: lay out per-lane-chunk offsets if(lane_idx() == 0) { - U64 off_off = 0; - U64 data_off = 0; - U64 chunk_idx = 0; - for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first) + for EachEnumVal(RDI_ChecksumKind, k) { - for EachIndex(l_idx, lane_count()) + U64 off = 0; + U64 chunk_idx = 0; + for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first) { - U64 slot_idx = l_idx*params->src_files.chunk_count + chunk_idx; - rdim_shared->lane_chunk_src_file_checksum_off_offs[slot_idx] = off_off; - rdim_shared->lane_chunk_src_file_checksum_data_offs[slot_idx] = data_off; - off_off += rdim_shared->lane_chunk_src_file_checksum_counts[slot_idx]; - data_off += rdim_shared->lane_chunk_src_file_checksum_sizes[slot_idx]; + for EachIndex(l_idx, lane_count()) + { + U64 slot_idx = l_idx*params->src_files.chunk_count + chunk_idx; + rdim_shared->lane_chunk_src_file_checksum_offs[k][slot_idx] = off; + off += rdim_shared->lane_chunk_src_file_checksum_counts[k][slot_idx]; + } + chunk_idx += 1; } - chunk_idx += 1; + rdim_shared->total_checksum_counts[k] = off; } - rdim_shared->total_checksum_count = off_off; - rdim_shared->total_checksum_size = data_off; } } lane_sync(); @@ -1987,10 +1986,14 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) // rjf: allocate if(lane_idx() == 0) { - rdim_shared->baked_checksums.offs_count = rdim_shared->total_checksum_count+1; - rdim_shared->baked_checksums.offs = push_array(arena, U32, rdim_shared->baked_checksums.offs_count); - rdim_shared->baked_checksums.data_size = rdim_shared->total_checksum_size; - rdim_shared->baked_checksums.data = push_array(arena, U8, rdim_shared->baked_checksums.data_size); + rdim_shared->baked_checksums.md5s_count = rdim_shared->total_checksum_counts[RDI_ChecksumKind_MD5]; + rdim_shared->baked_checksums.sha1s_count = rdim_shared->total_checksum_counts[RDI_ChecksumKind_SHA1]; + rdim_shared->baked_checksums.sha256s_count = rdim_shared->total_checksum_counts[RDI_ChecksumKind_SHA256]; + rdim_shared->baked_checksums.timestamps_count = rdim_shared->total_checksum_counts[RDI_ChecksumKind_Timestamp]; + rdim_shared->baked_checksums.md5s = push_array(arena, RDI_MD5, rdim_shared->baked_checksums.md5s_count); + rdim_shared->baked_checksums.sha1s = push_array(arena, RDI_SHA1, rdim_shared->baked_checksums.sha1s_count); + rdim_shared->baked_checksums.sha256s = push_array(arena, RDI_SHA256, rdim_shared->baked_checksums.sha256s_count); + rdim_shared->baked_checksums.timestamps = push_array(arena, RDI_U64, rdim_shared->baked_checksums.timestamps_count); } lane_sync(); @@ -2001,24 +2004,34 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params) { Rng1U64 range = lane_range(n->count); U64 slot_idx = lane_idx()*params->src_files.chunk_count + chunk_idx; - U64 dst_off_off = rdim_shared->lane_chunk_src_file_checksum_off_offs[slot_idx]; - U64 dst_data_off = rdim_shared->lane_chunk_src_file_checksum_data_offs[slot_idx]; + U64 dst_offs[RDI_ChecksumKind_COUNT] = {0}; + for EachEnumVal(RDI_ChecksumKind, k) + { + dst_offs[k] = rdim_shared->lane_chunk_src_file_checksum_offs[k][slot_idx]; + } for EachInRange(n_idx, range) { - if(n->v[n_idx].checksum_kind != RDI_ChecksumKind_Null && n->v[n_idx].checksum.size != 0) + RDI_ChecksumKind k = n->v[n_idx].checksum_kind; + String8 val = n->v[n_idx].checksum; + if(RDI_ChecksumKind_NULL < k && k < RDI_ChecksumKind_COUNT && val.size != 0) { - rdim_shared->baked_checksums.offs[dst_off_off] = (U32)dst_data_off; - MemoryCopy(&rdim_shared->baked_checksums.data[dst_data_off], n->v[n_idx].checksum.str, n->v[n_idx].checksum.size); - dst_off_off += 1; - dst_data_off += n->v[n_idx].checksum.size; + switch((RDI_ChecksumKindEnum)k) + { + case RDI_ChecksumKind_NULL: + case RDI_ChecksumKind_COUNT: + {}break; +#define Case(name, table_name) case RDI_ChecksumKind_##name:{MemoryCopy(&rdim_shared->baked_checksums.table_name[dst_offs[k]], val.str, Min(val.size, sizeof(rdim_shared->baked_checksums.table_name[0])));}break + Case(MD5, md5s); + Case(SHA1, sha1s); + Case(SHA256, sha256s); + Case(Timestamp, timestamps); +#undef Case + } + dst_offs[k] += 1; } } chunk_idx += 1; } - if(lane_idx() == 0) - { - rdim_shared->baked_checksums.offs[rdim_shared->baked_checksums.offs_count-1] = rdim_shared->baked_checksums.data_size; - } } } lane_sync(); diff --git a/src/rdi_make/rdi_make_local.h b/src/rdi_make/rdi_make_local.h index e6ad029c..bd4a0878 100644 --- a/src/rdi_make/rdi_make_local.h +++ b/src/rdi_make/rdi_make_local.h @@ -136,12 +136,9 @@ struct RDIM_Shared RDIM_SrcFileBakeResult baked_src_files; - RDI_U64 *lane_chunk_src_file_checksum_counts; // [lane_count * src_file_chunk_count] - RDI_U64 *lane_chunk_src_file_checksum_sizes; // [lane_count * src_file_chunk_count] - RDI_U64 *lane_chunk_src_file_checksum_off_offs; // [lane_count * src_file_chunk_count] - RDI_U64 *lane_chunk_src_file_checksum_data_offs; // [lane_count * src_file_chunk_count] - U64 total_checksum_count; - U64 total_checksum_size; + RDI_U64 *lane_chunk_src_file_checksum_counts[RDI_ChecksumKind_COUNT]; // [lane_count * src_file_chunk_count] + RDI_U64 *lane_chunk_src_file_checksum_offs[RDI_ChecksumKind_COUNT]; // [lane_count * src_file_chunk_count] + U64 total_checksum_counts[RDI_ChecksumKind_COUNT]; RDIM_ChecksumBakeResult baked_checksums;