From 13a82bc9a80887c5d4ab15fa5a0aa3c8c662c060 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 16 Dec 2015 15:30:53 +0000 Subject: [PATCH] Make it lint and compile after rebase. --- experimental/tracer/main/http.go | 5 +++-- experimental/tracer/main/store.go | 21 +++++++++++---------- experimental/tracer/ptrace/fd.go | 1 + experimental/tracer/ptrace/ptracer.go | 2 ++ experimental/tracer/ptrace/thread.go | 2 +- experimental/tracer/ui/index.html | 14 +++++++------- probe/process/tree.go | 2 +- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/experimental/tracer/main/http.go b/experimental/tracer/main/http.go index 9ebdae3b4..4029bb573 100644 --- a/experimental/tracer/main/http.go +++ b/experimental/tracer/main/http.go @@ -45,8 +45,9 @@ func (t *tracer) pidsForContainer(id string) ([]int, error) { return pidTree.GetChildren(container.PID()) } +// Container is the type exported by the HTTP API. type Container struct { - Id string + ID string Name string PIDs []int } @@ -66,7 +67,7 @@ func (t *tracer) http(port int) { children, _ := pidTree.GetChildren(container.PID()) out := Container{ Name: strings.TrimPrefix(container.Container().Name, "/"), - Id: container.ID(), + ID: container.ID(), PIDs: children, } containers = append(containers, out) diff --git a/experimental/tracer/main/store.go b/experimental/tracer/main/store.go index a47cfbd57..5b4639360 100644 --- a/experimental/tracer/main/store.go +++ b/experimental/tracer/main/store.go @@ -54,31 +54,31 @@ func newKey(fd *ptrace.Fd) key { return key{fromAddr, fd.FromPort, fd.Start} } -func (l key) LessThan(other skiplist.Comparable) bool { +func (k key) LessThan(other skiplist.Comparable) bool { r := other.(key) - if l.fromAddr != r.fromAddr { - return l.fromAddr > r.fromAddr + if k.fromAddr != r.fromAddr { + return k.fromAddr > r.fromAddr } - if l.fromPort != r.fromPort { - return l.fromPort < r.fromPort + if k.fromPort != r.fromPort { + return k.fromPort < r.fromPort } - if l.Equal(other) { + if k.Equal(other) { return false } - return l.startTime < r.startTime + return k.startTime < r.startTime } -func (l key) Equal(other skiplist.Comparable) bool { +func (k key) Equal(other skiplist.Comparable) bool { r := other.(key) - if l.fromAddr != r.fromAddr || l.fromPort != r.fromPort { + if k.fromAddr != r.fromAddr || k.fromPort != r.fromPort { return false } - diff := l.startTime - r.startTime + diff := k.startTime - r.startTime return -epsilon < diff && diff < epsilon } @@ -144,6 +144,7 @@ func (s *store) RecordConnection(pid int, connection *ptrace.Fd) { } } +// IncrementLevel ... func IncrementLevel(trace *trace, increment int) { trace.Level += increment for _, child := range trace.Children { diff --git a/experimental/tracer/ptrace/fd.go b/experimental/tracer/ptrace/fd.go index ffea4b11d..463a35628 100644 --- a/experimental/tracer/ptrace/fd.go +++ b/experimental/tracer/ptrace/fd.go @@ -29,6 +29,7 @@ var ( tcpRegexp = regexp.MustCompile(tcpPattern) ) +// ConnectionDetails ... type ConnectionDetails struct { direction int diff --git a/experimental/tracer/ptrace/ptracer.go b/experimental/tracer/ptrace/ptracer.go index 306ce64a4..c0205b3f5 100644 --- a/experimental/tracer/ptrace/ptracer.go +++ b/experimental/tracer/ptrace/ptracer.go @@ -16,6 +16,7 @@ const ( ptraceTracesysgoodBit = 0x80 ) +// Store ... type Store interface { RecordConnection(int, *Fd) } @@ -58,6 +59,7 @@ func NewPTracer(store Store) PTracer { return t } +// Stop stop stop func (t *PTracer) Stop() { out := make(chan []int) t.ops <- func() { diff --git a/experimental/tracer/ptrace/thread.go b/experimental/tracer/ptrace/thread.go index f3cd468a6..5a7b2dfad 100644 --- a/experimental/tracer/ptrace/thread.go +++ b/experimental/tracer/ptrace/thread.go @@ -52,7 +52,7 @@ type thread struct { currentIncoming map[int]*Fd currentOutgoing map[int]*Fd - closedOutgoing []*Fd + closedOutgoing []*Fd } func newThread(pid int, process *process, tracer *PTracer) *thread { diff --git a/experimental/tracer/ui/index.html b/experimental/tracer/ui/index.html index 8a2908112..d7d92ef2c 100644 --- a/experimental/tracer/ui/index.html +++ b/experimental/tracer/ui/index.html @@ -25,7 +25,7 @@ var traces = []; Handlebars.registerHelper('isSelected', function(input) { - if (currentContainer && input === currentContainer.Id) { + if (currentContainer && input === currentContainer.ID) { return 'class=selected'; } }); @@ -122,14 +122,14 @@ containersByID = {}; containersByPID = {}; $.each(data, function(i, container) { - containersByID[container.Id] = container + containersByID[container.ID] = container $.each(container.PIDs, function(i, pid) { containersByPID[pid] = container }); }); // auto-select first container if (containers.length && currentContainer === null) { - currentContainer = containersByID[containers[0].Id]; + currentContainer = containersByID[containers[0].ID]; } render(); window.setTimeout(updateContainers, 5 * 1000); @@ -183,14 +183,14 @@ $("body").on("click", "div.mainview button.start", function() { var id = $(this).parent().data("containerId") var container = containersByID[id] - $.post(sprintf("/container/%s", container.Id)) + $.post(sprintf("/container/%s", container.ID)) }) $("body").on("click", "div.mainview button.stop", function() { var id = $(this).parent().data("containerId") var container = containersByID[id] $.ajax({ - url: sprintf("/container/%s", container.Id), + url: sprintf("/container/%s", container.ID), type: 'DELETE', }); }) @@ -353,7 +353,7 @@
Containers
@@ -361,7 +361,7 @@
{{#if container}}

{{container.Name}}

-
+