Use int64 as TypeID and use -1 as uninitialised value

grafana · Sep 5, 2024 · 905b8eb · 905b8eb
1 parent 365b303
commit 905b8eb
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 2 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -483,7 +483,7 @@ func (p *Parser) checkTypes() error {
 	if typeCPLogLevel != nil {
 		p.TypeMap.T_LOG_LEVEL = typeCPLogLevel.ID
 	} else {
-		p.TypeMap.T_LOG_LEVEL = 0
+		p.TypeMap.T_LOG_LEVEL = -1
 	}
 	p.TypeMap.T_STACK_TRACE = typeCPStackTrace.ID
 	p.TypeMap.T_CLASS_LOADER = typeCPClassLoader.ID
@@ -521,30 +521,57 @@ func (p *Parser) checkTypes() error {
 	if typeExecutionSample != nil {
 		p.TypeMap.T_EXECUTION_SAMPLE = typeExecutionSample.ID
 		p.bindExecutionSample = types2.NewBindExecutionSample(typeExecutionSample, &p.TypeMap)
+	} else {
+		p.TypeMap.T_EXECUTION_SAMPLE = -1
+		p.bindExecutionSample = nil
 	}
+
 	if typeAllocInNewTLAB != nil {
 		p.TypeMap.T_ALLOC_IN_NEW_TLAB = typeAllocInNewTLAB.ID
 		p.bindAllocInNewTLAB = types2.NewBindObjectAllocationInNewTLAB(typeAllocInNewTLAB, &p.TypeMap)
+	} else {
+		p.TypeMap.T_ALLOC_IN_NEW_TLAB = -1
+		p.bindAllocInNewTLAB = nil
 	}
+
 	if typeALlocOutsideTLAB != nil {
 		p.TypeMap.T_ALLOC_OUTSIDE_TLAB = typeALlocOutsideTLAB.ID
 		p.bindAllocOutsideTLAB = types2.NewBindObjectAllocationOutsideTLAB(typeALlocOutsideTLAB, &p.TypeMap)
+	} else {
+		p.TypeMap.T_ALLOC_OUTSIDE_TLAB = -1
+		p.bindAllocOutsideTLAB = nil
 	}
+
 	if typeMonitorEnter != nil {
 		p.TypeMap.T_MONITOR_ENTER = typeMonitorEnter.ID
 		p.bindMonitorEnter = types2.NewBindJavaMonitorEnter(typeMonitorEnter, &p.TypeMap)
+	} else {
+		p.TypeMap.T_MONITOR_ENTER = -1
+		p.bindMonitorEnter = nil
 	}
+
 	if typeThreadPark != nil {
 		p.TypeMap.T_THREAD_PARK = typeThreadPark.ID
 		p.bindThreadPark = types2.NewBindThreadPark(typeThreadPark, &p.TypeMap)
+	} else {
+		p.TypeMap.T_THREAD_PARK = -1
+		p.bindThreadPark = nil
 	}
+
 	if typeLiveObject != nil {
 		p.TypeMap.T_LIVE_OBJECT = typeLiveObject.ID
 		p.bindLiveObject = types2.NewBindLiveObject(typeLiveObject, &p.TypeMap)
+	} else {
+		p.TypeMap.T_LIVE_OBJECT = -1
+		p.bindLiveObject = nil
 	}
+
 	if typeActiveSetting != nil {
 		p.TypeMap.T_ACTIVE_SETTING = typeActiveSetting.ID
 		p.bindActiveSetting = types2.NewBindActiveSetting(typeActiveSetting, &p.TypeMap)
+	} else {
+		p.TypeMap.T_ACTIVE_SETTING = -1
+		p.bindActiveSetting = nil
 	}
 
 	p.FrameTypes.IDMap = nil

diff --git a/parser/testdata/event-with-type-zero.jfr.gz b/parser/testdata/event-with-type-zero.jfr.gz
diff --git a/...stdata/event-with-type-zero_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/...stdata/event-with-type-zero_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/...nt-with-type-zero_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz b/...nt-with-type-zero_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/parser/testdata/event-with-type-zero_3_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/event-with-type-zero_3_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...er/testdata/event-with-type-zero_3_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz b/...er/testdata/event-with-type-zero_3_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz
diff --git a/parser/types/def/types.go b/parser/types/def/types.go
@@ -1,6 +1,6 @@
 package def
 
-type TypeID uint64
+type TypeID int64
 
 type TypeMap struct {
 	IDMap   map[TypeID]*Class

diff --git a/pprof/parser_test.go b/pprof/parser_test.go
@@ -45,6 +45,7 @@ var testfiles = []testdata{
 	{"dump2", "dump2.labels.pb.gz", 4},
 	{"dd-trace-java", "", 4},
 	{"cpool-uint64-constant-index", "", 4},
+	{"event-with-type-zero", "", 4},
 }
 
 type gprofile struct {