Merge pull request #1 from Psykar/fix-recursive-rlock

Fix recursive rlock

Author: Psykar

README.md

@@ -26,7 +26,7 @@ go get github.com/beeker1121/goque
 Import to your project:
 
 ```go
-import "github.com/beeker1121/goque"
+import "github.com/beeker1121/goque/v2"
 ```
 
 ## Usage

example_object_test.go

@@ -3,7 +3,7 @@ package goque_test
 import (
 	"fmt"
 
-	"github.com/beeker1121/goque"
+	"github.com/beeker1121/goque/v2"
 )
 
 // ExampleObject demonstrates enqueuing a struct object.

example_prefix_queue_test.go

@@ -3,7 +3,7 @@ package goque_test
 import (
 	"fmt"
 
-	"github.com/beeker1121/goque"
+	"github.com/beeker1121/goque/v2"
 )
 
 // ExamplePrefixQueue demonstrates the implementation of a Goque queue.

example_priority_queue_test.go

@@ -3,7 +3,7 @@ package goque_test
 import (
 	"fmt"
 
-	"github.com/beeker1121/goque"
+	"github.com/beeker1121/goque/v2"
 )
 
 // ExamplePriorityQueue demonstrates the implementation of a Goque queue.

example_queue_test.go

@@ -3,7 +3,7 @@ package goque_test
 import (
 	"fmt"
 
-	"github.com/beeker1121/goque"
+	"github.com/beeker1121/goque/v2"
 )
 
 // ExampleQueue demonstrates the implementation of a Goque queue.

example_stack_test.go

@@ -3,7 +3,7 @@ package goque_test
 import (
 	"fmt"
 
-	"github.com/beeker1121/goque"
+	"github.com/beeker1121/goque/v2"
 )
 
 // ExampleStack demonstrates the implementation of a Goque stack.

go.mod

@@ -1,4 +1,4 @@
-module github.com/beeker1121/goque
+module github.com/beeker1121/goque/v2
 
 go 1.13
 

priority_queue.go

@@ -282,7 +282,7 @@ func (pq *PriorityQueue) PeekByOffset(offset uint64) (*PriorityItem, error) {
 	}
 
 	// Check if queue is empty.
-	if pq.Length() == 0 {
+	if pq.length() == 0 {
 		return nil, ErrEmpty
 	}
 
@@ -382,6 +382,11 @@ func (pq *PriorityQueue) Length() uint64 {
 	pq.RLock()
 	defer pq.RUnlock()
 
+	return pq.length()
+}
+
+// not goroutine safe - assumes lock already exists
+func (pq *PriorityQueue) length() uint64 {
 	var length uint64
 	for _, v := range pq.levels {
 		length += v.length()

priority_queue_test.go

@@ -2,8 +2,10 @@ package goque
 
 import (
 	"fmt"
+	"io/ioutil"
 	"math"
 	"os"
+	"reflect"
 	"testing"
 	"time"
 )