Read Ref IDs as uint64 (#43)

Fixes overflow error in parsing Ref IDs
grafana · Oct 16, 2024 · a8d22a1 · a8d22a1
1 parent 1987b3f
commit a8d22a1
Show file tree

Hide file tree

Showing 33 changed files with 227 additions and 184 deletions.
diff --git a/gen/main.go b/gen/main.go
@@ -275,13 +275,13 @@ func generateBindLoop(typ *def.Class, bindName string, nestedAllowed bool) strin
 	res += fmt.Sprintf("	}\n")
 	res += fmt.Sprintf("	for %sArrayIndex := 0; %sArrayIndex < %sArraySize; %sArrayIndex++ {\n", bindName, bindName, bindName, bindName)
 	res += fmt.Sprintf("	if %s.Fields[%sFieldIndex].Field.ConstantPool {\n", bindName, bindName)
-	res += emitReadI32()
+	res += emitReadU64()
 	if len(cpoolFields) > 0 {
 		res += fmt.Sprintf("		switch %s.Fields[%sFieldIndex].Field.Type {\n", bindName, bindName)
 		for _, field := range cpoolFields {
 			res += fmt.Sprintf("		case typeMap.%s:\n", TypeID2Sym(field.Type))
 			res += fmt.Sprintf("			if %s.Fields[%sFieldIndex].%s != nil {\n", bindName, bindName, goTypeName(field))
-			res += fmt.Sprintf("				*%s.Fields[%sFieldIndex].%s = %s(v32_)\n", bindName, bindName, goTypeName(field), goTypeName(field))
+			res += fmt.Sprintf("				*%s.Fields[%sFieldIndex].%s = %s(v64_)\n", bindName, bindName, goTypeName(field), goTypeName(field))
 			res += fmt.Sprintf("			}\n")
 		}
 		res += fmt.Sprintf("		}\n")

diff --git a/parser/testdata/uint64-ref-id.jfr.gz b/parser/testdata/uint64-ref-id.jfr.gz
diff --git a/parser/testdata/uint64-ref-id_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/parser/testdata/uint64-ref-id_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/...ata/uint64-ref-id_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz b/...ata/uint64-ref-id_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz
diff --git a/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/...alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected_collapsed.txt.gz b/...alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected_collapsed.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/...loc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected_collapsed.txt.gz b/...loc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected_collapsed.txt.gz
diff --git a/...t64-ref-id_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz b/...t64-ref-id_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz
diff --git a/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz b/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz
diff --git a/parser/testdata/uint64-ref-id_4_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/uint64-ref-id_4_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/uint64-ref-id_4_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz b/parser/testdata/uint64-ref-id_4_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz
diff --git a/parser/types/active_settings.go b/parser/types/active_settings.go
diff --git a/parser/types/allocation_in_new_tlab.go b/parser/types/allocation_in_new_tlab.go
diff --git a/parser/types/allocation_outside_tlab.go b/parser/types/allocation_outside_tlab.go
diff --git a/parser/types/allocation_sample.go b/parser/types/allocation_sample.go
diff --git a/parser/types/class.go b/parser/types/class.go
diff --git a/parser/types/classloader.go b/parser/types/classloader.go
diff --git a/parser/types/execution_sample.go b/parser/types/execution_sample.go
diff --git a/parser/types/frametype.go b/parser/types/frametype.go