.

go/neo/connection.go

@@ -32,7 +32,6 @@ import (
 	"sync/atomic"
 
 	"lab.nexedi.com/kirr/neo/go/xcommon/xnet"
-	_ "lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet"	// XXX temp
 )
 
 // NodeLink is a node-node link in NEO
@@ -741,7 +740,7 @@ func (c *Conn) err(op string, e error) error {
 //trace:event traceConnSend(c *Conn, msg Msg)	// XXX -> traceConnSendPre ?
 
 //XXX temp
-//trace:import lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet
+//trace:import "lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet"
 
 // Recv receives message
 // it receives packet and decodes message from it

go/neo/neo.go

@@ -25,7 +25,7 @@
 package neo
 
 // XXX gotrace ... -> gotrace gen ...
-//go:generate sh -c "go run ../xcommon/tracing/cmd/gotrace/gotrace.go ."
+//go:generate sh -c "go run ../xcommon/tracing/cmd/gotrace/{gotrace,util}.go ."
 
 import (
 	"lab.nexedi.com/kirr/neo/go/zodb"

go/neo/proto-marshal.go

-// DO NOT EDIT - AUTOGENERATED (by protogen.go)
+// Code generated by protogen.go; DO NOT EDIT.
 
 package neo
 

go/neo/server/cluster_test.go

@@ -20,6 +20,9 @@
 package server
 // test interaction between nodes
 
+// XXX gotrace ... -> gotrace gen ...
+//go:generate sh -c "go run ../../xcommon/tracing/cmd/gotrace/{gotrace,util}.go ."
+
 import (
 	//"bytes"
 	"context"
@@ -123,7 +126,7 @@ func (tc *TraceChecker) ExpectNetTx(src, dst string, pkt string) {
 }
 */
 
-//trace:import lab.nexedi.com/kirr/neo/go/neo
+//trace:import "lab.nexedi.com/kirr/neo/go/neo"
 
 // M drives cluster with 1 S through recovery -> verification -> service -> shutdown
 func TestMasterStorage(t *testing.T) {

go/neo/server/trace.s

-// empty .s so `go build` does not use -complete

go/neo/server/ztrace_test.go

+// Code generated by lab.nexedi.com/kirr/go123/tracing/cmd/gotrace; DO NOT EDIT.
+
+package server
+// code generated for tracepoints
+
+import (
+	"lab.nexedi.com/kirr/neo/go/xcommon/tracing"
+	"unsafe"
+
+	"lab.nexedi.com/kirr/neo/go/neo"
+)
+
+// traceimport: "lab.nexedi.com/kirr/neo/go/neo"
+
+// rerun "gotrace gen" if you see link failure ↓↓↓
+//go:linkname neo_trace_exporthash lab.nexedi.com/kirr/neo/go/neo._trace_exporthash_bc56cd7a9caf82c14d9586243f763e65afb91ea0
+func neo_trace_exporthash()
+func init() { neo_trace_exporthash() }
+
+
+//go:linkname neo_traceConnRecv_Attach lab.nexedi.com/kirr/neo/go/neo.traceConnRecv_Attach
+func neo_traceConnRecv_Attach(*tracing.ProbeGroup, func(c *neo.Conn, msg neo.Msg)) *tracing.Probe
+
+//go:linkname neo_traceConnSend_Attach lab.nexedi.com/kirr/neo/go/neo.traceConnSend_Attach
+func neo_traceConnSend_Attach(*tracing.ProbeGroup, func(c *neo.Conn, msg neo.Msg)) *tracing.Probe

go/neo/trace.go → go/neo/ztrace.go

@@ -11,7 +11,7 @@ import (
 	"net"
 )
 
-// traceevent: traceConnRecv(c *Conn, msg Msg)	XXX better raw .Text (e.g. comments)
+// traceevent: traceConnRecv(c *Conn, msg Msg)
 
 type _t_traceConnRecv struct {
 	tracing.Probe
@@ -38,7 +38,7 @@ func traceConnRecv_Attach(pg *tracing.ProbeGroup, probe func(c *Conn, msg Msg))
 	return &p.Probe
 }
 
-// traceevent: traceConnSend(c *Conn, msg Msg)	XXX better raw .Text (e.g. comments)
+// traceevent: traceConnSend(c *Conn, msg Msg)
 
 type _t_traceConnSend struct {
 	tracing.Probe
@@ -65,7 +65,16 @@ func traceConnSend_Attach(pg *tracing.ProbeGroup, probe func(c *Conn, msg Msg))
 	return &p.Probe
 }
 
-// traceimport: lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet
+// trace export signature
+func _trace_exporthash_bc56cd7a9caf82c14d9586243f763e65afb91ea0() {}
+
+// traceimport: "lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet"
+
+// rerun "gotrace gen" if you see link failure ↓↓↓
+//go:linkname pipenet_trace_exporthash lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet._trace_exporthash_e77a134646e20f099af466ab3192282237d2e547
+func pipenet_trace_exporthash()
+func init() { pipenet_trace_exporthash() }
+
 
 //go:linkname pipenet_traceAccept_Attach lab.nexedi.com/kirr/neo/go/xcommon/xnet/pipenet.traceAccept_Attach
 func pipenet_traceAccept_Attach(*tracing.ProbeGroup, func(conn net.Conn)) *tracing.Probe

go/neo/ztrace.s

+// Code generated by lab.nexedi.com/kirr/go123/tracing/cmd/gotrace; DO NOT EDIT.
+// empty .s so `go build` does not use -complete for go:linkname to work

go/xcommon/xnet/pipenet/trace.go → go/xcommon/xnet/pipenet/ztrace.go

@@ -10,7 +10,7 @@ import (
 	"net"
 )
 
-// traceevent: traceAccept(conn net.Conn)	XXX better raw .Text (e.g. comments)
+// traceevent: traceAccept(conn net.Conn)
 
 type _t_traceAccept struct {
 	tracing.Probe
@@ -37,7 +37,7 @@ func traceAccept_Attach(pg *tracing.ProbeGroup, probe func(conn net.Conn)) *trac
 	return &p.Probe
 }
 
-// traceevent: traceDial(addr string)	XXX better raw .Text (e.g. comments)
+// traceevent: traceDial(addr string)
 
 type _t_traceDial struct {
 	tracing.Probe
@@ -64,7 +64,7 @@ func traceDial_Attach(pg *tracing.ProbeGroup, probe func(addr string)) *tracing.
 	return &p.Probe
 }
 
-// traceevent: traceListen(laddr string)	XXX better raw .Text (e.g. comments)
+// traceevent: traceListen(laddr string)
 
 type _t_traceListen struct {
 	tracing.Probe
@@ -91,7 +91,7 @@ func traceListen_Attach(pg *tracing.ProbeGroup, probe func(laddr string)) *traci
 	return &p.Probe
 }
 
-// traceevent: traceNew(name string)	XXX better raw .Text (e.g. comments)
+// traceevent: traceNew(name string)
 
 type _t_traceNew struct {
 	tracing.Probe
@@ -118,7 +118,7 @@ func traceNew_Attach(pg *tracing.ProbeGroup, probe func(name string)) *tracing.P
 	return &p.Probe
 }
 
-// traceevent: traceNewHost(host *Host)	XXX better raw .Text (e.g. comments)
+// traceevent: traceNewHost(host *Host)
 
 type _t_traceNewHost struct {
 	tracing.Probe
@@ -144,3 +144,6 @@ func traceNewHost_Attach(pg *tracing.ProbeGroup, probe func(host *Host)) *tracin
 	tracing.AttachProbe(pg, (**tracing.Probe)(unsafe.Pointer(&_traceNewHost)), &p.Probe)
 	return &p.Probe
 }
+
+// trace export signature
+func _trace_exporthash_e77a134646e20f099af466ab3192282237d2e547() {}