From 1429d749d99a83d982f8ee3169020bef847100fd Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Thu, 5 Nov 2015 15:37:36 +0000
Subject: [PATCH] Rename semaphore v/p to release/acquire.

---
 xfer/multi_publisher.go               | 8 ++++----
 xfer/multi_publisher_internal_test.go | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xfer/multi_publisher.go b/xfer/multi_publisher.go
index dbd666b86..ba2f1ec11 100644
--- a/xfer/multi_publisher.go
+++ b/xfer/multi_publisher.go
@@ -47,8 +47,8 @@ func (p *MultiPublisher) Set(target string, endpoints []string) {
 	c := make(chan tuple, len(endpoints))
 	for _, endpoint := range endpoints {
 		go func(endpoint string) {
-			p.sema.p()
-			defer p.sema.v()
+			p.sema.acquire()
+			defer p.sema.release()
 			id, publisher, err := p.factory(target, endpoint)
 			c <- tuple{publisher, target, endpoint, id, err}
 		}(endpoint)
@@ -140,5 +140,5 @@ func newSemaphore(n int) semaphore {
 	}
 	return semaphore(c)
 }
-func (s semaphore) p() { <-s }
-func (s semaphore) v() { s <- struct{}{} }
+func (s semaphore) acquire() { <-s }
+func (s semaphore) release() { s <- struct{}{} }
diff --git a/xfer/multi_publisher_internal_test.go b/xfer/multi_publisher_internal_test.go
index 4400b1b2e..66523adc4 100644
--- a/xfer/multi_publisher_internal_test.go
+++ b/xfer/multi_publisher_internal_test.go
@@ -12,7 +12,7 @@ func TestSemaphore(t *testing.T) {
 	// First n should be fine
 	for i := 0; i < n; i++ {
 		ok := make(chan struct{})
-		go func() { s.p(); close(ok) }()
+		go func() { s.acquire(); close(ok) }()
 		select {
 		case <-ok:
 		case <-time.After(10 * time.Millisecond):
@@ -22,7 +22,7 @@ func TestSemaphore(t *testing.T) {
 
 	// This should block
 	ok := make(chan struct{})
-	go func() { s.p(); close(ok) }()
+	go func() { s.acquire(); close(ok) }()
 	select {
 	case <-ok:
 		t.Errorf("%dth p OK, but should block", n+1)
@@ -30,7 +30,7 @@ func TestSemaphore(t *testing.T) {
 		//t.Logf("%dth p blocks, as expected", n+1)
 	}
 
-	s.v()
+	s.release()
 
 	select {
 	case <-ok: