From 53f0d24057eaddda2ed8d8ee4fa5fb831f10d01d Mon Sep 17 00:00:00 2001 From: Derek Parker Date: Wed, 8 Feb 2017 08:00:44 -0800 Subject: [PATCH] Move top-level packages into pkg --- cmd/dlv/cmds/commands.go | 6 +++--- cmd/dlv/dlv_test.go | 2 +- cmd/dlv/main.go | 2 +- {config => pkg/config}/config.go | 0 {dwarf => pkg/dwarf}/frame/entries.go | 0 {dwarf => pkg/dwarf}/frame/entries_test.go | 0 {dwarf => pkg/dwarf}/frame/expression_constants.go | 0 {dwarf => pkg/dwarf}/frame/parser.go | 2 +- {dwarf => pkg/dwarf}/frame/parser_test.go | 2 +- {dwarf => pkg/dwarf}/frame/table.go | 2 +- {dwarf => pkg/dwarf}/frame/testdata/frame | Bin {dwarf => pkg/dwarf}/line/line_parser.go | 2 +- {dwarf => pkg/dwarf}/line/line_parser_test.go | 2 +- {dwarf => pkg/dwarf}/line/state_machine.go | 2 +- {dwarf => pkg/dwarf}/op/op.go | 2 +- {dwarf => pkg/dwarf}/op/op_test.go | 0 {dwarf => pkg/dwarf}/reader/reader.go | 2 +- {dwarf => pkg/dwarf}/util/util.go | 0 {dwarf => pkg/dwarf}/util/util_test.go | 0 {proc => pkg/proc}/arch.go | 0 {proc => pkg/proc}/breakpoints.go | 0 {proc => pkg/proc}/disasm.go | 0 {proc => pkg/proc}/disasm_amd64.go | 0 {proc => pkg/proc}/doc.go | 0 {proc => pkg/proc}/eval.go | 2 +- {proc => pkg/proc}/exc.h | 0 {proc => pkg/proc}/exc_user_darwin.c | 0 {proc => pkg/proc}/exec_darwin.c | 0 {proc => pkg/proc}/exec_darwin.h | 0 {proc => pkg/proc}/go_version.go | 0 {proc => pkg/proc}/mach_exc.defs | 0 {proc => pkg/proc}/mach_exc.h | 0 {proc => pkg/proc}/mach_exc_user_darwin.c | 0 {proc => pkg/proc}/mem.go | 0 {proc => pkg/proc}/moduledata.go | 0 {proc => pkg/proc}/proc.go | 6 +++--- {proc => pkg/proc}/proc_darwin.c | 0 {proc => pkg/proc}/proc_darwin.go | 4 ++-- {proc => pkg/proc}/proc_darwin.h | 0 {proc => pkg/proc}/proc_linux.go | 4 ++-- {proc => pkg/proc}/proc_test.go | 4 ++-- {proc => pkg/proc}/proc_unix_test.go | 2 +- {proc => pkg/proc}/proc_windows.go | 4 ++-- {proc => pkg/proc}/ptrace_darwin.go | 0 {proc => pkg/proc}/ptrace_linux.go | 0 {proc => pkg/proc}/ptrace_windows.go | 0 {proc => pkg/proc}/registers.go | 0 {proc => pkg/proc}/registers_darwin_amd64.go | 0 {proc => pkg/proc}/registers_linux_amd64.go | 0 {proc => pkg/proc}/registers_windows_amd64.go | 0 {proc => pkg/proc}/stack.go | 2 +- {proc => pkg/proc}/syscall_windows.go | 0 {proc => pkg/proc}/syscall_windows_amd64.go | 0 {proc => pkg/proc}/test/support.go | 0 {proc => pkg/proc}/threads.go | 0 {proc => pkg/proc}/threads_darwin.c | 0 {proc => pkg/proc}/threads_darwin.go | 0 {proc => pkg/proc}/threads_darwin.h | 0 {proc => pkg/proc}/threads_linux.go | 0 {proc => pkg/proc}/threads_windows.go | 0 {proc => pkg/proc}/types.go | 2 +- {proc => pkg/proc}/variables.go | 4 ++-- {proc => pkg/proc}/zsyscall_windows.go | 0 pkg/target/target.go | 2 +- {terminal => pkg/terminal}/command.go | 0 {terminal => pkg/terminal}/command_test.go | 2 +- {terminal => pkg/terminal}/disasmprint.go | 0 {terminal => pkg/terminal}/docgen.go | 0 {terminal => pkg/terminal}/terminal.go | 2 +- {terminal => pkg/terminal}/terminal_other.go | 0 {terminal => pkg/terminal}/terminal_test.go | 2 +- {terminal => pkg/terminal}/terminal_windows.go | 0 {version => pkg/version}/version.go | 0 service/api/conversions.go | 3 ++- service/api/types.go | 2 +- service/debugger/debugger.go | 2 +- service/debugger/locations.go | 2 +- service/debugger/locations_test.go | 12 ++++++------ service/rpc1/server.go | 2 +- service/rpccommon/server.go | 2 +- service/test/integration1_test.go | 4 ++-- service/test/integration2_test.go | 4 ++-- service/test/variables_test.go | 4 ++-- 83 files changed, 53 insertions(+), 52 deletions(-) rename {config => pkg/config}/config.go (100%) rename {dwarf => pkg/dwarf}/frame/entries.go (100%) rename {dwarf => pkg/dwarf}/frame/entries_test.go (100%) rename {dwarf => pkg/dwarf}/frame/expression_constants.go (100%) rename {dwarf => pkg/dwarf}/frame/parser.go (98%) rename {dwarf => pkg/dwarf}/frame/parser_test.go (90%) rename {dwarf => pkg/dwarf}/frame/table.go (99%) rename {dwarf => pkg/dwarf}/frame/testdata/frame (100%) rename {dwarf => pkg/dwarf}/line/line_parser.go (98%) rename {dwarf => pkg/dwarf}/line/line_parser_test.go (97%) rename {dwarf => pkg/dwarf}/line/state_machine.go (99%) rename {dwarf => pkg/dwarf}/op/op.go (97%) rename {dwarf => pkg/dwarf}/op/op_test.go (100%) rename {dwarf => pkg/dwarf}/reader/reader.go (99%) rename {dwarf => pkg/dwarf}/util/util.go (100%) rename {dwarf => pkg/dwarf}/util/util_test.go (100%) rename {proc => pkg/proc}/arch.go (100%) rename {proc => pkg/proc}/breakpoints.go (100%) rename {proc => pkg/proc}/disasm.go (100%) rename {proc => pkg/proc}/disasm_amd64.go (100%) rename {proc => pkg/proc}/doc.go (100%) rename {proc => pkg/proc}/eval.go (99%) rename {proc => pkg/proc}/exc.h (100%) rename {proc => pkg/proc}/exc_user_darwin.c (100%) rename {proc => pkg/proc}/exec_darwin.c (100%) rename {proc => pkg/proc}/exec_darwin.h (100%) rename {proc => pkg/proc}/go_version.go (100%) rename {proc => pkg/proc}/mach_exc.defs (100%) rename {proc => pkg/proc}/mach_exc.h (100%) rename {proc => pkg/proc}/mach_exc_user_darwin.c (100%) rename {proc => pkg/proc}/mem.go (100%) rename {proc => pkg/proc}/moduledata.go (100%) rename {proc => pkg/proc}/proc.go (99%) rename {proc => pkg/proc}/proc_darwin.c (100%) rename {proc => pkg/proc}/proc_darwin.go (99%) rename {proc => pkg/proc}/proc_darwin.h (100%) rename {proc => pkg/proc}/proc_linux.go (99%) rename {proc => pkg/proc}/proc_test.go (99%) rename {proc => pkg/proc}/proc_unix_test.go (91%) rename {proc => pkg/proc}/proc_windows.go (99%) rename {proc => pkg/proc}/ptrace_darwin.go (100%) rename {proc => pkg/proc}/ptrace_linux.go (100%) rename {proc => pkg/proc}/ptrace_windows.go (100%) rename {proc => pkg/proc}/registers.go (100%) rename {proc => pkg/proc}/registers_darwin_amd64.go (100%) rename {proc => pkg/proc}/registers_linux_amd64.go (100%) rename {proc => pkg/proc}/registers_windows_amd64.go (100%) rename {proc => pkg/proc}/stack.go (99%) rename {proc => pkg/proc}/syscall_windows.go (100%) rename {proc => pkg/proc}/syscall_windows_amd64.go (100%) rename {proc => pkg/proc}/test/support.go (100%) rename {proc => pkg/proc}/threads.go (100%) rename {proc => pkg/proc}/threads_darwin.c (100%) rename {proc => pkg/proc}/threads_darwin.go (100%) rename {proc => pkg/proc}/threads_darwin.h (100%) rename {proc => pkg/proc}/threads_linux.go (100%) rename {proc => pkg/proc}/threads_windows.go (100%) rename {proc => pkg/proc}/types.go (99%) rename {proc => pkg/proc}/variables.go (99%) rename {proc => pkg/proc}/zsyscall_windows.go (100%) rename {terminal => pkg/terminal}/command.go (100%) rename {terminal => pkg/terminal}/command_test.go (99%) rename {terminal => pkg/terminal}/disasmprint.go (100%) rename {terminal => pkg/terminal}/docgen.go (100%) rename {terminal => pkg/terminal}/terminal.go (99%) rename {terminal => pkg/terminal}/terminal_other.go (100%) rename {terminal => pkg/terminal}/terminal_test.go (98%) rename {terminal => pkg/terminal}/terminal_windows.go (100%) rename {version => pkg/version}/version.go (100%) diff --git a/cmd/dlv/cmds/commands.go b/cmd/dlv/cmds/commands.go index 548f0112..ae8d757f 100644 --- a/cmd/dlv/cmds/commands.go +++ b/cmd/dlv/cmds/commands.go @@ -14,13 +14,13 @@ import ( "syscall" "unicode" - "github.com/derekparker/delve/config" + "github.com/derekparker/delve/pkg/config" + "github.com/derekparker/delve/pkg/terminal" + "github.com/derekparker/delve/pkg/version" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/rpc2" "github.com/derekparker/delve/service/rpccommon" - "github.com/derekparker/delve/terminal" - "github.com/derekparker/delve/version" "github.com/spf13/cobra" ) diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go index da53019d..472cd741 100644 --- a/cmd/dlv/dlv_test.go +++ b/cmd/dlv/dlv_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" "github.com/derekparker/delve/service/rpc2" ) diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go index d44367dd..458084e2 100644 --- a/cmd/dlv/main.go +++ b/cmd/dlv/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/derekparker/delve/cmd/dlv/cmds" - "github.com/derekparker/delve/version" + "github.com/derekparker/delve/pkg/version" ) // Build is the git sha of this binaries build. diff --git a/config/config.go b/pkg/config/config.go similarity index 100% rename from config/config.go rename to pkg/config/config.go diff --git a/dwarf/frame/entries.go b/pkg/dwarf/frame/entries.go similarity index 100% rename from dwarf/frame/entries.go rename to pkg/dwarf/frame/entries.go diff --git a/dwarf/frame/entries_test.go b/pkg/dwarf/frame/entries_test.go similarity index 100% rename from dwarf/frame/entries_test.go rename to pkg/dwarf/frame/entries_test.go diff --git a/dwarf/frame/expression_constants.go b/pkg/dwarf/frame/expression_constants.go similarity index 100% rename from dwarf/frame/expression_constants.go rename to pkg/dwarf/frame/expression_constants.go diff --git a/dwarf/frame/parser.go b/pkg/dwarf/frame/parser.go similarity index 98% rename from dwarf/frame/parser.go rename to pkg/dwarf/frame/parser.go index 08018a64..9afa5a2f 100644 --- a/dwarf/frame/parser.go +++ b/pkg/dwarf/frame/parser.go @@ -7,7 +7,7 @@ import ( "bytes" "encoding/binary" - "github.com/derekparker/delve/dwarf/util" + "github.com/derekparker/delve/pkg/dwarf/util" ) type parsefunc func(*parseContext) parsefunc diff --git a/dwarf/frame/parser_test.go b/pkg/dwarf/frame/parser_test.go similarity index 90% rename from dwarf/frame/parser_test.go rename to pkg/dwarf/frame/parser_test.go index a39202f2..fa0c333e 100644 --- a/dwarf/frame/parser_test.go +++ b/pkg/dwarf/frame/parser_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/davecheney/profile" - "github.com/derekparker/delve/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/frame" ) func BenchmarkParse(b *testing.B) { diff --git a/dwarf/frame/table.go b/pkg/dwarf/frame/table.go similarity index 99% rename from dwarf/frame/table.go rename to pkg/dwarf/frame/table.go index 6b999652..03788f78 100644 --- a/dwarf/frame/table.go +++ b/pkg/dwarf/frame/table.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "fmt" - "github.com/derekparker/delve/dwarf/util" + "github.com/derekparker/delve/pkg/dwarf/util" ) type CurrentFrameAddress struct { diff --git a/dwarf/frame/testdata/frame b/pkg/dwarf/frame/testdata/frame similarity index 100% rename from dwarf/frame/testdata/frame rename to pkg/dwarf/frame/testdata/frame diff --git a/dwarf/line/line_parser.go b/pkg/dwarf/line/line_parser.go similarity index 98% rename from dwarf/line/line_parser.go rename to pkg/dwarf/line/line_parser.go index def5a119..0d3677f1 100644 --- a/dwarf/line/line_parser.go +++ b/pkg/dwarf/line/line_parser.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/binary" - "github.com/derekparker/delve/dwarf/util" + "github.com/derekparker/delve/pkg/dwarf/util" ) type DebugLinePrologue struct { diff --git a/dwarf/line/line_parser_test.go b/pkg/dwarf/line/line_parser_test.go similarity index 97% rename from dwarf/line/line_parser_test.go rename to pkg/dwarf/line/line_parser_test.go index b1989f19..22a1de5b 100644 --- a/dwarf/line/line_parser_test.go +++ b/pkg/dwarf/line/line_parser_test.go @@ -47,7 +47,7 @@ const ( func TestDebugLinePrologueParser(t *testing.T) { // Test against known good values, from readelf --debug-dump=rawline _fixtures/testnextprog - p, err := filepath.Abs("../../_fixtures/testnextprog") + p, err := filepath.Abs("../../../_fixtures/testnextprog") if err != nil { t.Fatal(err) } diff --git a/dwarf/line/state_machine.go b/pkg/dwarf/line/state_machine.go similarity index 99% rename from dwarf/line/state_machine.go rename to pkg/dwarf/line/state_machine.go index 25a2ff6b..feedd4ed 100644 --- a/dwarf/line/state_machine.go +++ b/pkg/dwarf/line/state_machine.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/dwarf/util" + "github.com/derekparker/delve/pkg/dwarf/util" ) type Location struct { diff --git a/dwarf/op/op.go b/pkg/dwarf/op/op.go similarity index 97% rename from dwarf/op/op.go rename to pkg/dwarf/op/op.go index 82f06832..158b0733 100644 --- a/dwarf/op/op.go +++ b/pkg/dwarf/op/op.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/dwarf/util" + "github.com/derekparker/delve/pkg/dwarf/util" ) const ( diff --git a/dwarf/op/op_test.go b/pkg/dwarf/op/op_test.go similarity index 100% rename from dwarf/op/op_test.go rename to pkg/dwarf/op/op_test.go diff --git a/dwarf/reader/reader.go b/pkg/dwarf/reader/reader.go similarity index 99% rename from dwarf/reader/reader.go rename to pkg/dwarf/reader/reader.go index 5431b9bc..ecd61f59 100755 --- a/dwarf/reader/reader.go +++ b/pkg/dwarf/reader/reader.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/dwarf/op" + "github.com/derekparker/delve/pkg/dwarf/op" "golang.org/x/debug/dwarf" ) diff --git a/dwarf/util/util.go b/pkg/dwarf/util/util.go similarity index 100% rename from dwarf/util/util.go rename to pkg/dwarf/util/util.go diff --git a/dwarf/util/util_test.go b/pkg/dwarf/util/util_test.go similarity index 100% rename from dwarf/util/util_test.go rename to pkg/dwarf/util/util_test.go diff --git a/proc/arch.go b/pkg/proc/arch.go similarity index 100% rename from proc/arch.go rename to pkg/proc/arch.go diff --git a/proc/breakpoints.go b/pkg/proc/breakpoints.go similarity index 100% rename from proc/breakpoints.go rename to pkg/proc/breakpoints.go diff --git a/proc/disasm.go b/pkg/proc/disasm.go similarity index 100% rename from proc/disasm.go rename to pkg/proc/disasm.go diff --git a/proc/disasm_amd64.go b/pkg/proc/disasm_amd64.go similarity index 100% rename from proc/disasm_amd64.go rename to pkg/proc/disasm_amd64.go diff --git a/proc/doc.go b/pkg/proc/doc.go similarity index 100% rename from proc/doc.go rename to pkg/proc/doc.go diff --git a/proc/eval.go b/pkg/proc/eval.go similarity index 99% rename from proc/eval.go rename to pkg/proc/eval.go index be4ed2ec..0b50cb87 100644 --- a/proc/eval.go +++ b/pkg/proc/eval.go @@ -12,7 +12,7 @@ import ( "go/token" "reflect" - "github.com/derekparker/delve/dwarf/reader" + "github.com/derekparker/delve/pkg/dwarf/reader" "golang.org/x/debug/dwarf" ) diff --git a/proc/exc.h b/pkg/proc/exc.h similarity index 100% rename from proc/exc.h rename to pkg/proc/exc.h diff --git a/proc/exc_user_darwin.c b/pkg/proc/exc_user_darwin.c similarity index 100% rename from proc/exc_user_darwin.c rename to pkg/proc/exc_user_darwin.c diff --git a/proc/exec_darwin.c b/pkg/proc/exec_darwin.c similarity index 100% rename from proc/exec_darwin.c rename to pkg/proc/exec_darwin.c diff --git a/proc/exec_darwin.h b/pkg/proc/exec_darwin.h similarity index 100% rename from proc/exec_darwin.h rename to pkg/proc/exec_darwin.h diff --git a/proc/go_version.go b/pkg/proc/go_version.go similarity index 100% rename from proc/go_version.go rename to pkg/proc/go_version.go diff --git a/proc/mach_exc.defs b/pkg/proc/mach_exc.defs similarity index 100% rename from proc/mach_exc.defs rename to pkg/proc/mach_exc.defs diff --git a/proc/mach_exc.h b/pkg/proc/mach_exc.h similarity index 100% rename from proc/mach_exc.h rename to pkg/proc/mach_exc.h diff --git a/proc/mach_exc_user_darwin.c b/pkg/proc/mach_exc_user_darwin.c similarity index 100% rename from proc/mach_exc_user_darwin.c rename to pkg/proc/mach_exc_user_darwin.c diff --git a/proc/mem.go b/pkg/proc/mem.go similarity index 100% rename from proc/mem.go rename to pkg/proc/mem.go diff --git a/proc/moduledata.go b/pkg/proc/moduledata.go similarity index 100% rename from proc/moduledata.go rename to pkg/proc/moduledata.go diff --git a/proc/proc.go b/pkg/proc/proc.go similarity index 99% rename from proc/proc.go rename to pkg/proc/proc.go index 1dfe2513..cfd5a3dc 100644 --- a/proc/proc.go +++ b/pkg/proc/proc.go @@ -16,9 +16,9 @@ import ( "sync" "time" - "github.com/derekparker/delve/dwarf/frame" - "github.com/derekparker/delve/dwarf/line" - "github.com/derekparker/delve/dwarf/reader" + "github.com/derekparker/delve/pkg/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/line" + "github.com/derekparker/delve/pkg/dwarf/reader" "golang.org/x/debug/dwarf" ) diff --git a/proc/proc_darwin.c b/pkg/proc/proc_darwin.c similarity index 100% rename from proc/proc_darwin.c rename to pkg/proc/proc_darwin.c diff --git a/proc/proc_darwin.go b/pkg/proc/proc_darwin.go similarity index 99% rename from proc/proc_darwin.go rename to pkg/proc/proc_darwin.go index 0a49f145..79b8ba8e 100644 --- a/proc/proc_darwin.go +++ b/pkg/proc/proc_darwin.go @@ -17,8 +17,8 @@ import ( "golang.org/x/debug/macho" - "github.com/derekparker/delve/dwarf/frame" - "github.com/derekparker/delve/dwarf/line" + "github.com/derekparker/delve/pkg/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/line" sys "golang.org/x/sys/unix" ) diff --git a/proc/proc_darwin.h b/pkg/proc/proc_darwin.h similarity index 100% rename from proc/proc_darwin.h rename to pkg/proc/proc_darwin.h diff --git a/proc/proc_linux.go b/pkg/proc/proc_linux.go similarity index 99% rename from proc/proc_linux.go rename to pkg/proc/proc_linux.go index c21beb4b..4969f0f9 100644 --- a/proc/proc_linux.go +++ b/pkg/proc/proc_linux.go @@ -18,8 +18,8 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/dwarf/frame" - "github.com/derekparker/delve/dwarf/line" + "github.com/derekparker/delve/pkg/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/line" "golang.org/x/debug/elf" ) diff --git a/proc/proc_test.go b/pkg/proc/proc_test.go similarity index 99% rename from proc/proc_test.go rename to pkg/proc/proc_test.go index ca8c32b3..ce279a1c 100644 --- a/proc/proc_test.go +++ b/pkg/proc/proc_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" ) var normalLoadConfig = LoadConfig{true, 1, 64, 64, -1} @@ -2442,7 +2442,7 @@ func TestStacktraceWithBarriers(t *testing.T) { assertNoError(p.Continue(), t, "Continue()") gs, err := p.GoroutinesInfo() assertNoError(err, t, "GoroutinesInfo()") - for _, th := range p.Threads { + for _, th := range p.threads { if th.CurrentBreakpoint == nil { continue } diff --git a/proc/proc_unix_test.go b/pkg/proc/proc_unix_test.go similarity index 91% rename from proc/proc_unix_test.go rename to pkg/proc/proc_unix_test.go index b8769d75..ab45d7c8 100644 --- a/proc/proc_unix_test.go +++ b/pkg/proc/proc_unix_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" ) func TestIssue419(t *testing.T) { diff --git a/proc/proc_windows.go b/pkg/proc/proc_windows.go similarity index 99% rename from proc/proc_windows.go rename to pkg/proc/proc_windows.go index 7d21cf42..f7dd18b4 100644 --- a/proc/proc_windows.go +++ b/pkg/proc/proc_windows.go @@ -14,8 +14,8 @@ import ( sys "golang.org/x/sys/windows" - "github.com/derekparker/delve/dwarf/frame" - "github.com/derekparker/delve/dwarf/line" + "github.com/derekparker/delve/pkg/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/line" "golang.org/x/debug/dwarf" ) diff --git a/proc/ptrace_darwin.go b/pkg/proc/ptrace_darwin.go similarity index 100% rename from proc/ptrace_darwin.go rename to pkg/proc/ptrace_darwin.go diff --git a/proc/ptrace_linux.go b/pkg/proc/ptrace_linux.go similarity index 100% rename from proc/ptrace_linux.go rename to pkg/proc/ptrace_linux.go diff --git a/proc/ptrace_windows.go b/pkg/proc/ptrace_windows.go similarity index 100% rename from proc/ptrace_windows.go rename to pkg/proc/ptrace_windows.go diff --git a/proc/registers.go b/pkg/proc/registers.go similarity index 100% rename from proc/registers.go rename to pkg/proc/registers.go diff --git a/proc/registers_darwin_amd64.go b/pkg/proc/registers_darwin_amd64.go similarity index 100% rename from proc/registers_darwin_amd64.go rename to pkg/proc/registers_darwin_amd64.go diff --git a/proc/registers_linux_amd64.go b/pkg/proc/registers_linux_amd64.go similarity index 100% rename from proc/registers_linux_amd64.go rename to pkg/proc/registers_linux_amd64.go diff --git a/proc/registers_windows_amd64.go b/pkg/proc/registers_windows_amd64.go similarity index 100% rename from proc/registers_windows_amd64.go rename to pkg/proc/registers_windows_amd64.go diff --git a/proc/stack.go b/pkg/proc/stack.go similarity index 99% rename from proc/stack.go rename to pkg/proc/stack.go index 70556d97..e48773b4 100644 --- a/proc/stack.go +++ b/pkg/proc/stack.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/dwarf/frame" + "github.com/derekparker/delve/pkg/dwarf/frame" ) // This code is partly adaped from runtime.gentraceback in diff --git a/proc/syscall_windows.go b/pkg/proc/syscall_windows.go similarity index 100% rename from proc/syscall_windows.go rename to pkg/proc/syscall_windows.go diff --git a/proc/syscall_windows_amd64.go b/pkg/proc/syscall_windows_amd64.go similarity index 100% rename from proc/syscall_windows_amd64.go rename to pkg/proc/syscall_windows_amd64.go diff --git a/proc/test/support.go b/pkg/proc/test/support.go similarity index 100% rename from proc/test/support.go rename to pkg/proc/test/support.go diff --git a/proc/threads.go b/pkg/proc/threads.go similarity index 100% rename from proc/threads.go rename to pkg/proc/threads.go diff --git a/proc/threads_darwin.c b/pkg/proc/threads_darwin.c similarity index 100% rename from proc/threads_darwin.c rename to pkg/proc/threads_darwin.c diff --git a/proc/threads_darwin.go b/pkg/proc/threads_darwin.go similarity index 100% rename from proc/threads_darwin.go rename to pkg/proc/threads_darwin.go diff --git a/proc/threads_darwin.h b/pkg/proc/threads_darwin.h similarity index 100% rename from proc/threads_darwin.h rename to pkg/proc/threads_darwin.h diff --git a/proc/threads_linux.go b/pkg/proc/threads_linux.go similarity index 100% rename from proc/threads_linux.go rename to pkg/proc/threads_linux.go diff --git a/proc/threads_windows.go b/pkg/proc/threads_windows.go similarity index 100% rename from proc/threads_windows.go rename to pkg/proc/threads_windows.go diff --git a/proc/types.go b/pkg/proc/types.go similarity index 99% rename from proc/types.go rename to pkg/proc/types.go index a3eaf204..65b8b383 100644 --- a/proc/types.go +++ b/pkg/proc/types.go @@ -14,7 +14,7 @@ import ( "sync" "unsafe" - "github.com/derekparker/delve/dwarf/reader" + "github.com/derekparker/delve/pkg/dwarf/reader" "golang.org/x/debug/dwarf" ) diff --git a/proc/variables.go b/pkg/proc/variables.go similarity index 99% rename from proc/variables.go rename to pkg/proc/variables.go index 7bd7b19a..1e284649 100644 --- a/proc/variables.go +++ b/pkg/proc/variables.go @@ -13,8 +13,8 @@ import ( "strings" "unsafe" - "github.com/derekparker/delve/dwarf/op" - "github.com/derekparker/delve/dwarf/reader" + "github.com/derekparker/delve/pkg/dwarf/op" + "github.com/derekparker/delve/pkg/dwarf/reader" "golang.org/x/debug/dwarf" ) diff --git a/proc/zsyscall_windows.go b/pkg/proc/zsyscall_windows.go similarity index 100% rename from proc/zsyscall_windows.go rename to pkg/proc/zsyscall_windows.go diff --git a/pkg/target/target.go b/pkg/target/target.go index 14929008..44551603 100644 --- a/pkg/target/target.go +++ b/pkg/target/target.go @@ -5,7 +5,7 @@ import ( "go/ast" "time" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" ) // Target represents the target of the debugger. This diff --git a/terminal/command.go b/pkg/terminal/command.go similarity index 100% rename from terminal/command.go rename to pkg/terminal/command.go diff --git a/terminal/command_test.go b/pkg/terminal/command_test.go similarity index 99% rename from terminal/command_test.go rename to pkg/terminal/command_test.go index 5b2111d7..6e92e8de 100644 --- a/terminal/command_test.go +++ b/pkg/terminal/command_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/derekparker/delve/proc/test" + "github.com/derekparker/delve/pkg/proc/test" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/rpc2" diff --git a/terminal/disasmprint.go b/pkg/terminal/disasmprint.go similarity index 100% rename from terminal/disasmprint.go rename to pkg/terminal/disasmprint.go diff --git a/terminal/docgen.go b/pkg/terminal/docgen.go similarity index 100% rename from terminal/docgen.go rename to pkg/terminal/docgen.go diff --git a/terminal/terminal.go b/pkg/terminal/terminal.go similarity index 99% rename from terminal/terminal.go rename to pkg/terminal/terminal.go index b6bb7e96..74a7f527 100644 --- a/terminal/terminal.go +++ b/pkg/terminal/terminal.go @@ -12,7 +12,7 @@ import ( "github.com/peterh/liner" - "github.com/derekparker/delve/config" + "github.com/derekparker/delve/pkg/config" "github.com/derekparker/delve/service" ) diff --git a/terminal/terminal_other.go b/pkg/terminal/terminal_other.go similarity index 100% rename from terminal/terminal_other.go rename to pkg/terminal/terminal_other.go diff --git a/terminal/terminal_test.go b/pkg/terminal/terminal_test.go similarity index 98% rename from terminal/terminal_test.go rename to pkg/terminal/terminal_test.go index 2e7d35dc..0ab14c03 100644 --- a/terminal/terminal_test.go +++ b/pkg/terminal/terminal_test.go @@ -4,7 +4,7 @@ import ( "runtime" "testing" - "github.com/derekparker/delve/config" + "github.com/derekparker/delve/pkg/config" ) type tRule struct { diff --git a/terminal/terminal_windows.go b/pkg/terminal/terminal_windows.go similarity index 100% rename from terminal/terminal_windows.go rename to pkg/terminal/terminal_windows.go diff --git a/version/version.go b/pkg/version/version.go similarity index 100% rename from version/version.go rename to pkg/version/version.go diff --git a/service/api/conversions.go b/service/api/conversions.go index 680f90a1..e407d0e6 100644 --- a/service/api/conversions.go +++ b/service/api/conversions.go @@ -9,7 +9,8 @@ import ( "reflect" "strconv" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" + "golang.org/x/debug/dwarf" ) diff --git a/service/api/types.go b/service/api/types.go index 4a64c56c..677a8d30 100644 --- a/service/api/types.go +++ b/service/api/types.go @@ -8,7 +8,7 @@ import ( "strconv" "unicode" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" ) var NotExecutableErr = proc.NotExecutableErr diff --git a/service/debugger/debugger.go b/service/debugger/debugger.go index cb4825ca..5466303d 100644 --- a/service/debugger/debugger.go +++ b/service/debugger/debugger.go @@ -14,7 +14,7 @@ import ( "time" "github.com/derekparker/delve/pkg/target" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service/api" ) diff --git a/service/debugger/locations.go b/service/debugger/locations.go index 0a8db23c..ddc55760 100644 --- a/service/debugger/locations.go +++ b/service/debugger/locations.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service/api" ) diff --git a/service/debugger/locations_test.go b/service/debugger/locations_test.go index 596d7a19..f090704b 100644 --- a/service/debugger/locations_test.go +++ b/service/debugger/locations_test.go @@ -57,12 +57,12 @@ func TestFunctionLocationParsing(t *testing.T) { assertNormalLocationSpec(t, "Continue:10", NormalLocationSpec{"Continue", &FuncLocationSpec{BaseName: "Continue"}, 10}) // Function locations, package paths, no line offsets - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.(*Process).Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.Process.Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, -1}) // Function locations, package paths, line offsets - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.Process.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, 10}) } diff --git a/service/rpc1/server.go b/service/rpc1/server.go index af233beb..02b18e43 100644 --- a/service/rpc1/server.go +++ b/service/rpc1/server.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/debugger" diff --git a/service/rpccommon/server.go b/service/rpccommon/server.go index a9e798d2..765fd09a 100644 --- a/service/rpccommon/server.go +++ b/service/rpccommon/server.go @@ -16,12 +16,12 @@ import ( "unicode" "unicode/utf8" + "github.com/derekparker/delve/pkg/version" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/debugger" "github.com/derekparker/delve/service/rpc1" "github.com/derekparker/delve/service/rpc2" - "github.com/derekparker/delve/version" ) // ServerImpl implements a JSON-RPC server that can switch between two diff --git a/service/test/integration1_test.go b/service/test/integration1_test.go index 6c821d1e..b63bc79d 100644 --- a/service/test/integration1_test.go +++ b/service/test/integration1_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/rpc1" diff --git a/service/test/integration2_test.go b/service/test/integration2_test.go index 28c56f34..bc9c7a2e 100644 --- a/service/test/integration2_test.go +++ b/service/test/integration2_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service" "github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/rpc2" diff --git a/service/test/variables_test.go b/service/test/variables_test.go index e88a739d..ff1eb290 100644 --- a/service/test/variables_test.go +++ b/service/test/variables_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "github.com/derekparker/delve/proc" + "github.com/derekparker/delve/pkg/proc" "github.com/derekparker/delve/service/api" - protest "github.com/derekparker/delve/proc/test" + protest "github.com/derekparker/delve/pkg/proc/test" ) var pnormalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1}