Skip to content

Commit

Permalink
Switch to new primitive package
Browse files Browse the repository at this point in the history
  • Loading branch information
@tchajed
tchajed committed Jul 20, 2024
1 parent b7f79c0 commit 1d09d43
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion addr/addr.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package addr

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion buf/buf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package buf

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/tchajed/marshal"

"github.com/mit-pdos/go-journal/addr"
Expand Down
2 changes: 1 addition & 1 deletion buf/buf_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package buf

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"testing"

Expand Down
2 changes: 1 addition & 1 deletion common/common.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package common

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/mit-pdos/go-journal

go 1.21
go 1.22

require (
github.com/goose-lang/goose v0.6.2
github.com/goose-lang/primitive v0.1.0
github.com/stretchr/testify v1.9.0
github.com/tchajed/marshal v0.6.1
github.com/tchajed/marshal v0.6.2
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/goose-lang/std v0.3.3 // indirect
github.com/goose-lang/std v0.4.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.22.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/goose-lang/goose v0.6.2 h1:Z39QWk7UowzisFL9rnLd4/C+Cg0VF8oPvqOUE+aGB+w=
github.com/goose-lang/goose v0.6.2/go.mod h1:jSP/O+LNLVD4P4itkfh8Ly05NdJ1NYbLjYWkoZs86WU=
github.com/goose-lang/std v0.3.3 h1:UjxgenvQFlWKpxqJjbIlbaXsqwP0Sh+FzY63sF+4NkY=
github.com/goose-lang/std v0.3.3/go.mod h1:9sR9tiZzSzUGh5erxPX3gbWpVZ/4Kjs2C2zGfKUqoNk=
github.com/goose-lang/primitive v0.1.0 h1:JReOdFzUdGD7f8nWTC/uOlNpBdVFU4q8HzMSgn8edaY=
github.com/goose-lang/primitive v0.1.0/go.mod h1:sDE72zVH81ASwPXc1m9OgSfaaY0aZHu4Ty19FgONpOc=
github.com/goose-lang/std v0.4.1 h1:ezoEYbvePtF2TD8vuUUTt5lO893CA6QTgoBX896F8BU=
github.com/goose-lang/std v0.4.1/go.mod h1:bnKHDHwU0lHf99eMI5PVM77UweRyu6qgM/h43qGBRto=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
Expand All @@ -12,8 +12,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tchajed/marshal v0.6.1 h1:fSpd/Q/Fxc4Pn2BqqmBQyUUKGqRyZ4jdu3sQqwa2FW0=
github.com/tchajed/marshal v0.6.1/go.mod h1:bpCjDLDucqTM51woyzbZP5ku3hT4TORx7YGhyWSUpA4=
github.com/tchajed/marshal v0.6.2 h1:DSrylV2Sc47G4RJG2KSOp7HrA76Hd5Bj2WVGtXB/bCw=
github.com/tchajed/marshal v0.6.2/go.mod h1:nY/NmbQidx2CdBY4Y8NdUTnDXgWmhQ6Hg1es+PnxBx8=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
2 changes: 1 addition & 1 deletion jrnl/jrnl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"testing"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/mit-pdos/go-journal/addr"
"github.com/mit-pdos/go-journal/jrnl"
"github.com/mit-pdos/go-journal/obj"
Expand Down
2 changes: 1 addition & 1 deletion jrnl_replication/jrnl_replication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package replicated_block
import (
"sync"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/addr"
"github.com/mit-pdos/go-journal/common"
Expand Down
2 changes: 1 addition & 1 deletion jrnl_replication/jrnl_replication_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package replicated_block
import (
"testing"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/stretchr/testify/assert"

"github.com/mit-pdos/go-journal/obj"
Expand Down
2 changes: 1 addition & 1 deletion obj/obj.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package obj

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/addr"
"github.com/mit-pdos/go-journal/buf"
Expand Down
2 changes: 1 addition & 1 deletion txn/txn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package txn

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/addr"
"github.com/mit-pdos/go-journal/jrnl"
Expand Down
2 changes: 1 addition & 1 deletion txn/txn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/rand"
"testing"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/mit-pdos/go-journal/addr"
"github.com/mit-pdos/go-journal/txn"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion wal/00walconst.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package wal

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/common"
)
Expand Down
2 changes: 1 addition & 1 deletion wal/0circular.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wal

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/tchajed/marshal"

"github.com/mit-pdos/go-journal/common"
Expand Down
2 changes: 1 addition & 1 deletion wal/0waldefs.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wal

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/common"

Expand Down
2 changes: 1 addition & 1 deletion wal/installer.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wal

import (
"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/util"
)
Expand Down
4 changes: 2 additions & 2 deletions wal/logger.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wal

import (
"github.com/goose-lang/goose/machine"
"github.com/goose-lang/primitive"
"github.com/mit-pdos/go-journal/util"
)

Expand Down Expand Up @@ -48,7 +48,7 @@ func (l *Walog) logAppend(circ *circularAppender) bool {

l.memLock.Lock()

machine.Linearize()
primitive.Linearize()

l.st.diskEnd = diskEnd + LogPosition(len(newbufs))
l.condLogger.Broadcast()
Expand Down
10 changes: 5 additions & 5 deletions wal/wal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package wal
import (
"sync"

"github.com/goose-lang/goose/machine"
"github.com/goose-lang/primitive"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"

"github.com/mit-pdos/go-journal/common"
"github.com/mit-pdos/go-journal/util"
Expand Down Expand Up @@ -86,7 +86,7 @@ func (st *WalogState) readMem(blkno common.Bnum) (disk.Block, bool) {
func (l *Walog) ReadMem(blkno common.Bnum) (disk.Block, bool) {
l.memLock.Lock()
blk, ok := l.st.readMem(blkno)
machine.Linearize()
primitive.Linearize()
l.memLock.Unlock()
return blk, ok
}
Expand Down Expand Up @@ -143,7 +143,7 @@ func (l *Walog) MemAppend(bufs []Update) (LogPosition, bool) {
}
if st.memLogHasSpace(uint64(len(bufs))) {
txn = doMemAppend(st.memLog, bufs)
machine.Linearize()
primitive.Linearize()
break
}
util.DPrintf(5, "memAppend: log is full; try again")
Expand Down Expand Up @@ -176,7 +176,7 @@ func (l *Walog) Flush(pos LogPosition) {
for !(pos <= l.st.diskEnd) {
l.condLogger.Wait()
}
machine.Linearize()
primitive.Linearize()
// establishes pos <= l.st.diskEnd
// (pos is now durably on disk)
l.memLock.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion wal/wal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/goose-lang/goose/machine/disk"
"github.com/goose-lang/primitive/disk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"

Expand Down

0 comments on commit 1d09d43

Please sign in to comment.