cmd/pprof/internal: move to cmd/internal/pprof

Make internal pprof packages available to cmd/trace.
cmd/trace needs access to them to generate symbolized
svg profiles (create and serialize Profile struct).
And potentially generate svg programmatically instead
of invoking go tool pprof.

Change-Id: Iafd0c87ffdd4ddc081093be0b39761f19507907a
Reviewed-on: https://go-review.googlesource.com/21870
Run-TryBot: Dmitry Vyukov <dvyukov@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/pprof/internal/commands/commands.go b/src/cmd/internal/pprof/commands/commands.go
similarity index 98%
rename from src/cmd/pprof/internal/commands/commands.go
rename to src/cmd/internal/pprof/commands/commands.go
index 9aeee5762e83ec72c0614219018daf643010cd52..5018c02af185e78caebfb0b5202e1293bd76f113 100644 (file)
--- a/src/cmd/pprof/internal/commands/commands.go
+++ b/src/cmd/internal/pprof/commands/commands.go
@@ -16,10 +16,10 @@ import (
        "strings"
        "time"
 
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/report"
-       "cmd/pprof/internal/svg"
-       "cmd/pprof/internal/tempfile"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/report"
+       "cmd/internal/pprof/svg"
+       "cmd/internal/pprof/tempfile"
 )
 
 // Commands describes the commands accepted by pprof.

diff --git a/src/cmd/pprof/internal/driver/driver.go b/src/cmd/internal/pprof/driver/driver.go
similarity index 99%
rename from src/cmd/pprof/internal/driver/driver.go
rename to src/cmd/internal/pprof/driver/driver.go
index 7cd1ddc9281a9da8ca4230f94501f6ec637accc1..782acfdf321a68b4afe6a098c36af8448e99428e 100644 (file)
--- a/src/cmd/pprof/internal/driver/driver.go
+++ b/src/cmd/internal/pprof/driver/driver.go
@@ -21,11 +21,11 @@ import (
        "sync"
        "time"
 
-       "cmd/pprof/internal/commands"
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
-       "cmd/pprof/internal/report"
-       "cmd/pprof/internal/tempfile"
+       "cmd/internal/pprof/commands"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
+       "cmd/internal/pprof/report"
+       "cmd/internal/pprof/tempfile"
 )
 
 // PProf acquires a profile, and symbolizes it using a profile

diff --git a/src/cmd/pprof/internal/driver/interactive.go b/src/cmd/internal/pprof/driver/interactive.go
similarity index 99%
rename from src/cmd/pprof/internal/driver/interactive.go
rename to src/cmd/internal/pprof/driver/interactive.go
index 13009bf7e9f66a8b32bf8b2f4d52470e49d90d76..1b08226527fd657f4eb57ec6e427133394b87690 100644 (file)
--- a/src/cmd/pprof/internal/driver/interactive.go
+++ b/src/cmd/internal/pprof/driver/interactive.go
@@ -12,9 +12,9 @@ import (
        "strconv"
        "strings"
 
-       "cmd/pprof/internal/commands"
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
+       "cmd/internal/pprof/commands"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
 )
 
 var profileFunctionNames = []string{}

diff --git a/src/cmd/pprof/internal/fetch/fetch.go b/src/cmd/internal/pprof/fetch/fetch.go
similarity index 97%
rename from src/cmd/pprof/internal/fetch/fetch.go
rename to src/cmd/internal/pprof/fetch/fetch.go
index ec4a6383c6fda0c0e12141e0b615e3c039d8134b..ffd282e74da96ffb2e08b8d9b41d6e00bc052793 100644 (file)
--- a/src/cmd/pprof/internal/fetch/fetch.go
+++ b/src/cmd/internal/pprof/fetch/fetch.go
@@ -16,8 +16,8 @@ import (
        "strings"
        "time"
 
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
 )
 
 // FetchProfile reads from a data source (network, file) and generates a

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

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

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

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

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

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

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

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

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

diff --git a/src/cmd/pprof/internal/report/report.go b/src/cmd/internal/pprof/report/report.go
similarity index 99%
rename from src/cmd/pprof/internal/report/report.go
rename to src/cmd/internal/pprof/report/report.go
index 86bd4a280b2ea5ac285a982e220ab50431d38a42..c492b752b96fbb66271aaa4f644ef3500974b729 100644 (file)
--- a/src/cmd/pprof/internal/report/report.go
+++ b/src/cmd/internal/pprof/report/report.go
@@ -17,8 +17,8 @@ import (
        "strings"
        "time"
 
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
 )
 
 // Generate generates a report as directed by the Report.

diff --git a/src/cmd/pprof/internal/report/source.go b/src/cmd/internal/pprof/report/source.go
similarity index 99%
rename from src/cmd/pprof/internal/report/source.go
rename to src/cmd/internal/pprof/report/source.go
index 908be21424f3cd95af306dfeae955ed74f2fa32f..7beea395629fd69aba5b2207e118087e0be9f185 100644 (file)
--- a/src/cmd/pprof/internal/report/source.go
+++ b/src/cmd/internal/pprof/report/source.go
@@ -18,7 +18,7 @@ import (
        "strconv"
        "strings"
 
-       "cmd/pprof/internal/plugin"
+       "cmd/internal/pprof/plugin"
 )
 
 // printSource prints an annotated source listing, include all

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

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

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

diff --git a/src/cmd/pprof/internal/symbolizer/symbolizer.go b/src/cmd/internal/pprof/symbolizer/symbolizer.go
similarity index 98%
rename from src/cmd/pprof/internal/symbolizer/symbolizer.go
rename to src/cmd/internal/pprof/symbolizer/symbolizer.go
index 86de5640d29ca920cae1d9c91c6b9593f48bf431..bc22800530beeb36e86ef3d0f3ea470f2d7b2a7b 100644 (file)
--- a/src/cmd/pprof/internal/symbolizer/symbolizer.go
+++ b/src/cmd/internal/pprof/symbolizer/symbolizer.go
@@ -13,8 +13,8 @@ import (
        "path/filepath"
        "strings"
 
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
 )
 
 // Symbolize adds symbol and line number information to all locations

diff --git a/src/cmd/pprof/internal/symbolz/symbolz.go b/src/cmd/internal/pprof/symbolz/symbolz.go
similarity index 98%
rename from src/cmd/pprof/internal/symbolz/symbolz.go
rename to src/cmd/internal/pprof/symbolz/symbolz.go
index 15b3b6df26049d2ff67a499e1be3d069e134e189..2f2850afeb63760db0f484e6e1bf3c243826a1c8 100644 (file)
--- a/src/cmd/pprof/internal/symbolz/symbolz.go
+++ b/src/cmd/internal/pprof/symbolz/symbolz.go
@@ -15,7 +15,7 @@ import (
        "strconv"
        "strings"
 
-       "cmd/pprof/internal/profile"
+       "cmd/internal/pprof/profile"
 )
 
 var (

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

diff --git a/src/cmd/pprof/pprof.go b/src/cmd/pprof/pprof.go
index 1c55d05d5d4f5c1efe4ddc640707e36b3ec47395..bce37dcb97199f0692cc0343d7023b431245ca0e 100644 (file)
--- a/src/cmd/pprof/pprof.go
+++ b/src/cmd/pprof/pprof.go
@@ -15,13 +15,13 @@ import (
        "sync"
 
        "cmd/internal/objfile"
-       "cmd/pprof/internal/commands"
-       "cmd/pprof/internal/driver"
-       "cmd/pprof/internal/fetch"
-       "cmd/pprof/internal/plugin"
-       "cmd/pprof/internal/profile"
-       "cmd/pprof/internal/symbolizer"
-       "cmd/pprof/internal/symbolz"
+       "cmd/internal/pprof/commands"
+       "cmd/internal/pprof/driver"
+       "cmd/internal/pprof/fetch"
+       "cmd/internal/pprof/plugin"
+       "cmd/internal/pprof/profile"
+       "cmd/internal/pprof/symbolizer"
+       "cmd/internal/pprof/symbolz"
 )
 
 func main() {