fix(runtime:funcs): deadlock

.golangci.yml

@@ -6,6 +6,7 @@ run:
 linters:
   enable-all: true
   disable:
+    - depguard # enforces to manually configure imports white-list
     - godox # todo/fixme
     - godot # dots at the end of comments
     - gomnd # magic number

cmd/interpreter/main.go

@@ -40,7 +40,7 @@ func main() {
 	}
 
 	intr := interpreter.MustNew(
-		parser.New(),
+		parser.New(false),
 		irgen.New(),
 		interpreter.MustNewTransformer(),
 		runTime,

internal/interpreter/transformer.go

@@ -119,6 +119,7 @@ func (t transformer) Transform(ctx context.Context, irprog *ir.Program) (runtime
 func (t transformer) msg(msg *ir.Msg) (runtime.Msg, error) {
 	var rMsg runtime.Msg
 
+	//nolint:nosnakecase
 	switch msg.Type {
 	case ir.MsgType_MSG_TYPE_BOOL:
 		rMsg = runtime.NewBoolMsg(msg.Bool)

internal/parser/parser.go

@@ -16,7 +16,9 @@ type treeShapeListener struct {
 	file src.Package
 }
 
-type Parser struct{}
+type Parser struct {
+	isDebug bool
+}
 
 func (p Parser) ParseFiles(ctx context.Context, files map[string][]byte) (map[string]src.Package, error) {
 	result := make(map[string]src.Package, len(files))
@@ -43,17 +45,23 @@ func (p Parser) ParseFile(ctx context.Context, bb []byte) (src.Package, error) {
 	input := antlr.NewInputStream(string(bb))
 	lexer := generated.NewnevaLexer(input)
 	stream := antlr.NewCommonTokenStream(lexer, 0)
-	prsr := generated.NewnevaParser(stream)
-	prsr.AddErrorListener(antlr.NewDiagnosticErrorListener(true))
-	prsr.BuildParseTrees = true
-	tree := prsr.Prog()
+
+	parse := generated.NewnevaParser(stream)
+	if p.isDebug {
+		parse.AddErrorListener(antlr.NewDiagnosticErrorListener(true))
+	}
+	parse.BuildParseTrees = true
+
+	tree := parse.Prog()
 	listener := &treeShapeListener{}
 
 	antlr.ParseTreeWalkerDefault.Walk(listener, tree)
 
 	return listener.file, nil
 }
 
-func New() Parser {
-	return Parser{}
+func New(isDebug bool) Parser {
+	return Parser{
+		isDebug: isDebug,
+	}
 }

internal/runtime/connector.go

@@ -104,15 +104,15 @@ func (c DefaultConnector) distribute(
 type DefaultInterceptor struct{}
 
 func (i DefaultInterceptor) AfterSending(from SenderConnectionSideMeta, msg Msg) Msg {
-	fmt.Printf("after sending %v -> %v\n", from, msg)
+	// fmt.Printf("after sending: %v -> %v\n", from, msg)
 	return msg
 }
 
 func (i DefaultInterceptor) BeforeReceiving(from SenderConnectionSideMeta, to ReceiverConnectionSideMeta, msg Msg) Msg {
-	fmt.Printf("before receiving %v <- %v <- %v\n", to, msg, from)
+	// fmt.Printf("before receiving: %v -> %v -> %v\n", from, msg, to)
 	return msg
 }
 
 func (i DefaultInterceptor) AfterReceiving(from SenderConnectionSideMeta, to ReceiverConnectionSideMeta, msg Msg) {
-	fmt.Printf("after receiving %v -> %v -> %v\n", from, msg, to)
+	// fmt.Printf("after receiving: %v -> %v -> %v\n", from, msg, to)
 }

internal/runtime/funcs/funcs.go

@@ -23,8 +23,17 @@ func Print(ctx context.Context, io runtime.FuncIO) (func(), error) {
 			case <-ctx.Done():
 				return
 			case v := <-vin:
-				fmt.Println(v.String())
-				vout <- v
+				select {
+				case <-ctx.Done():
+					return
+				default:
+					fmt.Println(v.String())
+					select {
+					case <-ctx.Done():
+						return
+					case vout <- v:
+					}
+				}
 			}
 		}
 	}, nil
@@ -47,12 +56,18 @@ func Lock(ctx context.Context, io runtime.FuncIO) (func(), error) {
 		for {
 			select {
 			case <-ctx.Done():
-				fmt.Println(ctx.Err())
 				return
-			default:
-				<-sig
-				v := <-vin
-				vout <- v
+			case <-sig:
+				select {
+				case <-ctx.Done():
+					return
+				case v := <-vin:
+					select {
+					case <-ctx.Done():
+						return
+					case vout <- v:
+					}
+				}
 			}
 		}
 	}, nil
@@ -63,6 +78,7 @@ func Const(ctx context.Context, io runtime.FuncIO) (func(), error) {
 	if msg == nil {
 		return nil, errors.New("ctx msg not found")
 	}
+
 	v, ok := msg.(runtime.Msg)
 	if !ok {
 		return nil, errors.New("ctx value is not runtime message")
@@ -78,8 +94,7 @@ func Const(ctx context.Context, io runtime.FuncIO) (func(), error) {
 			select {
 			case <-ctx.Done():
 				return
-			default:
-				vout <- v
+			case vout <- v:
 			}
 		}
 	}, nil

internal/runtime/msg.go

@@ -66,7 +66,7 @@ type StrMsg struct {
 }
 
 func (msg StrMsg) Str() string    { return msg.v }
-func (msg StrMsg) String() string { return strconv.Quote(msg.v) }
+func (msg StrMsg) String() string { return msg.v }
 
 func NewStrMsg(s string) StrMsg {
 	return StrMsg{

internal/runtime/program.go

@@ -57,6 +57,10 @@ type SenderConnectionSideMeta struct {
 	PortAddr PortAddr
 }
 
+func (c SenderConnectionSideMeta) String() string {
+	return c.PortAddr.String()
+}
+
 type ReceiverConnectionSideMeta struct {
 	PortAddr  PortAddr
 	Selectors []string

internal/runtime/runtime.go

@@ -78,8 +78,6 @@ func (r Runtime) Run(ctx context.Context, prog Program) (code int, err error) {
 
 	var exitCode int64
 	go func() {
-		msg := <-exit
-		fmt.Println(msg)
 		exitCode = (<-exit).Int()
 		cancel()
 	}()