From 4c160678b369d73dac418c718b764e093c61a300 Mon Sep 17 00:00:00 2001
From: Miki <mikif70@gmail.com>
Date: Fri, 27 Nov 2015 10:32:58 +0100
Subject: [PATCH] modificati i nomi delle funzioni del Counter

---
 counter.go | 40 ++++++++++++++++++++--------------------
 main.go    |  6 +++---
 remover.go |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/counter.go b/counter.go
index 44c10cf..7d5ae02 100644
--- a/counter.go
+++ b/counter.go
@@ -28,84 +28,84 @@ func NewCounter() *Counter {
 
 func (c *Counter) AddUser() {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.user++
-	c.mu.Unlock()
 }
 
 func (c *Counter) AddDuplicate() {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.dup++
-	c.mu.Unlock()
 }
 
 func (c *Counter) AddLog(add int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.log += add
-	c.mu.Unlock()
 }
 
 func (c *Counter) AddRem(add int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.rem += add
-	c.mu.Unlock()
 }
 
 func (c *Counter) AddWG(id int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.wg[id]++
-	c.mu.Unlock()
 }
 
 func (c *Counter) AddErr() {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.err++
-	c.mu.Unlock()
 }
 
-func (c *Counter) RemWG(id int) {
+func (c *Counter) DelWG(id int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.wg[id]--
-	c.mu.Unlock()
 }
 
-func (c *Counter) ValUser() (ret int) {
+func (c *Counter) GetUser() (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.user
-	c.mu.Unlock()
 	return
 }
 
-func (c *Counter) ValDup() (ret int) {
+func (c *Counter) GetDup() (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.dup
-	c.mu.Unlock()
 	return
 }
 
-func (c *Counter) ValLog() (ret int) {
+func (c *Counter) GetLog() (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.log
-	c.mu.Unlock()
 	return
 }
 
-func (c *Counter) ValErr() (ret int) {
+func (c *Counter) GetErr() (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.err
-	c.mu.Unlock()
 	return
 }
 
-func (c *Counter) ValRem() (ret int) {
+func (c *Counter) GetRem() (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.rem
-	c.mu.Unlock()
 	return
 }
 
-func (c *Counter) ValWG(id int) (ret int) {
+func (c *Counter) GetWG(id int) (ret int) {
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	ret = c.wg[id]
-	c.mu.Unlock()
 	return
 }
diff --git a/main.go b/main.go
index 8f86956..85dd13e 100644
--- a/main.go
+++ b/main.go
@@ -89,10 +89,10 @@ func main() {
 
 	fmt.Println("Waiting WG")
 	for i := 0; i < opts.Concurrent; i++ {
-		fmt.Printf("ID (%d): %d\n", i, count.ValWG(i))
+		fmt.Printf("ID (%d): %d\n", i, count.GetWG(i))
 	}
 	wg.Wait()
 
-	fmt.Printf("Stop %v - user: %d - login: %d - errors: %d - rem: %d - duplicate: %d\n\r", time.Since(start), count.ValUser(), count.ValLog(), count.ValErr(), count.ValRem(), count.ValDup())
-	log.Printf("Stop %v - user: %d - login: %d - errors: %d - rem: %d - duplicate: %d\n\r", time.Since(start), count.ValUser(), count.ValLog(), count.ValErr(), count.ValRem(), count.ValDup())
+	fmt.Printf("Stop %v - user: %d - login: %d - errors: %d - rem: %d - duplicate: %d\n\r", time.Since(start), count.GetUser(), count.GetLog(), count.GetErr(), count.GetRem(), count.GetDup())
+	log.Printf("Stop %v - user: %d - login: %d - errors: %d - rem: %d - duplicate: %d\n\r", time.Since(start), count.GetUser(), count.GetLog(), count.GetErr(), count.GetRem(), count.GetDup())
 }
diff --git a/remover.go b/remover.go
index dffbac6..c5541e1 100644
--- a/remover.go
+++ b/remover.go
@@ -27,7 +27,7 @@ func remover(id int) {
 				fmt.Printf("SADD (%d): %s\n", id, rem.user)
 			}
 			conn.Send("sadd", "llindex", rem.user)
-			if count.ValErr() >= opts.MaxError {
+			if count.GetErr() >= opts.MaxError {
 				exit()
 			}
 		}
@@ -38,6 +38,6 @@ func remover(id int) {
 			fmt.Printf("LREM (%d): %s - %d - %+v\n", id, rem.user, len(rem.logins), time.Since(start))
 		}
 		wg.Done()
-		count.RemWG(id)
+		count.DelWG(id)
 	}
 }