Allow clients to specify whether they want the heap

typed or not.

Author: randall77

gocore/object.go

@@ -180,6 +180,7 @@ func (p *Program) Size(x Object) int64 {
 
 // Type returns the type and repeat count for the object x.
 // x contains at least repeat copies of the returned type.
+// FlagTypes must have been passed to Core when p was constructed.
 func (p *Program) Type(x Object) (*Type, int64) {
 	i, _ := p.findObjectIndex(core.Address(x))
 	return p.types[i].Type, p.types[i].Repeat

gocore/parse.go

@@ -9,7 +9,8 @@ import (
 )
 
 // Core takes a loaded core file and extracts Go information from it.
-func Core(proc *core.Process) (p *Program, err error) {
+// flags is a bitmask of data that should be extracted from the core.
+func Core(proc *core.Process, flags Flags) (p *Program, err error) {
 	// Make sure we have DWARF info.
 	if _, err := proc.DWARF(); err != nil {
 		return nil, err
@@ -58,7 +59,9 @@ func Core(proc *core.Process) (p *Program, err error) {
 	p.readGs()
 	p.readStackVars()
 	p.readObjects()
-	p.typeHeap()
+	if flags&FlagTypes != 0 {
+		p.typeHeap()
+	}
 
 	return p, nil
 }

gocore/types.go

@@ -6,6 +6,12 @@ import (
 	"github.com/randall77/corelib/core"
 )
 
+type Flags uint8
+
+const (
+	FlagTypes Flags = 1 << iota
+)
+
 type Program struct {
 	proc *core.Process
 
@@ -48,7 +54,8 @@ type Program struct {
 
 	globals []*Root
 
-	// Information about objects, indexed by Object
+	// Types of each object, indexed by object index.
+	// Only initialized if FlagTypes is passed to Core.
 	types []typeInfo
 }
 

main.go

@@ -63,6 +63,28 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 
+	var flags gocore.Flags
+	switch cmd {
+	default:
+		fmt.Fprintf(os.Stderr, "%s: unknown command %s\n", os.Args[0], cmd)
+		fmt.Fprintf(os.Stderr, "Run 'corelib help' for usage.\n")
+		os.Exit(2)
+	case "overview":
+	case "mappings":
+	case "goroutines":
+	case "histogram":
+		flags = gocore.FlagTypes
+	case "breakdown":
+	case "objgraph":
+		flags = gocore.FlagTypes
+	case "objects":
+		flags = gocore.FlagTypes
+	case "reachable":
+		flags = gocore.FlagTypes
+	case "html":
+		flags = gocore.FlagTypes
+	}
+
 	// All commands other than "help" need a core file.
 	if len(args) < 2 {
 		fmt.Fprintf(os.Stderr, "%s: no core dump specified for command %s\n", os.Args[0], cmd)
@@ -75,7 +97,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	c, err := gocore.Core(p)
+	c, err := gocore.Core(p, flags)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)