nncp-caller's -autotoss* workability

[nncp.git] / src / cmd / nncp-caller / main.go

diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go
index 0a549e45e870c588c4d856a79a5be4771bd897ec..d4fff0ca93e792c469332e8c1e5f5122cd1e8ed9 100644 (file)
--- a/src/cmd/nncp-caller/main.go
+++ b/src/cmd/nncp-caller/main.go
@@ -27,7 +27,7 @@ import (
        "sync"
        "time"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v6"
 )
 
 func usage() {
@@ -93,7 +93,13 @@ func main() {
                                log.Fatalln("Invalid NODE specified:", err)
                        }
                        if len(node.Calls) == 0 {
-                               ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+                               ctx.LogD(
+                                       "caller-no-calls",
+                                       nncp.LEs{{K: "Node", V: node.Id}},
+                                       func(les nncp.LEs) string {
+                                               return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+                                       },
+                               )
                                continue
                        }
                        nodes = append(nodes, node)
@@ -101,7 +107,13 @@ func main() {
        } else {
                for _, node := range ctx.Neigh {
                        if len(node.Calls) == 0 {
-                               ctx.LogD("caller", nncp.SDS{"node": node.Id}, "has no calls, skipping")
+                               ctx.LogD(
+                                       "caller-no-calls",
+                                       nncp.LEs{{K: "Node", V: node.Id}},
+                                       func(les nncp.LEs) string {
+                                               return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+                                       },
+                               )
                                continue
                        }
                        nodes = append(nodes, node)
@@ -122,36 +134,65 @@ func main() {
                                } else {
                                        addrs = append(addrs, *call.Addr)
                                }
-                               sds := nncp.SDS{"node": node.Id, "callindex": i}
+                               les := nncp.LEs{{K: "Node", V: node.Id}, {K: "CallIndex", V: i}}
+                               logMsg := func(les nncp.LEs) string {
+                                       return fmt.Sprintf("%s node, call %d", node.Name, i)
+                               }
                                for {
                                        n := time.Now()
                                        t := call.Cron.Next(n)
-                                       ctx.LogD("caller", sds, t.String())
+                                       ctx.LogD("caller-time", les, func(les nncp.LEs) string {
+                                               return logMsg(les) + ": " + t.String()
+                                       })
                                        if t.IsZero() {
-                                               ctx.LogE("caller", sds, errors.New("got zero time"), "")
+                                               ctx.LogE("caller", les, errors.New("got zero time"), logMsg)
                                                return
                                        }
                                        time.Sleep(t.Sub(n))
                                        node.Lock()
                                        if node.Busy {
                                                node.Unlock()
-                                               ctx.LogD("caller", sds, "busy")
+                                               ctx.LogD("caller-busy", les, func(les nncp.LEs) string {
+                                                       return logMsg(les) + ": busy"
+                                               })
                                                continue
                                        } else {
                                                node.Busy = true
                                                node.Unlock()
 
+                                               if call.WhenTxExists && call.Xx != "TRx" {
+                                                       ctx.LogD("caller", les, func(les nncp.LEs) string {
+                                                               return logMsg(les) + ": checking tx existence"
+                                                       })
+                                                       txExists := false
+                                                       for job := range ctx.Jobs(node.Id, nncp.TTx) {
+                                                               if job.PktEnc.Nice > call.Nice {
+                                                                       continue
+                                                               }
+                                                               txExists = true
+                                                       }
+                                                       if !txExists {
+                                                               ctx.LogD("caller-no-tx", les, func(les nncp.LEs) string {
+                                                                       return logMsg(les) + ": no tx"
+                                                               })
+                                                               node.Lock()
+                                                               node.Busy = false
+                                                               node.Unlock()
+                                                               continue
+                                                       }
+                                               }
+
                                                var autoTossFinish chan struct{}
                                                var autoTossBadCode chan bool
-                                               if *autoToss {
+                                               if call.AutoToss || *autoToss {
                                                        autoTossFinish, autoTossBadCode = ctx.AutoToss(
                                                                node.Id,
                                                                call.Nice,
-                                                               *autoTossDoSeen,
-                                                               *autoTossNoFile,
-                                                               *autoTossNoFreq,
-                                                               *autoTossNoExec,
-                                                               *autoTossNoTrns,
+                                                               call.AutoTossDoSeen || *autoTossDoSeen,
+                                                               call.AutoTossNoFile || *autoTossNoFile,
+                                                               call.AutoTossNoFreq || *autoTossNoFreq,
+                                                               call.AutoTossNoExec || *autoTossNoExec,
+                                                               call.AutoTossNoTrns || *autoTossNoTrns,
                                                        )
                                                }
 
@@ -165,10 +206,11 @@ func main() {
                                                        call.OnlineDeadline,
                                                        call.MaxOnlineTime,
                                                        false,
+                                                       call.NoCK,
                                                        nil,
                                                )
 
-                                               if *autoToss {
+                                               if call.AutoToss || *autoToss {
                                                        close(autoTossFinish)
                                                        <-autoTossBadCode
                                                }