Merge branch 'develop'

[nncp.git] / src / cypherpunks.ru / nncp / cmd / nncp-stat / main.go

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
index 9791b98468676aad4b68c1f0336695292793a3f0..0c27b1b8d27f4ae0940d806cf539c29e0d139a39 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
@@ -25,6 +25,7 @@ import (
        "io/ioutil"
        "log"
        "os"
+       "sort"
 
        "cypherpunks.ru/nncp"
        "github.com/dustin/go-humanize"
@@ -33,7 +34,7 @@ import (
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
        fmt.Fprintln(os.Stderr, "nncp-stat -- show queued Rx/Tx stats\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
 }
 
@@ -41,7 +42,7 @@ func main() {
        var (
                cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
                nodeRaw  = flag.String("node", "", "Process only that node")
-               debug    = flag.Bool("debug", false, "Enable debugging information")
+               debug    = flag.Bool("debug", false, "Print debug messages")
                version  = flag.Bool("version", false, "Print version information")
                warranty = flag.Bool("warranty", false, "Print warranty information")
        )
@@ -56,7 +57,7 @@ func main() {
                return
        }
 
-       cfgRaw, err := ioutil.ReadFile(*cfgPath)
+       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
        if err != nil {
                log.Fatalln("Can not read config:", err)
        }
@@ -74,20 +75,30 @@ func main() {
                }
        }
 
-       for nodeId, node := range ctx.Neigh {
-               if nodeOnly != nil && nodeId != *nodeOnly.Id {
+       nodeNames := make([]string, 0, len(ctx.Neigh))
+       nodeNameToNode := make(map[string]*nncp.Node, len(ctx.Neigh))
+       for _, node := range ctx.Neigh {
+               nodeNames = append(nodeNames, node.Name)
+               nodeNameToNode[node.Name] = node
+       }
+       sort.Strings(nodeNames)
+
+       var node *nncp.Node
+       for _, nodeName := range nodeNames {
+               node = nodeNameToNode[nodeName]
+               if nodeOnly != nil && *node.Id != *nodeOnly.Id {
                        continue
                }
                rxNums := make(map[uint8]int)
                rxBytes := make(map[uint8]int64)
-               for job := range ctx.Jobs(&nodeId, nncp.TRx) {
+               for job := range ctx.Jobs(node.Id, nncp.TRx) {
                        job.Fd.Close()
                        rxNums[job.PktEnc.Nice] = rxNums[job.PktEnc.Nice] + 1
                        rxBytes[job.PktEnc.Nice] = rxBytes[job.PktEnc.Nice] + job.Size
                }
                txNums := make(map[uint8]int)
                txBytes := make(map[uint8]int64)
-               for job := range ctx.Jobs(&nodeId, nncp.TTx) {
+               for job := range ctx.Jobs(node.Id, nncp.TTx) {
                        job.Fd.Close()
                        txNums[job.PktEnc.Nice] = txNums[job.PktEnc.Nice] + 1
                        txBytes[job.PktEnc.Nice] = txBytes[job.PktEnc.Nice] + job.Size