From f654b7b71eac904ba59bfbc4958048301995bce1 Mon Sep 17 00:00:00 2001
From: Jess Valarezo <valarezo.jessica@gmail.com>
Date: Sun, 29 Oct 2017 21:03:21 -0400
Subject: [PATCH] ctr: move pprof to commands package

Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
---
 cmd/ctr/{ => commands/pprof}/pprof.go         | 11 ++++++-----
 cmd/ctr/{ => commands/pprof}/pprof_unix.go    |  2 +-
 cmd/ctr/{ => commands/pprof}/pprof_windows.go |  2 +-
 cmd/ctr/main.go                               |  3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename cmd/ctr/{ => commands/pprof}/pprof.go (95%)
 rename cmd/ctr/{ => commands/pprof}/pprof_unix.go (94%)
 rename cmd/ctr/{ => commands/pprof}/pprof_windows.go (95%)

diff --git a/cmd/ctr/pprof.go b/cmd/ctr/commands/pprof/pprof.go
similarity index 95%
rename from cmd/ctr/pprof.go
rename to cmd/ctr/commands/pprof/pprof.go
index 68e232480..8192d1135 100644
--- a/cmd/ctr/pprof.go
+++ b/cmd/ctr/commands/pprof/pprof.go
@@ -1,4 +1,4 @@
-package main
+package pprof
 
 import (
 	"fmt"
@@ -17,7 +17,8 @@ type pprofDialer struct {
 	addr  string
 }
 
-var pprofCommand = cli.Command{
+// Command is the cli command for providing golang pprof outputs for containerd
+var Command = cli.Command{
 	Name:  "pprof",
 	Usage: "provide golang pprof outputs for containerd",
 	Flags: []cli.Flag{
@@ -28,12 +29,12 @@ var pprofCommand = cli.Command{
 		},
 	},
 	Subcommands: []cli.Command{
+		pprofBlockCommand,
 		pprofGoroutinesCommand,
 		pprofHeapCommand,
 		pprofProfileCommand,
-		pprofTraceCommand,
-		pprofBlockCommand,
 		pprofThreadcreateCommand,
+		pprofTraceCommand,
 	},
 }
 
@@ -91,7 +92,7 @@ var pprofTraceCommand = cli.Command{
 	Flags: []cli.Flag{
 		cli.DurationFlag{
 			Name:  "seconds,s",
-			Usage: "Trace time (seconds)",
+			Usage: "trace time (seconds)",
 			Value: time.Duration(5 * time.Second),
 		},
 	},
diff --git a/cmd/ctr/pprof_unix.go b/cmd/ctr/commands/pprof/pprof_unix.go
similarity index 94%
rename from cmd/ctr/pprof_unix.go
rename to cmd/ctr/commands/pprof/pprof_unix.go
index 009b5da5e..5d22e3edd 100644
--- a/cmd/ctr/pprof_unix.go
+++ b/cmd/ctr/commands/pprof/pprof_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package main
+package pprof
 
 import "net"
 
diff --git a/cmd/ctr/pprof_windows.go b/cmd/ctr/commands/pprof/pprof_windows.go
similarity index 95%
rename from cmd/ctr/pprof_windows.go
rename to cmd/ctr/commands/pprof/pprof_windows.go
index c7bacebee..c59c175fe 100644
--- a/cmd/ctr/pprof_windows.go
+++ b/cmd/ctr/commands/pprof/pprof_windows.go
@@ -1,4 +1,4 @@
-package main
+package pprof
 
 import (
 	"net"
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index 1aca65ea0..3b96a0413 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -12,6 +12,7 @@ import (
 	"github.com/containerd/containerd/cmd/ctr/commands/images"
 	namespacesCmd "github.com/containerd/containerd/cmd/ctr/commands/namespaces"
 	"github.com/containerd/containerd/cmd/ctr/commands/plugins"
+	"github.com/containerd/containerd/cmd/ctr/commands/pprof"
 	"github.com/containerd/containerd/cmd/ctr/commands/run"
 	"github.com/containerd/containerd/cmd/ctr/commands/snapshot"
 	"github.com/containerd/containerd/cmd/ctr/commands/tasks"
@@ -81,7 +82,7 @@ containerd CLI
 		events.Command,
 		images.Command,
 		namespacesCmd.Command,
-		pprofCommand,
+		pprof.Command,
 		run.Command,
 		snapshot.Command,
 		tasks.Command,