net[freebsd,linux,darwin]: merge unix like OSes.

common/common_darwin.go

@@ -4,7 +4,6 @@ package common
 
 import (
 	"os/exec"
-	"strconv"
 	"strings"
 	"syscall"
 	"unsafe"
@@ -59,35 +58,3 @@ func CallSyscall(mib []int32) ([]byte, uint64, error) {
 
 	return buf, length, nil
 }
-
-func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-a", "-n", "-P"}
-	} else {
-		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
-	}
-	cmd = append(cmd, args...)
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		// if no pid found, lsof returnes code 1
-		if err.Error() == "exit status 1" && len(out) == 0 {
-			return []string{}, nil
-		}
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if len(l) == 0 {
-			continue
-		}
-		ret = append(ret, l)
-	}
-	return ret, nil
-}

common/common_linux.go

 // +build linux
 
 package common
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-// CallLsof invokes lsof to get connection informations.
-// This is same as darwin currently.
-func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-a", "-n", "-P"}
-	} else {
-		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
-	}
-	cmd = append(cmd, args...)
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		// if not pid found, lsof returnes code 1
-		if err.Error() == "exit status 1" && len(out) == 0 {
-			return []string{}, nil
-		}
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if len(l) == 0 {
-			continue
-		}
-		ret = append(ret, l)
-	}
-	return ret, nil
-}

common/common_unix.go

+// +build linux freebsd darwin
+
+package common
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-a", "-n", "-P"}
+	} else {
+		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
+	}
+	cmd = append(cmd, args...)
+	lsof, err := exec.LookPath("lsof")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := invoke.Command(lsof, cmd...)
+	if err != nil {
+		// if no pid found, lsof returnes code 1
+		if err.Error() == "exit status 1" && len(out) == 0 {
+			return []string{}, nil
+		}
+		return []string{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret []string
+	for _, l := range lines[1:] {
+		if len(l) == 0 {
+			continue
+		}
+		ret = append(ret, l)
+	}
+	return ret, nil
+}

net/net_darwin.go

@@ -90,63 +90,3 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
 
 	return ret, nil
 }
-
-// Return a list of network connections opened.
-func NetConnections(kind string) ([]NetConnectionStat, error) {
-	return NetConnectionsPid(kind, 0)
-}
-
-// Return a list of network connections opened by a process.
-func NetConnectionsPid(kind string, pid int32) ([]NetConnectionStat, error) {
-	var ret []NetConnectionStat
-
-	args := []string{"-i"}
-	switch strings.ToLower(kind) {
-	default:
-		fallthrough
-	case "":
-		fallthrough
-	case "all":
-		fallthrough
-	case "inet":
-		args = append(args, "tcp", "-i", "udp")
-	case "inet4":
-		args = append(args, "4")
-	case "inet6":
-		args = append(args, "6")
-	case "tcp":
-		args = append(args, "tcp")
-	case "tcp4":
-		args = append(args, "4tcp")
-	case "tcp6":
-		args = append(args, "6tcp")
-	case "udp":
-		args = append(args, "udp")
-	case "udp4":
-		args = append(args, "6udp")
-	case "udp6":
-		args = append(args, "6udp")
-	case "unix":
-		return ret, common.NotImplementedError
-	}
-
-	// we can not use -F filter to get all of required information at once.
-	r, err := common.CallLsof(invoke, pid, args...)
-	if err != nil {
-		return nil, err
-	}
-	for _, rr := range r {
-		if strings.HasPrefix(rr, "COMMAND") {
-			continue
-		}
-		n, err := parseNetLine(rr)
-		if err != nil {
-			// fmt.Println(err) // TODO: should debug print?
-			continue
-		}
-
-		ret = append(ret, n)
-	}
-
-	return ret, nil
-}

net/net_freebsd.go

@@ -81,58 +81,3 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
 
 	return ret, nil
 }
-
-// Return a list of network connections opened by a process.
-func NetConnectionsPid(kind string, pid int32) ([]NetConnectionStat, error) {
-	var ret []NetConnectionStat
-
-	args := []string{"-i"}
-	switch strings.ToLower(kind) {
-	default:
-		fallthrough
-	case "":
-		fallthrough
-	case "all":
-		fallthrough
-	case "inet":
-		args = append(args, "tcp", "-i", "udp")
-	case "inet4":
-		args = append(args, "4")
-	case "inet6":
-		args = append(args, "6")
-	case "tcp":
-		args = append(args, "tcp")
-	case "tcp4":
-		args = append(args, "4tcp")
-	case "tcp6":
-		args = append(args, "6tcp")
-	case "udp":
-		args = append(args, "udp")
-	case "udp4":
-		args = append(args, "6udp")
-	case "udp6":
-		args = append(args, "6udp")
-	case "unix":
-		return ret, common.NotImplementedError
-	}
-
-	// we can not use -F filter to get all of required information at once.
-	r, err := common.CallLsof(invoke, pid, args...)
-	if err != nil {
-		return nil, err
-	}
-	for _, rr := range r {
-		if strings.HasPrefix(rr, "COMMAND") {
-			continue
-		}
-		n, err := parseNetLine(rr)
-		if err != nil {
-			// fmt.Println(err) // TODO: should debug print?
-			continue
-		}
-
-		ret = append(ret, n)
-	}
-
-	return ret, nil
-}

net/net_linux.go

@@ -89,63 +89,3 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
 
 	return ret, nil
 }
-
-// Return a list of network connections opened.
-func NetConnections(kind string) ([]NetConnectionStat, error) {
-	return NetConnectionsPid(kind, 0)
-}
-
-// Return a list of network connections opened by a process.
-func NetConnectionsPid(kind string, pid int32) ([]NetConnectionStat, error) {
-	var ret []NetConnectionStat
-
-	args := []string{"-i"}
-	switch strings.ToLower(kind) {
-	default:
-		fallthrough
-	case "":
-		fallthrough
-	case "all":
-		fallthrough
-	case "inet":
-		args = append(args, "tcp", "-i", "udp")
-	case "inet4":
-		args = append(args, "4")
-	case "inet6":
-		args = append(args, "6")
-	case "tcp":
-		args = append(args, "tcp")
-	case "tcp4":
-		args = append(args, "4tcp")
-	case "tcp6":
-		args = append(args, "6tcp")
-	case "udp":
-		args = append(args, "udp")
-	case "udp4":
-		args = append(args, "6udp")
-	case "udp6":
-		args = append(args, "6udp")
-	case "unix":
-		return ret, common.NotImplementedError
-	}
-
-	// we can not use -F filter to get all of required information at once.
-	r, err := common.CallLsof(invoke, pid, args...)
-	if err != nil {
-		return nil, err
-	}
-	for _, rr := range r {
-		if strings.HasPrefix(rr, "COMMAND") {
-			continue
-		}
-		n, err := parseNetLine(rr)
-		if err != nil {
-			// fmt.Println(err) // TODO: should debug print?
-			continue
-		}
-
-		ret = append(ret, n)
-	}
-
-	return ret, nil
-}

net/net_unix.go

+// +build linux freebsd darwin
+
+package net
+
+import (
+	"strings"
+
+	"github.com/shirou/gopsutil/common"
+)
+
+// Return a list of network connections opened.
+func NetConnections(kind string) ([]NetConnectionStat, error) {
+	return NetConnectionsPid(kind, 0)
+}
+
+// Return a list of network connections opened by a process.
+func NetConnectionsPid(kind string, pid int32) ([]NetConnectionStat, error) {
+	var ret []NetConnectionStat
+
+	args := []string{"-i"}
+	switch strings.ToLower(kind) {
+	default:
+		fallthrough
+	case "":
+		fallthrough
+	case "all":
+		fallthrough
+	case "inet":
+		args = append(args, "tcp", "-i", "udp")
+	case "inet4":
+		args = append(args, "4")
+	case "inet6":
+		args = append(args, "6")
+	case "tcp":
+		args = append(args, "tcp")
+	case "tcp4":
+		args = append(args, "4tcp")
+	case "tcp6":
+		args = append(args, "6tcp")
+	case "udp":
+		args = append(args, "udp")
+	case "udp4":
+		args = append(args, "6udp")
+	case "udp6":
+		args = append(args, "6udp")
+	case "unix":
+		return ret, common.NotImplementedError
+	}
+
+	r, err := common.CallLsof(invoke, pid, args...)
+	if err != nil {
+		return nil, err
+	}
+	for _, rr := range r {
+		if strings.HasPrefix(rr, "COMMAND") {
+			continue
+		}
+		n, err := parseNetLine(rr)
+		if err != nil {
+
+			continue
+		}
+
+		ret = append(ret, n)
+	}
+
+	return ret, nil
+}