Lock refactoring

controller/controller.go

@@ -230,35 +230,32 @@ func ListenAndServeEx(host string, port int, dir string, ln *net.Listener, http
 }
 
 func (c *Controller) watchGC() {
-	var elapsed uint64
 	t := time.NewTicker(time.Second)
 	defer t.Stop()
 
+	s := time.Now()
 	for range t.C {
-		elapsed++
 		c.mu.RLock()
+
+		if c.stopWatchingAutoGC {
+			c.mu.RUnlock()
+			return
+		}
+
 		autoGC := c.config.AutoGC
 		c.mu.RUnlock()
 
-		func() {
+		if autoGC == 0 {
-			if autoGC == 0 {
+			continue
-				return
+		}
-			}
 
-			if c.stopWatchingAutoGC {
+		if time.Now().Sub(s) < time.Second*time.Duration(autoGC) {
-				return
+			continue
-			}
+		}
 
-			if elapsed < autoGC {
+		runtime.GC()
-				return
+		debug.FreeOSMemory()
-			}
+		s = time.Now()
-
-			c.mu.RLock()
-			runtime.GC()
-			debug.FreeOSMemory()
-			c.mu.RUnlock()
-			elapsed = 0
-		}()
 	}
 }