Add file async_disk, clean up

Author: jtassarotti

machine/async_disk/async_disk.go

@@ -14,75 +14,3 @@ type Block = disk.Block
 const BlockSize uint64 = disk.BlockSize
 
 type Disk = disk.Disk
-
-/*
-// Disk provides access to a logical block-based disk
-type Disk interface {
-	// Read reads a disk block by address
-	//
-	// Expects a < Size().
-	Read(a uint64) Block
-
-	// ReadTo reads the disk block at a and stores the result in b
-	//
-	// Expects a < Size().
-	ReadTo(a uint64, b Block)
-
-	// Write updates a disk block by address
-	//
-	// Expects a < Size().
-	Write(a uint64, v Block)
-
-	// Size reports how big the disk is, in blocks
-	Size() uint64
-
-	// Barrier ensures data is persisted.
-	//
-	// When it returns, all outstanding writes are guaranteed to be durably on
-	// disk
-	Barrier()
-
-	// Close releases any resources used by the disk and makes it unusable.
-	Close()
-}
-
-var implicitDisk Disk
-
-// Init sets up the global disk
-func Init(d Disk) {
-	implicitDisk = d
-}
-
-// Get returns the previously-initialized global disk
-func Get() Disk {
-	return implicitDisk
-}
-
-// Read (see the Disk documentation)
-//
-// Deprecated: use Get() and the Disk method
-func Read(a uint64) Block {
-	return implicitDisk.Read(a)
-}
-
-// Write (see the Disk documentation)
-//
-// Deprecated: use Get() and the Disk method
-func Write(a uint64, v Block) {
-	implicitDisk.Write(a, v)
-}
-
-// Size (see the Disk documentation)
-//
-// Deprecated: use Get() and the Disk method
-func Size() uint64 {
-	return implicitDisk.Size()
-}
-
-// Barrier (see the Disk documentation)
-//
-// Deprecated: use Get() and the Disk method
-func Barrier() {
-	implicitDisk.Barrier()
-}
-*/

machine/async_disk/file.go

@@ -0,0 +1,13 @@
+package async_disk
+
+import (
+	"github.com/tchajed/goose/machine/disk"
+)
+
+type FileDisk = disk.FileDisk
+
+func NewFileDisk(path string, numBlocks uint64) (FileDisk, error) {
+	return disk.NewFileDisk(path, numBlocks)
+}
+
+var _ Disk = FileDisk{}

machine/async_disk/mem.go

@@ -11,25 +11,3 @@ func NewMemDisk(numBlocks uint64) MemDisk {
 }
 
 var _ Disk = MemDisk{}
-
-/*
-func (d MemDisk) ReadTo(a uint64, buf Block) {
-	d.disk.ReadTo(a, buf)
-}
-
-func (d MemDisk) Read(a uint64) Block {
-	return d.disk.Read(a)
-}
-
-func (d MemDisk) Write(a uint64, v Block) {
-	d.disk.Write(a, v)
-}
-
-func (d MemDisk) Size() uint64 {
-	return d.disk.Size()
-}
-
-func (d MemDisk) Barrier() { d.disk.Barrier() }
-
-func (d MemDisk) Close() { d.disk.Close () }
-*/