Skip to content

Test strengthening specs of BatchConn #413

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

Draft
jcp19 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Test strengthening specs of BatchConn #413

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
10 changes: 9 additions & 1 deletion router/dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ type bfdSession interface {
type BatchConn interface {
// @ pred Mem()

// @ requires Mem()
// @ decreases
// @ pure Id() uint16

// @ requires acc(Mem(), _)
// @ requires forall i int :: { &msgs[i] } 0 <= i && i < len(msgs) ==>
// @ msgs[i].Mem()
Expand Down Expand Up @@ -179,11 +183,14 @@ type BatchConn interface {
ReadBatch(msgs underlayconn.Messages /*@, ghost ingressID uint16, ghost prophecyM int, ghost place io.Place @*/) (n int, err error)
// @ requires acc(addr.Mem(), _)
// @ requires acc(Mem(), _)
// @ preserves acc(sl.Bytes(b, 0, len(b)), R10)
// @ requires acc(sl.Bytes(b, 0, len(b)), R10)
// @ requires absIO_val(b, Id()).isValUnsupported
// @ ensures acc(sl.Bytes(b, 0, len(b)), R10)
// @ ensures err == nil ==> 0 <= n && n <= len(b)
// @ ensures err != nil ==> err.ErrorMem()
WriteTo(b []byte, addr *net.UDPAddr) (n int, err error)
// @ requires acc(Mem(), _)
// @ requires Id() == egressID
// (VerifiedSCION) opted for less reusable spec for WriteBatch for
// performance reasons.
// @ requires len(msgs) == 1
Expand Down Expand Up @@ -410,6 +417,7 @@ func (d *DataPlane) AddInternalInterface(conn BatchConn, ip net.IP) error {
// If a connection for the given ID is already set this method will return an
// error. This can only be called on a not yet running dataplane.
// @ requires conn != nil && conn.Mem()
// @ requires conn.Id() == ifID
// @ preserves acc(d.Mem(), OutMutexPerm)
// @ preserves !d.IsRunning()
// @ preserves d.mtx.LockP()
Expand Down
7 changes: 5 additions & 2 deletions router/dataplane_spec.gobra
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ pred accAddr(addrs map[uint16]*net.UDPAddr) {

pred accBatchConn(batchConns map[uint16]BatchConn) {
acc(batchConns) &&
forall b BatchConn :: { b elem range(batchConns) }{ b.Mem() } b elem range(batchConns) ==>
b!= nil && acc(b.Mem(), _)
(forall b BatchConn :: { b elem range(batchConns) }{ b.Mem() } b elem range(batchConns) ==>
b != nil && acc(b.Mem(), _)) &&
(forall i uint16 :: { i elem domain(batchConns) }{ batchConns[i] } i elem domain(batchConns) ==>
BatchConn(batchConns[i]) != nil && BatchConn(batchConns[i]).Id() == i)
}

pred accBfdSession(bfdSessions map[uint16]bfdSession) {
Expand Down Expand Up @@ -671,6 +673,7 @@ pred (d *DataPlane) validResult(result processResult, addrAliasesPkt bool) {
// EgressID
(result.EgressID != 0 ==> result.EgressID elem d.getDomForwardingMetrics()) &&
// OutConn
// TODO: strengthen here for new cond
(result.OutConn != nil ==> acc(result.OutConn.Mem(), _)) &&
// OutAddr
(addrAliasesPkt && result.OutAddr != nil ==> acc(result.OutAddr.Mem(), R15)) &&
Expand Down
Loading