From 4f6e4f73f3096777e6b48f69ebedae76c30a15d4 Mon Sep 17 00:00:00 2001
From: Pavel Trukhanov <pavel.trukhanov@gmail.com>
Date: Wed, 28 Jan 2015 16:25:25 +0300
Subject: [PATCH 1/3] disk_usage as in psutil

---
 disk/disk_unix.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/disk/disk_unix.go b/disk/disk_unix.go
index bc53d40..af4901d 100644
--- a/disk/disk_unix.go
+++ b/disk/disk_unix.go
@@ -16,14 +16,14 @@ func DiskUsage(path string) (*DiskUsageStat, error) {
 	ret := &DiskUsageStat{
 		Path:        path,
 		Total:       (uint64(stat.Blocks) * uint64(bsize)),
-		Free:        (uint64(stat.Bfree) * uint64(bsize)),
+		Free:        (uint64(stat.Bavail) * uint64(bsize)),
 		InodesTotal: (uint64(stat.Files)),
 		InodesFree:  (uint64(stat.Ffree)),
 	}
 
 	ret.InodesUsed = (ret.InodesTotal - ret.InodesFree)
 	ret.InodesUsedPercent = (float64(ret.InodesUsed) / float64(ret.InodesTotal)) * 100.0
-	ret.Used = (ret.Total - ret.Free)
+	ret.Used = (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(bsize)
 	ret.UsedPercent = (float64(ret.Used) / float64(ret.Total)) * 100.0
 
 	return ret, nil

From 889c8c0bd58906fffbfa787c1a8da8dc7af02ff6 Mon Sep 17 00:00:00 2001
From: Nikolay Sivko <n.sivko@gmail.com>
Date: Sat, 7 Feb 2015 16:12:14 +0300
Subject: [PATCH 2/3] enable Process.NumFds() for linux

---
 process/process_linux.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/process/process_linux.go b/process/process_linux.go
index b7bd4e5..f7127ce 100644
--- a/process/process_linux.go
+++ b/process/process_linux.go
@@ -132,7 +132,8 @@ func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	return p.numCtxSwitches, nil
 }
 func (p *Process) NumFDs() (int32, error) {
-	return 0, common.NotImplementedError
+	numFds, _, err := p.fillFromfd()
+	return numFds, err
 }
 func (p *Process) NumThreads() (int32, error) {
 	return p.numThreads, nil

From 06282a319c710ab3ee51396ddb188f4bf680d6f2 Mon Sep 17 00:00:00 2001
From: Nikolay Sivko <n.sivko@gmail.com>
Date: Wed, 8 Apr 2015 14:53:21 +0300
Subject: [PATCH 3/3] [darwin] hw.memsize already in bytes

---
 mem/mem_darwin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mem/mem_darwin.go b/mem/mem_darwin.go
index 6f901d2..bd6d2e0 100644
--- a/mem/mem_darwin.go
+++ b/mem/mem_darwin.go
@@ -53,7 +53,7 @@ func VirtualMemory() (*VirtualMemoryStat, error) {
 	}
 
 	ret := &VirtualMemoryStat{
-		Total: parsed[0] * p,
+		Total: parsed[0],
 		Free:  parsed[1] * p,
 	}