shithub: hugo

Download patch

ref: c846b051f3ecbf42d31bc992567946e8569d3881
parent: fa1a9653e5147731657269ba3d71124f1fda79c7
author: Bjørn Erik Pedersen <[email protected]>
date: Thu Mar 24 11:33:25 EDT 2016 

Do not use defer for unlocking in Scratch

It is a fairly costly operation:

```
benchmark                 old ns/op     new ns/op     delta
BenchmarkScratchGet-4     109           31.6          -71.01%

benchmark                 old allocs     new allocs     delta
BenchmarkScratchGet-4     0              0              +0.00%

benchmark                 old bytes     new bytes     delta
BenchmarkScratchGet-4     0             0             +0.00%
´´´


--- a/hugolib/scratch.go
+++ b/hugolib/scratch.go
@@ -31,11 +31,11 @@
 //
 // If the first add for a key is an array or slice, then the next value(s) will be appended.
 func (c *Scratch) Add(key string, newAddend interface{}) (string, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
 
 	var newVal interface{}
+	c.mu.RLock()
 	existingAddend, found := c.values[key]
+	c.mu.RUnlock()
 	if found {
 		var err error
 
@@ -57,7 +57,9 @@
 	} else {
 		newVal = newAddend
 	}
+	c.mu.Lock()
 	c.values[key] = newVal
+	c.mu.Unlock()
 	return "", nil // have to return something to make it work with the Go templates
 }
 
@@ -65,9 +67,8 @@
 // This value can later be retrieved with Get.
 func (c *Scratch) Set(key string, value interface{}) string {
 	c.mu.Lock()
-	defer c.mu.Unlock()
-
 	c.values[key] = value
+	c.mu.Unlock()
 	return ""
 }
 
@@ -74,9 +75,10 @@
 // Get returns a value previously set by Add or Set
 func (c *Scratch) Get(key string) interface{} {
 	c.mu.RLock()
-	defer c.mu.RUnlock()
+	val := c.values[key]
+	c.mu.RUnlock()
 
-	return c.values[key]
+	return val
 }
 
 // SetInMap stores a value to a map with the given key in the Node context.
@@ -83,8 +85,6 @@
 // This map can later be retrieved with GetSortedMapValues.
 func (c *Scratch) SetInMap(key string, mapKey string, value interface{}) string {
 	c.mu.Lock()
-	defer c.mu.Unlock()
-
 	_, found := c.values[key]
 	if !found {
 		c.values[key] = make(map[string]interface{})
@@ -91,6 +91,7 @@
 	}
 
 	c.values[key].(map[string]interface{})[mapKey] = value
+	c.mu.Unlock()
 	return ""
 }
 
@@ -97,14 +98,14 @@
 // GetSortedMapValues returns a sorted map previously filled with SetInMap
 func (c *Scratch) GetSortedMapValues(key string) interface{} {
 	c.mu.RLock()
-	defer c.mu.RUnlock()
 
 	if c.values[key] == nil {
+		c.mu.RUnlock()
 		return nil
 	}
 
 	unsortedMap := c.values[key].(map[string]interface{})
-
+	c.mu.RUnlock()
 	var keys []string
 	for mapKey := range unsortedMap {
 		keys = append(keys, mapKey)