internal/pprof/profile: new package, moved from cmd/internal/pprof/profile

This allows both the runtime and the cmd/pprof code to use the package,
just like we do for internal/trace.

Change-Id: I7606977284e1def36c9647354c58e7c1e93dba6b
Reviewed-on: https://go-review.googlesource.com/32452
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/internal/pprof/driver/driver.go b/src/cmd/internal/pprof/driver/driver.go
index 8f6c7e1a9c64165f164e117ab53b2e4a6fd273c5..f3210723cdcf0fb73d5b0618d1212560395bfd13 100644 (file)
--- a/src/cmd/internal/pprof/driver/driver.go
+++ b/src/cmd/internal/pprof/driver/driver.go
@@ -23,9 +23,9 @@ import (
 
        "cmd/internal/pprof/commands"
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
        "cmd/internal/pprof/report"
        "cmd/internal/pprof/tempfile"
+       "internal/pprof/profile"
 )
 
 // PProf acquires a profile, and symbolizes it using a profile

diff --git a/src/cmd/internal/pprof/driver/interactive.go b/src/cmd/internal/pprof/driver/interactive.go
index 1b08226527fd657f4eb57ec6e427133394b87690..81df976fa1046a65af058d0a717c1c0ccfcc0d32 100644 (file)
--- a/src/cmd/internal/pprof/driver/interactive.go
+++ b/src/cmd/internal/pprof/driver/interactive.go
@@ -14,7 +14,7 @@ import (
 
        "cmd/internal/pprof/commands"
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 var profileFunctionNames = []string{}

diff --git a/src/cmd/internal/pprof/fetch/fetch.go b/src/cmd/internal/pprof/fetch/fetch.go
index ffd282e74da96ffb2e08b8d9b41d6e00bc052793..95d9be6aa26762d0f9f5965c63b10e069cde4712 100644 (file)
--- a/src/cmd/internal/pprof/fetch/fetch.go
+++ b/src/cmd/internal/pprof/fetch/fetch.go
@@ -17,7 +17,7 @@ import (
        "time"
 
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 // FetchProfile reads from a data source (network, file) and generates a

diff --git a/src/cmd/internal/pprof/plugin/plugin.go b/src/cmd/internal/pprof/plugin/plugin.go
index d5025d55171a2940b0e0ea253c7607096480a0d4..ff1e8adfaf631b0a696d12afe7daecaf2f752bbe 100644 (file)
--- a/src/cmd/internal/pprof/plugin/plugin.go
+++ b/src/cmd/internal/pprof/plugin/plugin.go
@@ -13,7 +13,7 @@ import (
        "strings"
        "time"
 
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 // A FlagSet creates and parses command-line flags.

diff --git a/src/cmd/internal/pprof/report/report.go b/src/cmd/internal/pprof/report/report.go
index 989665301f17313cd4fd1aede755927be377db64..4f5252b28e806d03cf79331bf199a93621c14574 100644 (file)
--- a/src/cmd/internal/pprof/report/report.go
+++ b/src/cmd/internal/pprof/report/report.go
@@ -18,7 +18,7 @@ import (
        "time"
 
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 // Generate generates a report as directed by the Report.

diff --git a/src/cmd/internal/pprof/symbolizer/symbolizer.go b/src/cmd/internal/pprof/symbolizer/symbolizer.go
index bc22800530beeb36e86ef3d0f3ea470f2d7b2a7b..d81f3eafafaef45cbdf768928f23caa1e30c42f9 100644 (file)
--- a/src/cmd/internal/pprof/symbolizer/symbolizer.go
+++ b/src/cmd/internal/pprof/symbolizer/symbolizer.go
@@ -14,7 +14,7 @@ import (
        "strings"
 
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 // Symbolize adds symbol and line number information to all locations

diff --git a/src/cmd/internal/pprof/symbolz/symbolz.go b/src/cmd/internal/pprof/symbolz/symbolz.go
index 2f2850afeb63760db0f484e6e1bf3c243826a1c8..6e58001962ab40d6667906f2474728311738efa5 100644 (file)
--- a/src/cmd/internal/pprof/symbolz/symbolz.go
+++ b/src/cmd/internal/pprof/symbolz/symbolz.go
@@ -15,7 +15,7 @@ import (
        "strconv"
        "strings"
 
-       "cmd/internal/pprof/profile"
+       "internal/pprof/profile"
 )
 
 var (

diff --git a/src/cmd/pprof/pprof.go b/src/cmd/pprof/pprof.go
index 0c979b183164704bac41a30a72656372876a292d..01f44566ba3d76872b3b2f1b61ce3f328feba035 100644 (file)
--- a/src/cmd/pprof/pprof.go
+++ b/src/cmd/pprof/pprof.go
@@ -19,9 +19,9 @@ import (
        "cmd/internal/pprof/driver"
        "cmd/internal/pprof/fetch"
        "cmd/internal/pprof/plugin"
-       "cmd/internal/pprof/profile"
        "cmd/internal/pprof/symbolizer"
        "cmd/internal/pprof/symbolz"
+       "internal/pprof/profile"
 )
 
 func main() {

diff --git a/src/cmd/trace/pprof.go b/src/cmd/trace/pprof.go
index 3bae15c60869e61456b8c2137328ff3b8c8599d2..dea3a749fccd587d94b22cc703ab4e6607642d97 100644 (file)
--- a/src/cmd/trace/pprof.go
+++ b/src/cmd/trace/pprof.go
@@ -8,8 +8,8 @@ package main
 
 import (
        "bufio"
-       "cmd/internal/pprof/profile"
        "fmt"
+       "internal/pprof/profile"
        "internal/trace"
        "io"
        "io/ioutil"

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index cb101abe7c3c15dbcba20003a71700b757ce5b1f..1314e551ea9e65d89fff432f1a2022cecbd188ff 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -257,6 +257,7 @@ var pkgDeps = map[string][]string{
        "index/suffixarray":        {"L4", "regexp"},
        "internal/singleflight":    {"sync"},
        "internal/trace":           {"L4", "OS"},
+       "internal/pprof/profile":   {"L4", "OS", "compress/gzip", "regexp"},
        "math/big":                 {"L4"},
        "mime":                     {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
        "mime/quotedprintable":     {"L4"},

diff --git a/src/cmd/internal/pprof/profile/encode.go b/src/internal/pprof/profile/encode.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/encode.go
rename to src/internal/pprof/profile/encode.go

diff --git a/src/cmd/internal/pprof/profile/filter.go b/src/internal/pprof/profile/filter.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/filter.go
rename to src/internal/pprof/profile/filter.go

diff --git a/src/cmd/internal/pprof/profile/legacy_profile.go b/src/internal/pprof/profile/legacy_profile.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/legacy_profile.go
rename to src/internal/pprof/profile/legacy_profile.go

diff --git a/src/cmd/internal/pprof/profile/profile.go b/src/internal/pprof/profile/profile.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/profile.go
rename to src/internal/pprof/profile/profile.go

diff --git a/src/cmd/internal/pprof/profile/profile_test.go b/src/internal/pprof/profile/profile_test.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/profile_test.go
rename to src/internal/pprof/profile/profile_test.go

diff --git a/src/cmd/internal/pprof/profile/proto.go b/src/internal/pprof/profile/proto.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/proto.go
rename to src/internal/pprof/profile/proto.go

diff --git a/src/cmd/internal/pprof/profile/proto_test.go b/src/internal/pprof/profile/proto_test.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/proto_test.go
rename to src/internal/pprof/profile/proto_test.go

diff --git a/src/cmd/internal/pprof/profile/prune.go b/src/internal/pprof/profile/prune.go
similarity index 100%
rename from src/cmd/internal/pprof/profile/prune.go
rename to src/internal/pprof/profile/prune.go