From b9aba259dfd1964fcd231fad5d68fa799b5bb6f6 Mon Sep 17 00:00:00 2001
From: Jimmi Dyson <jimmidyson@gmail.com>
Date: Wed, 25 Nov 2015 13:41:28 +0000
Subject: [PATCH] Switch net stats parsing to strings.Fields - better
 performance

---
 fs/fs.go | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/fs/fs.go b/fs/fs.go
index 814816b7..7ea35dbf 100644
--- a/fs/fs.go
+++ b/fs/fs.go
@@ -19,7 +19,6 @@ package fs
 
 import (
 	"bufio"
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -348,39 +347,46 @@ func dockerDMDevice(driverStatus string) (string, uint, uint, uint, error) {
 		return "", 0, 0, 0, fmt.Errorf("Could not get dm pool name")
 	}
 
-	dmTable, err := exec.Command("dmsetup", "table", poolName).Output()
+	out, err := exec.Command("dmsetup", "table", poolName).Output()
 	if err != nil {
 		return "", 0, 0, 0, err
 	}
 
-	var (
-		major, minor, dataBlkSize, bkt uint
-		bkts                           string
-	)
+	dmTable := string(out)
+	dmTable = strings.Replace(dmTable, ":", " ", -1)
+	dmFields := strings.Fields(dmTable)
 
-	_, err = fmt.Fscanf(bytes.NewReader(dmTable),
-		"%d %d %s %d:%d %d:%d %d",
-		&bkt, &bkt, &bkts, &bkt, &bkt, &major, &minor, &dataBlkSize)
+	major, err := strconv.ParseUint(dmFields[5], 10, 32)
 	if err != nil {
 		return "", 0, 0, 0, err
 	}
-	return poolName, major, minor, dataBlkSize, nil
+	minor, err := strconv.ParseUint(dmFields[6], 10, 32)
+	if err != nil {
+		return "", 0, 0, 0, err
+	}
+	dataBlkSize, err := strconv.ParseUint(dmFields[7], 10, 32)
+	if err != nil {
+		return "", 0, 0, 0, err
+	}
+
+	return poolName, uint(major), uint(minor), uint(dataBlkSize), nil
 }
 
 func getDMStats(poolName string, dataBlkSize uint) (uint64, uint64, uint64, error) {
-	dmStatus, err := exec.Command("dmsetup", "status", poolName).Output()
+	out, err := exec.Command("dmsetup", "status", poolName).Output()
 	if err != nil {
 		return 0, 0, 0, err
 	}
 
-	var (
-		total, used, bkt uint64
-		bkts             string
-	)
+	dmStatus := string(out)
+	dmStatus = strings.Replace(dmStatus, "/", " ", -1)
+	dmFields := strings.Fields(dmStatus)
 
-	_, err = fmt.Fscanf(bytes.NewReader(dmStatus),
-		"%d %d %s %d %d/%d %d/%d",
-		&bkt, &bkt, &bkts, &bkt, &bkt, &bkt, &used, &total)
+	used, err := strconv.ParseUint(dmFields[6], 10, 64)
+	if err != nil {
+		return 0, 0, 0, err
+	}
+	total, err := strconv.ParseUint(dmFields[7], 10, 64)
 	if err != nil {
 		return 0, 0, 0, err
 	}