feat: parse line numbers to pprof

gen/main.go

@@ -18,7 +18,7 @@ func main() {
 	}))
 	write("types/stackframe.go", generate(&Type_jdk_types_StackFrame, options{
 		skipFields: []string{
-			"lineNumber", "bytecodeIndex", "type",
+			"bytecodeIndex", "type",
 		},
 		cpool: false,
 	}))
@@ -42,7 +42,6 @@ func main() {
 	write("types/method.go", generate(&Type_jdk_types_Method, options{
 		cpool:     true,
 		sortedIDs: true,
-		Scratch:   true,
 		skipFields: []string{
 			"hidden",
 			"descriptor",
@@ -91,7 +90,6 @@ func write(dst, s string) {
 type options struct {
 	cpool         bool
 	sortedIDs     bool
-	Scratch       bool
 	doNotKeepData bool
 	skipFields    []string //todo make skip fields runtime option, but still saving memory - explode struct to fields
 }
@@ -157,9 +155,7 @@ func generate(typ *def.Class, opt options) string {
 			}
 		}
 	}
-	if opt.Scratch {
-		res += fmt.Sprintf("	Scratch []byte\n")
-	}
+
 	res += fmt.Sprintf("}\n\n")
 	res += fmt.Sprintf("\n")
 
@@ -506,6 +502,7 @@ func emitString(depth int) string {
 	res += pad(depth) + "pos++\n"
 	res += pad(depth) + "switch b_ {\n"
 	res += pad(depth) + "case 0:\n"
+	res += pad(depth) + "	break\n"
 	res += pad(depth) + "case 1:\n"
 	res += pad(depth) + "	break\n"
 	res += pad(depth) + "case 3:\n"

go.work

@@ -1,6 +1,6 @@
 go 1.21
 
 use (
-.
-./pprof
-)
+	.
+	./pprof
+)

go.work.sum

@@ -1,16 +1,39 @@
+connectrpc.com/connect v1.14.0 h1:PDS+J7uoz5Oui2VEOMcfz6Qft7opQM9hPiKvtGC01pA=
+connectrpc.com/connect v1.14.0/go.mod h1:uoAq5bmhhn43TwhaKdGKN/bZcGtzPW1v+ngDTn5u+8s=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg=
 github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw=
+github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
+github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
+github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
+github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
+github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
+github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab h1:BA4a7pe6ZTd9F8kXETBoijjFJ/ntaa//1wiH9BZu4zU=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
@@ -23,18 +46,27 @@ github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwa
 github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8=
 google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
 google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
 google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=

parser/cpool.go

@@ -8,68 +8,78 @@ import (
 )
 
 func (p *Parser) readConstantPool(pos int) error {
-	if err := p.seek(pos); err != nil {
-		return err
-	}
-	sz, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	typ, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	startTimeTicks, err := p.varLong()
-	if err != nil {
-		return err
-	}
-	duration, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	delta, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	typeMask, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	n, err := p.varInt()
-	if err != nil {
-		return err
-	}
-	//fmt.Printf("ConstantPool: size %d type %d startTimeTicks %d duration %d delta %d typeMask %d n %d\n", sz, typ, startTimeTicks, duration, delta, typeMask, n)
-	_ = startTimeTicks
-	_ = duration
-	_ = delta
-	_ = sz
-
-	if typeMask != 1 {
-		return fmt.Errorf("expected ConstantPool typeMask 1, got %d", typeMask)
-	}
-	//if n != 9 {
-	//	return fmt.Errorf("expected ConstantPool n 9, got %d", n)
-	//}
-	for i := 0; i < int(n); i++ {
-		typ, err = p.varInt()
+	for {
+		if err := p.seek(pos); err != nil {
+			return err
+		}
+		sz, err := p.varLong()
 		if err != nil {
 			return err
 		}
-		c := p.TypeMap.IDMap[def.TypeID(typ)]
-		if c == nil {
-			return fmt.Errorf("unknown type %d", def.TypeID(typ))
+		typ, err := p.varLong()
+		if err != nil {
+			return err
+		}
+		startTimeTicks, err := p.varLong()
+		if err != nil {
+			return err
+		}
+		duration, err := p.varLong()
+		if err != nil {
+			return err
+		}
+		delta, err := p.varLong()
+		if err != nil {
+			return err
 		}
-		err = p.readConstants(c)
+		typeMask, err := p.varInt() // boolean flush
 		if err != nil {
-			return fmt.Errorf("error reading %+v %w", c, err)
+			return err
+		}
+		n, err := p.varInt()
+		if err != nil {
+			return err
+		}
+		_ = startTimeTicks
+		_ = duration
+		_ = delta
+		_ = sz
+		_ = typeMask
+		_ = typ
+
+		id := int(int64(delta))
+
+		for i := 0; i < int(n); i++ {
+			typ, err := p.varLong()
+			if err != nil {
+				return err
+			}
+			c := p.TypeMap.IDMap[def.TypeID(typ)]
+			if c == nil {
+				return fmt.Errorf("unknown type %d", def.TypeID(typ))
+			}
+			err = p.readConstants(c)
+			if err != nil {
+				return fmt.Errorf("error reading %+v %w", c, err)
+			}
+		}
+		if delta == 0 {
+			break
+		} else {
+			pos += id
+			if pos <= 0 {
+				break
+			}
 		}
 	}
 	return nil
 }
 
 func (p *Parser) readConstants(c *def.Class) error {
 	switch c.Name {
+	case "jdk.types.ChunkHeader":
+		p.pos += chunkHeaderSize
+		return nil
 	case "jdk.types.FrameType":
 		o, err := p.FrameTypes.Parse(p.buf[p.pos:], p.bindFrameType, &p.TypeMap)
 		p.pos += o
@@ -99,6 +109,9 @@ func (p *Parser) readConstants(c *def.Class) error {
 		p.pos += o
 		return err
 	case "profiler.types.LogLevel":
+		if p.bindLogLevel == nil {
+			return fmt.Errorf("no \"profiler.types.LogLevel\"")
+		}
 		o, err := p.LogLevels.Parse(p.buf[p.pos:], p.bindLogLevel, &p.TypeMap)
 		p.pos += o
 		return err

parser/header.go

@@ -38,12 +38,7 @@ func (p *Parser) readChunkHeader(pos int) error {
 	if p.options.ChunkSizeLimit > 0 && h.Size > p.options.ChunkSizeLimit {
 		return fmt.Errorf("chunk size %d exceeds limit %d", h.Size, p.options.ChunkSizeLimit)
 	}
-	if h.Features != 1 {
-		return fmt.Errorf("unsupported features %d", h.Features)
-	}
 	p.header = h
 	p.chunkEnd = pos + h.Size
-	//fmt.Printf("Chunk header: %s\n", h.String())
-
 	return nil
 }

parser/parser.go

@@ -105,14 +105,14 @@ func (p *Parser) ParseEvent() (def.TypeID, error) {
 			}
 		}
 		pp := p.pos
-		size, err := p.varInt()
+		size, err := p.varLong()
 		if err != nil {
 			return 0, err
 		}
 		if size == 0 {
 			return 0, def.ErrIntOverflow
 		}
-		typ, err := p.varInt()
+		typ, err := p.varLong()
 		if err != nil {
 			return 0, err
 		}
@@ -272,13 +272,13 @@ func (p *Parser) readChunk(pos int) error {
 		return fmt.Errorf("error reading metadata: %w", err)
 	}
 	if err := p.readConstantPool(pos + p.header.OffsetConstantPool); err != nil {
-		return fmt.Errorf("error reading CP: %w", err)
+		return fmt.Errorf("error reading CP: %w @ %d", err, pos+p.header.OffsetConstantPool)
 	}
 	pp := p.options.SymbolProcessor
 	if pp != nil {
 		pp(&p.Symbols)
 	}
-	p.pos = pos + chunkHeaderSize + int(p.metaSize)
+	p.pos = pos + chunkHeaderSize
 	return nil
 }
 
@@ -344,7 +344,7 @@ func (p *Parser) string() (string, error) {
 	}
 	b := p.buf[p.pos]
 	p.pos++
-	switch b {
+	switch b { //todo implement 2
 	case 0:
 		return "", nil //todo this should be nil
 	case 1:
@@ -356,12 +356,35 @@ func (p *Parser) string() (string, error) {
 		}
 		str := *(*string)(unsafe.Pointer(&bs))
 		return str, nil
+	case 4:
+		return p.charArrayString()
 	default:
 		return "", fmt.Errorf("unknown string type %d", b)
 	}
 
 }
 
+func (p *Parser) charArrayString() (string, error) {
+	l, err := p.varInt()
+	if err != nil {
+		return "", err
+	}
+	if l < 0 {
+		return "", def.ErrIntOverflow
+	}
+	buf := make([]rune, int(l))
+	for i := 0; i < int(l); i++ {
+		c, err := p.varInt()
+		if err != nil {
+			return "", err
+		}
+		buf[i] = rune(c)
+	}
+
+	res := string(buf)
+	return res, nil
+}
+
 func (p *Parser) bytes() ([]byte, error) {
 	l, err := p.varInt()
 	if err != nil {
@@ -439,9 +462,6 @@ func (p *Parser) checkTypes() error {
 	if typeCPSymbol == nil {
 		return fmt.Errorf("missing \"jdk.types.Symbol\"")
 	}
-	if typeCPLogLevel == nil {
-		return fmt.Errorf("missing \"profiler.types.LogLevel\"")
-	}
 	if typeCPStackTrace == nil {
 		return fmt.Errorf("missing \"jdk.types.StackTrace\"")
 	}
@@ -455,7 +475,11 @@ func (p *Parser) checkTypes() error {
 	p.TypeMap.T_METHOD = typeCPMethod.ID
 	p.TypeMap.T_PACKAGE = typeCPPackage.ID
 	p.TypeMap.T_SYMBOL = typeCPSymbol.ID
-	p.TypeMap.T_LOG_LEVEL = typeCPLogLevel.ID
+	if typeCPLogLevel != nil {
+		p.TypeMap.T_LOG_LEVEL = typeCPLogLevel.ID
+	} else {
+		p.TypeMap.T_LOG_LEVEL = 0
+	}
 	p.TypeMap.T_STACK_TRACE = typeCPStackTrace.ID
 	p.TypeMap.T_CLASS_LOADER = typeCPClassLoader.ID
 
@@ -473,7 +497,11 @@ func (p *Parser) checkTypes() error {
 	p.bindMethod = types2.NewBindMethod(typeCPMethod, &p.TypeMap)
 	p.bindPackage = types2.NewBindPackage(typeCPPackage, &p.TypeMap)
 	p.bindSymbol = types2.NewBindSymbol(typeCPSymbol, &p.TypeMap)
-	p.bindLogLevel = types2.NewBindLogLevel(typeCPLogLevel, &p.TypeMap)
+	if typeCPLogLevel != nil {
+		p.bindLogLevel = types2.NewBindLogLevel(typeCPLogLevel, &p.TypeMap)
+	} else {
+		p.bindLogLevel = nil
+	}
 	p.bindStackTrace = types2.NewBindStackTrace(typeCPStackTrace, &p.TypeMap)
 	p.bindStackFrame = types2.NewBindStackFrame(typeStackFrame, &p.TypeMap)