reorganize package for a more idomatic go

3 files changed, 229 insertions, 0 deletions

diff --git a/util/lamport/lamport.go b/util/lamport/lamport.go
new file mode 100644
index 00000000..640c58bc
--- /dev/null
+++ b/util/lamport/lamport.go
@@ -0,0 +1,85 @@
+/*
+
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this file,
+	You can obtain one at http://mozilla.org/MPL/2.0/.
+
+	Copyright (c) 2013, Armon Dadgar armon.dadgar@gmail.com
+	Copyright (c) 2013, Mitchell Hashimoto mitchell.hashimoto@gmail.com
+
+	Alternatively, the contents of this file may be used under the terms
+	of the GNU General Public License Version 3 or later, as described below:
+
+	This file is free software: you may copy, redistribute and/or modify
+	it under the terms of the GNU General Public License as published by the
+	Free Software Foundation, either version 3 of the License, or (at your
+	option) any later version.
+
+	This file is distributed in the hope that it will be useful, but
+	WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+	Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see http://www.gnu.org/licenses/.
+
+*/
+
+package lamport
+
+import (
+	"sync/atomic"
+)
+
+// Clock is a thread safe implementation of a lamport clock. It
+// uses efficient atomic operations for all of its functions, falling back
+// to a heavy lock only if there are enough CAS failures.
+type Clock struct {
+	counter uint64
+}
+
+// Time is the value of a Clock.
+type Time uint64
+
+func NewClock() Clock {
+	return Clock{
+		counter: 1,
+	}
+}
+
+func NewClockWithTime(time uint64) Clock {
+	return Clock{
+		counter: time,
+	}
+}
+
+// Time is used to return the current value of the lamport clock
+func (l *Clock) Time() Time {
+	return Time(atomic.LoadUint64(&l.counter))
+}
+
+// Increment is used to return the value of the lamport clock and increment it afterwards
+func (l *Clock) Increment() Time {
+	return Time(atomic.AddUint64(&l.counter, 1) - 1)
+}
+
+// Witness is called to update our local clock if necessary after
+// witnessing a clock value received from another process
+func (l *Clock) Witness(v Time) {
+WITNESS:
+	// If the other value is old, we do not need to do anything
+	cur := atomic.LoadUint64(&l.counter)
+	other := uint64(v)
+	if other < cur {
+		return
+	}
+
+	// Ensure that our local clock is at least one ahead.
+	if !atomic.CompareAndSwapUint64(&l.counter, cur, other+1) {
+		// CAS: CompareAndSwap
+		// The CAS failed, so we just retry. Eventually our CAS should
+		// succeed or a future witness will pass us by and our witness
+		// will end.
+		goto WITNESS
+	}
+}
diff --git a/util/lamport/lamport_test.go b/util/lamport/lamport_test.go
new file mode 100644
index 00000000..c650fe6a
--- /dev/null
+++ b/util/lamport/lamport_test.go
@@ -0,0 +1,66 @@
+/*
+
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this file,
+	You can obtain one at http://mozilla.org/MPL/2.0/.
+
+	Copyright (c) 2013, Armon Dadgar armon.dadgar@gmail.com
+	Copyright (c) 2013, Mitchell Hashimoto mitchell.hashimoto@gmail.com
+
+	Alternatively, the contents of this file may be used under the terms
+	of the GNU General Public License Version 3 or later, as described below:
+
+	This file is free software: you may copy, redistribute and/or modify
+	it under the terms of the GNU General Public License as published by the
+	Free Software Foundation, either version 3 of the License, or (at your
+	option) any later version.
+
+	This file is distributed in the hope that it will be useful, but
+	WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+	Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see http://www.gnu.org/licenses/.
+
+*/
+
+package lamport
+
+import (
+	"testing"
+)
+
+func TestClock(t *testing.T) {
+	l := &Clock{}
+
+	if l.Time() != 0 {
+		t.Fatalf("bad time value")
+	}
+
+	if l.Increment() != 0 {
+		t.Fatalf("bad time value")
+	}
+
+	if l.Time() != 1 {
+		t.Fatalf("bad time value")
+	}
+
+	l.Witness(41)
+
+	if l.Time() != 42 {
+		t.Fatalf("bad time value")
+	}
+
+	l.Witness(41)
+
+	if l.Time() != 42 {
+		t.Fatalf("bad time value")
+	}
+
+	l.Witness(30)
+
+	if l.Time() != 42 {
+		t.Fatalf("bad time value")
+	}
+}
diff --git a/util/lamport/persisted_lamport.go b/util/lamport/persisted_lamport.go
new file mode 100644
index 00000000..4f12dd1b
--- /dev/null
+++ b/util/lamport/persisted_lamport.go
@@ -0,0 +1,78 @@
+package lamport
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+type Persisted struct {
+	Clock
+	filePath string
+}
+
+func NewPersisted(filePath string) *Persisted {
+	clock := &Persisted{
+		Clock:    NewClock(),
+		filePath: filePath,
+	}
+	return clock
+}
+
+func LoadPersisted(filePath string) (*Persisted, error) {
+	clock := &Persisted{
+		filePath: filePath,
+	}
+
+	err := clock.read()
+	if err != nil {
+		return nil, err
+	}
+
+	return clock, nil
+}
+
+func (c *Persisted) Increment() (Time, error) {
+	time := c.Clock.Increment()
+	return time, c.Write()
+}
+
+func (c *Persisted) Witness(time Time) error {
+	// TODO: rework so that we write only when the clock was actually updated
+	c.Clock.Witness(time)
+	return c.Write()
+}
+
+func (c *Persisted) read() error {
+	content, err := ioutil.ReadFile(c.filePath)
+	if err != nil {
+		return err
+	}
+
+	var value uint64
+	n, err := fmt.Sscanf(string(content), "%d", &value)
+
+	if err != nil {
+		return err
+	}
+
+	if n != 1 {
+		return fmt.Errorf("could not read the clock")
+	}
+
+	c.Clock = NewClockWithTime(value)
+
+	return nil
+}
+
+func (c *Persisted) Write() error {
+	dir := filepath.Dir(c.filePath)
+	err := os.MkdirAll(dir, 0777)
+	if err != nil {
+		return err
+	}
+
+	data := []byte(fmt.Sprintf("%d", c.counter))
+	return ioutil.WriteFile(c.filePath, data, 0644)
+}