Skip to content

Branch Scheduling #226

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

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Branch Scheduling #226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aac1361
Added initial forkState endpoint to resource API
ruchitpalrecha Feb 25, 2022
41fb542
Added LinkState and RunBranchConcurrently API
ruchitpalrecha Mar 15, 2022
da2bf2c
Added commets
ruchitpalrecha Mar 15, 2022
f9c0c38
Migrated to forking ifaces
ruchitpalrecha Apr 3, 2022
1bb44ba
Added new spec with nested either clauses
ruchitpalrecha Apr 3, 2022
7d6b957
Replaced Read and Write with branchhread and branchwrite
ruchitpalrecha Apr 4, 2022
2e4553a
Exposed abort endpoint for resources and added AbortIFace
ruchitpalrecha Apr 10, 2022
9640dd4
Clean up MPCalCtx/ArchetypeInterface split
fhackett Apr 13, 2022
f418f61
Added slight edits to testing output
ruchitpalrecha Apr 17, 2022
b437f3d
Merge branch 'ruchitp-branch-scheduling' of github.com:UBC-NSS/pgo in…
ruchitpalrecha Apr 17, 2022
28041d2
WIP: make structural improvements to archetype resource API, includin…
fhackett Apr 19, 2022
b8aec0e
Merge branch 'ruchitp-branch-scheduling' of github.com:UBC-NSS/pgo in…
ruchitpalrecha Apr 19, 2022
3d63413
Slight tweak
ruchitpalrecha Apr 19, 2022
8f7c1f5
Comments
ruchitpalrecha Apr 19, 2022
5845815
More comments
ruchitpalrecha Apr 19, 2022
f4ecbd9
WIP: Fix concurrency bug in either implementation
fhackett Apr 20, 2022
8d8bf8b
Code clean up and slight tweaks
ruchitpalrecha Apr 20, 2022
ab080be
Code cleanup and documentation
ruchitpalrecha Apr 20, 2022
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: 10 additions & 0 deletions distsys/archetyperesource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ type ArchetypeResource interface {
// archetype is not running. Close will be called at most once by the MPCal
// Context.
Close() error
// FreshState will be called upon the first use of a resource during the execution of a
// critical section. It provides an ArchetypeResourceState whose purpose is to be used
// to perform operations during the execution of the critical section. A call to FreshState
// creates the expectation that there will be an eventual call to Commit/Abort on the
// resulting ArchetypeResourceState
// Note: FreshState is only meant to be used ONCE during a critical section for a resource
FreshState() ArchetypeResourceState
}

Expand Down Expand Up @@ -50,6 +56,10 @@ type ArchetypeResourceState interface {
// ErrCriticalSectionAborted.
// This makes no sense for a value-like resource, and should be blocked off with ArchetypeResourceLeafMixin in that case.
Index(index tla.TLAValue) (ArchetypeResourceComponent, error)
// ForkState provides a copy to the ArchetypeResourceState such that operations performed on other ArchetypeResourceStates
// with the same parent ArchetypeResource will not cause side effects for the current ArchetypeResourceState.
// ForkState will clone all the parts of a resource whose properties are NOT idempotent. A call to ForkState
// creates the expectation that there will be an eventual call to Commit/Abort on the resulting ArchetypeResourceState
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested rephrasing:

ForkState will clone all the parts of a resource whose properties are NOT idempotent.

ForkState should create a separate copy of any thread-local data held by the original ArcvhetypeResourceState. It is the responsibility of the implementation to ensure side-effects that are not thread-local are synchronized and maintained correctly, given that the two forked versions will be accessed by different goroutines.

ForkState() ArchetypeResourceState
}

Expand Down
34 changes: 0 additions & 34 deletions distsys/mpcalctx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,6 @@ type ArchetypeResourceMakerStruct struct {
ConfigureFn func(res ArchetypeResource)
}

//type ForkedResourceNode struct {
// parent *ForkedResourceNode
// resourceStates map[ArchetypeResourceHandle]ArchetypeResource
// path string
//}

//type ForkedResourceTree struct {
// root *ForkedResourceNode
//}

var _ ArchetypeResourceMaker = ArchetypeResourceMakerStruct{}

func (mkStruct ArchetypeResourceMakerStruct) Make() ArchetypeResource {
Expand All @@ -142,9 +132,6 @@ type MPCalContext struct {

// state for ArchetypeInterface.NextFairnessCounter
fairnessCounter FairnessCounter
// Forked resource tree
//forkedResourceTree ForkedResourceTree
//branchScheduler BranchScheduler

jumpTable MPCalJumpTable
procTable MPCalProcTable
Expand Down Expand Up @@ -431,27 +418,6 @@ func (ctx *MPCalContext) ensureArchetypeResource(name string, maker ArchetypeRes
return handle
}

//func (ctx *MPCalContext) getResourceByHandle(handle ArchetypeResourceHandle) ArchetypeResource {
// //node := ctx.forkedResourceTree.root
// //for {
// // if node == nil {
// // panic(fmt.Errorf("could not find resource with name %v", handle))
// // }
// //
// // res, ok := node.resourceStates[handle]
// // if ok {
// // return res
// // }
// // node = node.parent
// //}
//
// //res, ok := ctx.resources[handle]
// //if !ok {
// // panic(fmt.Errorf("could not find resource with name %v", handle))
// //}
// //return res
//}

func (ctx *MPCalContext) getResourceByHandle(handle ArchetypeResourceHandle) ArchetypeResource {
res, ok := ctx.resources[handle]
if !ok {
Expand Down