Merge pull request #42 from Random-Liu/expose-parsePSOutput

crosbymichael · web-flow · commit 74719bd2a8ad · 2018-07-03T10:11:01.000-04:00
Expose parsePSOutput.
diff --git a/runc.go b/runc.go
@@ -411,7 +411,7 @@ func (r *Runc) Top(context context.Context, id string, psOptions string) (*TopRe
 		return nil, fmt.Errorf("%s: %s", err, data)
 	}
 
-	topResults, err := parsePSOutput(data)
+	topResults, err := ParsePSOutput(data)
 	if err != nil {
 		return nil, fmt.Errorf("%s: ", err)
 	}
diff --git a/utils.go b/utils.go
@@ -73,8 +73,8 @@ func fieldsASCII(s string) []string {
 	return strings.FieldsFunc(s, fn)
 }
 
-// parsePSOutput parses the runtime's ps raw output and returns a TopResults
-func parsePSOutput(output []byte) (*TopResults, error) {
+// ParsePSOutput parses the runtime's ps raw output and returns a TopResults
+func ParsePSOutput(output []byte) (*TopResults, error) {
 	topResults := &TopResults{}
 
 	lines := strings.Split(string(output), "\n")

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ func (r Runc) Top(context context.Context, id string, psOptions string) (TopRe`
`411`	`411`	`return nil, fmt.Errorf("%s: %s", err, data)`
`412`	`412`	`}`
`413`	`413`
`414`		`- topResults, err := parsePSOutput(data)`
	`414`	`+ topResults, err := ParsePSOutput(data)`
`415`	`415`	`if err != nil {`
`416`	`416`	`return nil, fmt.Errorf("%s: ", err)`
`417`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ func fieldsASCII(s string) []string {`
`73`	`73`	`return strings.FieldsFunc(s, fn)`
`74`	`74`	`}`
`75`	`75`
`76`		`-// parsePSOutput parses the runtime's ps raw output and returns a TopResults`
`77`		`-func parsePSOutput(output []byte) (*TopResults, error) {`
	`76`	`+// ParsePSOutput parses the runtime's ps raw output and returns a TopResults`
	`77`	`+func ParsePSOutput(output []byte) (*TopResults, error) {`
`78`	`78`	`topResults := &TopResults{}`
`79`	`79`
`80`	`80`	`lines := strings.Split(string(output), "\n")`