Skip to content

Early deadlock detection #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jp-fizzbee wants to merge 1 commit into from
Closed

Early deadlock detection #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import (
ast "fizz/proto"
"flag"
"fmt"
"github.com/fizzbee-io/fizzbee/lib"
"github.com/fizzbee-io/fizzbee/modelchecker"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"os"
"os/signal"
"path/filepath"
Expand All @@ -19,6 +15,11 @@ import (
"sync/atomic"
"syscall"
"time"

"github.com/fizzbee-io/fizzbee/lib"
"github.com/fizzbee-io/fizzbee/modelchecker"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)

var isPlayground bool
Expand Down Expand Up @@ -676,7 +677,10 @@ func modelCheckSingleSpec(f *ast.File, stateConfig *ast.StateSpaceOptions, dirPa
}

} else if failedNode != nil {
if failedNode.FailedInvariants != nil && len(failedNode.FailedInvariants) > 0 && len(failedNode.FailedInvariants[0]) > 0 {
if failedNode.Process.Deadlock {
fmt.Println("DEADLOCK detected")
fmt.Println("FAILED: Model checker failed")
} else if failedNode.FailedInvariants != nil && len(failedNode.FailedInvariants) > 0 && len(failedNode.FailedInvariants[0]) > 0 {
fmt.Println("FAILED: Model checker failed. Invariant: ", f.Invariants[failedNode.FailedInvariants[0][0]].Name)
} else if simulation {
fmt.Println("FAILED: Model checker failed. Deadlock/stuttering detected")
Expand Down
24 changes: 22 additions & 2 deletions modelchecker/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ type Process struct {

Enabled bool `json:"-"`
ThreadProgress bool `json:"-"`
Deadlock bool `json:"-"`

Roles []*lib.Role `json:"roles"`
Channels map[int]*lib.Channel `json:"channels"`
Expand Down Expand Up @@ -915,6 +916,8 @@ func (n *Node) Duplicate(other *Node, yield bool) {
} else {
other.Name = n.Name
}
} else if yield {
other.Name = "yield"
}
parent := n.Inbound[0].Node
other.Inbound = append(other.Inbound, n.Inbound[0])
Expand Down Expand Up @@ -1184,6 +1187,7 @@ func (p *Processor) Start() (init *Node, failedNode *Node, err error) {

invariantFailure := false
symmetryFound := false
yieldFoundForStep := false
for {
if len(p.visited)%20000 == 0 && len(p.visited) != prevCount {
if p.isTest {
Expand All @@ -1198,7 +1202,7 @@ func (p *Processor) Start() (init *Node, failedNode *Node, err error) {
p.visited = make(map[string]*Node)
}

if node.Process != nil && p.config.Options.GetCrashOnYield() && node.Enabled && (node.Name == "yield" || node.Name == "crash") {
if node.Process != nil && p.config.GetOptions().GetCrashOnYield() && node.Enabled && (node.Name == "yield" || node.Name == "crash") {
failedCrashNode := p.crashProcess(node)
if failedCrashNode != nil && failedNode == nil {
failedNode = failedCrashNode
Expand All @@ -1207,12 +1211,28 @@ func (p *Processor) Start() (init *Node, failedNode *Node, err error) {
break
}
}
if node.Process != nil && (node.Name == "yield" || node.Name == "crash") {
yieldFoundForStep = true
}
if p.intermediateStates.Len() == 0 {
if !yieldFoundForStep && !invariantFailure && !p.stopped && p.config.GetDeadlockDetection() {
// Deadlock detected
//fmt.Printf("Deadlock detected at node: %v\n", node.Name)
if len(node.Inbound) > 0 {
failedNode = node.Inbound[0].Node
} else {
failedNode = node
}
failedNode.Process.Deadlock = true
invariantFailure = true
}
break
}
node, _ = p.intermediateStates.Remove()
}

if failedNode != nil {
break
}
if symmetryFound {
continue
}
Expand Down