Merge pull request #33 from sivachandran/parse-char-array-string

Support parsing char array string in emitted code
grafana · Aug 15, 2024 · 4296f63 · 4296f63
2 parents 863b92b + 4d3234e
commit 4296f63
Show file tree

Hide file tree

Showing 30 changed files with 1,492 additions and 2 deletions.
diff --git a/gen/main.go b/gen/main.go
@@ -82,6 +82,7 @@ func main() {
 }
 
 func write(dst, s string) {
+
 	formattedSource, err := format.Source([]byte(s))
 	if err != nil {
 		panic(err)
@@ -514,9 +515,17 @@ func emitString() string {
 	res += "	}\n"
 
 	res += "	bs := data[pos : pos+int(v32_)]\n"
-	res += fmt.Sprintf("	s_ = *(*string)(unsafe.Pointer(&bs))\n")
-
+	res += "	s_ = *(*string)(unsafe.Pointer(&bs))\n"
 	res += "	pos += int(v32_)\n"
+	res += "case 4:\n"
+	res += emitReadI32()
+	res += "	bl := int(v32_)\n"
+	res += "	buf := make([]rune,bl)\n"
+	res += "	for i := 0; i < bl; i++ {\n"
+	res += emitReadI32()
+	res += "		buf[i] = rune(v32_)\n"
+	res += "	}\n"
+	res += "	s_ = string(buf)\n"
 	res += "default:\n"
 	res += "	return 0, fmt.Errorf(\"unknown string type %d at %d\", b_, pos)\n"
 	res += "}\n"

diff --git a/parser/testdata/dd-trace-java.jfr.gz b/parser/testdata/dd-trace-java.jfr.gz
diff --git a/parser/testdata/dd-trace-java_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/parser/testdata/dd-trace-java_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/...ata/dd-trace-java_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz b/...ata/dd-trace-java_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/dd-trace-java_3_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/dd-trace-java_3_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/dd-trace-java_3_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz b/parser/testdata/dd-trace-java_3_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/class.go b/parser/types/class.go