From 053b21bd1a11dd3d13c5a8a7fbb922902dc34e0f Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 25 Feb 2016 06:03:23 +0000
Subject: [PATCH] godep clist
---
Godeps/Godeps.json | 6 +-
.../github.com/tendermint/go-clist/LICENSE | 193 ++++++++++++
.../github.com/tendermint/go-clist/clist.go | 285 ++++++++++++++++++
.../tendermint/tendermint/mempool/mempool.go | 2 +-
.../tendermint/mempool/mempool_test.go | 2 +-
.../tendermint/tendermint/mempool/reactor.go | 2 +-
cmd/erisdb/main.go | 4 +-
7 files changed, 488 insertions(+), 6 deletions(-)
create mode 100644 Godeps/_workspace/src/github.com/tendermint/go-clist/LICENSE
create mode 100644 Godeps/_workspace/src/github.com/tendermint/go-clist/clist.go
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cead8403..f0a33c71 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -2,7 +2,7 @@
"ImportPath": "github.com/eris-ltd/eris-db",
"GoVersion": "go1.5.1",
"Packages": [
- "./cmd/erisdb"
+ "./cmd/erisdb/..."
],
"Deps": [
{
@@ -81,6 +81,10 @@
"ImportPath": "github.com/tendermint/flowcontrol",
"Rev": "84d9671090430e8ec80e35b339907e0579b999eb"
},
+ {
+ "ImportPath": "github.com/tendermint/go-clist",
+ "Rev": "634527f5b60fd7c71ca811262493df2ad65ee0ca"
+ },
{
"ImportPath": "github.com/tendermint/log15",
"Comment": "v2.3-36-g6e46075",
diff --git a/Godeps/_workspace/src/github.com/tendermint/go-clist/LICENSE b/Godeps/_workspace/src/github.com/tendermint/go-clist/LICENSE
new file mode 100644
index 00000000..1ec9bd42
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/tendermint/go-clist/LICENSE
@@ -0,0 +1,193 @@
+Tendermint Go-CList
+Copyright (C) 2015 Tendermint
+
+
+
+ Apache License
+ Version 2.0, January 2004
+ https://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/tendermint/go-clist/clist.go b/Godeps/_workspace/src/github.com/tendermint/go-clist/clist.go
new file mode 100644
index 00000000..5295dd99
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/tendermint/go-clist/clist.go
@@ -0,0 +1,285 @@
+package clist
+
+/*
+The purpose of CList is to provide a goroutine-safe linked-list.
+This list can be traversed concurrently by any number of goroutines.
+However, removed CElements cannot be added back.
+NOTE: Not all methods of container/list are (yet) implemented.
+NOTE: Removed elements need to DetachPrev or DetachNext consistently
+to ensure garbage collection of removed elements.
+*/
+
+import (
+ "sync"
+ "sync/atomic"
+ "unsafe"
+)
+
+// CElement is an element of a linked-list
+// Traversal from a CElement are goroutine-safe.
+type CElement struct {
+ prev unsafe.Pointer
+ prevWg *sync.WaitGroup
+ next unsafe.Pointer
+ nextWg *sync.WaitGroup
+ removed uint32
+ Value interface{}
+}
+
+// Blocking implementation of Next().
+// May return nil iff CElement was tail and got removed.
+func (e *CElement) NextWait() *CElement {
+ for {
+ e.nextWg.Wait()
+ next := e.Next()
+ if next == nil {
+ if e.Removed() {
+ return nil
+ } else {
+ continue
+ }
+ } else {
+ return next
+ }
+ }
+}
+
+// Blocking implementation of Prev().
+// May return nil iff CElement was head and got removed.
+func (e *CElement) PrevWait() *CElement {
+ for {
+ e.prevWg.Wait()
+ prev := e.Prev()
+ if prev == nil {
+ if e.Removed() {
+ return nil
+ } else {
+ continue
+ }
+ } else {
+ return prev
+ }
+ }
+}
+
+// Nonblocking, may return nil if at the end.
+func (e *CElement) Next() *CElement {
+ return (*CElement)(atomic.LoadPointer(&e.next))
+}
+
+// Nonblocking, may return nil if at the end.
+func (e *CElement) Prev() *CElement {
+ return (*CElement)(atomic.LoadPointer(&e.prev))
+}
+
+func (e *CElement) Removed() bool {
+ return atomic.LoadUint32(&(e.removed)) > 0
+}
+
+func (e *CElement) DetachNext() {
+ if !e.Removed() {
+ panic("DetachNext() must be called after Remove(e)")
+ }
+ atomic.StorePointer(&e.next, nil)
+}
+
+func (e *CElement) DetachPrev() {
+ if !e.Removed() {
+ panic("DetachPrev() must be called after Remove(e)")
+ }
+ atomic.StorePointer(&e.prev, nil)
+}
+
+func (e *CElement) setNextAtomic(next *CElement) {
+ for {
+ oldNext := atomic.LoadPointer(&e.next)
+ if !atomic.CompareAndSwapPointer(&(e.next), oldNext, unsafe.Pointer(next)) {
+ continue
+ }
+ if next == nil && oldNext != nil { // We for-loop in NextWait() so race is ok
+ e.nextWg.Add(1)
+ }
+ if next != nil && oldNext == nil {
+ e.nextWg.Done()
+ }
+ return
+ }
+}
+
+func (e *CElement) setPrevAtomic(prev *CElement) {
+ for {
+ oldPrev := atomic.LoadPointer(&e.prev)
+ if !atomic.CompareAndSwapPointer(&(e.prev), oldPrev, unsafe.Pointer(prev)) {
+ continue
+ }
+ if prev == nil && oldPrev != nil { // We for-loop in PrevWait() so race is ok
+ e.prevWg.Add(1)
+ }
+ if prev != nil && oldPrev == nil {
+ e.prevWg.Done()
+ }
+ return
+ }
+}
+
+func (e *CElement) setRemovedAtomic() {
+ atomic.StoreUint32(&(e.removed), 1)
+}
+
+//--------------------------------------------------------------------------------
+
+// CList represents a linked list.
+// The zero value for CList is an empty list ready to use.
+// Operations are goroutine-safe.
+type CList struct {
+ mtx sync.Mutex
+ wg *sync.WaitGroup
+ head *CElement // first element
+ tail *CElement // last element
+ len int // list length
+}
+
+func (l *CList) Init() *CList {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+ l.wg = waitGroup1()
+ l.head = nil
+ l.tail = nil
+ l.len = 0
+ return l
+}
+
+func New() *CList { return new(CList).Init() }
+
+func (l *CList) Len() int {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+ return l.len
+}
+
+func (l *CList) Front() *CElement {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+ return l.head
+}
+
+func (l *CList) FrontWait() *CElement {
+ for {
+ l.mtx.Lock()
+ head := l.head
+ wg := l.wg
+ l.mtx.Unlock()
+ if head == nil {
+ wg.Wait()
+ } else {
+ return head
+ }
+ }
+}
+
+func (l *CList) Back() *CElement {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+ return l.tail
+}
+
+func (l *CList) BackWait() *CElement {
+ for {
+ l.mtx.Lock()
+ tail := l.tail
+ wg := l.wg
+ l.mtx.Unlock()
+ if tail == nil {
+ wg.Wait()
+ } else {
+ return tail
+ }
+ }
+}
+
+func (l *CList) PushBack(v interface{}) *CElement {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+
+ // Construct a new element
+ e := &CElement{
+ prev: nil,
+ prevWg: waitGroup1(),
+ next: nil,
+ nextWg: waitGroup1(),
+ Value: v,
+ }
+
+ // Release waiters on FrontWait/BackWait maybe
+ if l.len == 0 {
+ l.wg.Done()
+ }
+ l.len += 1
+
+ // Modify the tail
+ if l.tail == nil {
+ l.head = e
+ l.tail = e
+ } else {
+ l.tail.setNextAtomic(e)
+ e.setPrevAtomic(l.tail)
+ l.tail = e
+ }
+
+ return e
+}
+
+// CONTRACT: Caller must call e.DetachPrev() and/or e.DetachNext() to avoid memory leaks.
+// NOTE: As per the contract of CList, removed elements cannot be added back.
+func (l *CList) Remove(e *CElement) interface{} {
+ l.mtx.Lock()
+ defer l.mtx.Unlock()
+
+ prev := e.Prev()
+ next := e.Next()
+
+ if l.head == nil || l.tail == nil {
+ panic("Remove(e) on empty CList")
+ }
+ if prev == nil && l.head != e {
+ panic("Remove(e) with false head")
+ }
+ if next == nil && l.tail != e {
+ panic("Remove(e) with false tail")
+ }
+
+ // If we're removing the only item, make CList FrontWait/BackWait wait.
+ if l.len == 1 {
+ l.wg.Add(1)
+ }
+ l.len -= 1
+
+ // Connect next/prev and set head/tail
+ if prev == nil {
+ l.head = next
+ } else {
+ prev.setNextAtomic(next)
+ }
+ if next == nil {
+ l.tail = prev
+ } else {
+ next.setPrevAtomic(prev)
+ }
+
+ // Set .Done() on e, otherwise waiters will wait forever.
+ e.setRemovedAtomic()
+ if prev == nil {
+ e.prevWg.Done()
+ }
+ if next == nil {
+ e.nextWg.Done()
+ }
+
+ return e.Value
+}
+
+func waitGroup1() (wg *sync.WaitGroup) {
+ wg = &sync.WaitGroup{}
+ wg.Add(1)
+ return
+}
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
index 2788ced7..e210754f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
@@ -6,7 +6,7 @@ import (
"sync/atomic"
"time"
- "github.com/tendermint/go-clist"
+ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/go-clist"
sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool_test.go
index 1d93efc9..ee91ca3a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool_test.go
@@ -5,8 +5,8 @@ import (
"sync"
"testing"
+ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint/proxy"
- "github.com/tendermint/tendermint/types"
"github.com/tendermint/tmsp/example/counter"
tmsp "github.com/tendermint/tmsp/types"
)
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
index a4949556..0cf41759 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
@@ -12,7 +12,7 @@ import (
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
- "github.com/tendermint/go-clist"
+ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/go-clist"
)
const (
diff --git a/cmd/erisdb/main.go b/cmd/erisdb/main.go
index 11eb26e0..3cdb7d2c 100644
--- a/cmd/erisdb/main.go
+++ b/cmd/erisdb/main.go
@@ -5,8 +5,8 @@ import (
edb "github.com/eris-ltd/eris-db/erisdb"
"os"
- _ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/Sirupsen/logrus" // hack cuz godeps :(
- _ "github.com/tendermint/go-clist" // godeps ...
+ _ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/Sirupsen/logrus" // hack cuz godeps :(
+ _ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/go-clist" // godeps ...
)
// TODO the input stuff.
--
GitLab