Replace array with map at /procs/ response

Closes #24.

Author: gkristic

http.go

@@ -22,12 +22,9 @@ func (pl *Proclist) getProcs() []ProcDetail {
 
 	for id, p := range pl.procs {
 		p.mu.RLock()
-		attrs := make([]AttrDetail, 0, len(p.attrs))
+		attrs := make(map[string]interface{})
 		for name, value := range p.attrs {
-			attrs = append(attrs, AttrDetail{
-				Name:  name,
-				Value: value,
-			})
+			attrs[name] = value
 		}
 		firstHEntry := p.history.Front().Value.(*historyEntry)
 		lastHEntry := p.history.Back().Value.(*historyEntry)

pm_test.go

@@ -24,17 +24,6 @@ func attrMapEquals(m1, m2 map[string]interface{}) bool {
 	return true
 }
 
-func attrMap(t *testing.T, p *ProcDetail) map[string]interface{} {
-	attrs := make(map[string]interface{})
-	for _, attr := range p.Attrs {
-		if _, present := attrs[attr.Name]; present {
-			t.Error("attribute doubly defined:", attr.Name)
-		}
-		attrs[attr.Name] = attr.Value
-	}
-	return attrs
-}
-
 func procMapEquals(t *testing.T, m1, m2 map[string]ProcDetail) bool {
 	if len(m1) != len(m2) {
 		return false
@@ -44,7 +33,7 @@ func procMapEquals(t *testing.T, m1, m2 map[string]ProcDetail) bool {
 			return false
 		} else if v1.Id != v2.Id || v1.Status != v2.Status || v1.Cancelling != v2.Cancelling {
 			return false
-		} else if !attrMapEquals(attrMap(t, &v1), attrMap(t, &v2)) {
+		} else if !attrMapEquals(v1.Attrs, v2.Attrs) {
 			return false
 		}
 	}
@@ -138,10 +127,10 @@ func TestProclist(t *testing.T) {
 		t.Error("bad status for req2; expecting 'init', got ", p2.Status)
 	}
 
-	if !attrMapEquals(attrMap(t, &p1), attrs1) {
+	if !attrMapEquals(p1.Attrs, attrs1) {
 		t.Error("bad attribute set for req1")
 	}
-	if !attrMapEquals(attrMap(t, &p2), attrs2) {
+	if !attrMapEquals(p2.Attrs, attrs2) {
 		t.Error("bad attribute set for req2")
 	}
 

types.go

@@ -7,21 +7,15 @@ import (
 	"time"
 )
 
-// AttrDetail encodes a single, user-defined name/value pair.
-type AttrDetail struct {
-	Name  string      `json:"name"`
-	Value interface{} `json:"value"`
-}
-
 // Type ProcDetail encodes a full process list from the server, including an
 // attributes array with application-defined names/values.
 type ProcDetail struct {
-	Id         string       `json:"id"`
-	Attrs      []AttrDetail `json:"attrs,omitempty"`
-	ProcTime   time.Time    `json:"procTime"`
-	StatusTime time.Time    `json:"statusTime"`
-	Status     string       `json:"status"`
-	Cancelling bool         `json:"cancelling,omitempty"`
+	Id         string                 `json:"id"`
+	Attrs      map[string]interface{} `json:"attrs,omitempty"`
+	ProcTime   time.Time              `json:"procTime"`
+	StatusTime time.Time              `json:"statusTime"`
+	Status     string                 `json:"status"`
+	Cancelling bool                   `json:"cancelling,omitempty"`
 }
 
 // ProcResponse is the response for a GET to /proc.