Merge pull request #75 from matrix-org/continuserv-speedup

Speed up continuserv

scripts/continuserv/main.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	fsnotify "gopkg.in/fsnotify.v1"
 )
@@ -67,7 +68,6 @@ func watchFS(ch chan struct{}, w *fsnotify.Watcher) {
 		select {
 		case e := <-w.Events:
 			if filter(e) {
-				wg.Add(1)
 				fmt.Printf("Noticed change to %s, re-generating spec\n", e.Name)
 				ch <- struct{}{}
 			}
@@ -98,6 +98,11 @@ func filter(e fsnotify.Event) bool {
 		return false
 	}
 
+	// Ignore the .git directory - It's very noisy
+	if strings.Contains(e.Name, "/.git/") {
+		return false
+	}
+
 	// Avoid infinite cycles being caused by writing actual output
 	if strings.Contains(e.Name, "/tmp/") || strings.Contains(e.Name, "/gen/") {
 		return false
@@ -133,9 +138,21 @@ func populateOnce(dir string) {
 }
 
 func doPopulate(ch chan struct{}, dir string) {
-	for _ = range ch {
+	var pending int
+	for {
+		select {
+		case <-ch:
+			if pending == 0 {
+				wg.Add(1)
+			}
+			pending++
+		case <-time.After(10 * time.Millisecond):
+			if pending > 0 {
+				pending = 0
 				populateOnce(dir)
 			}
+		}
+	}
 }
 
 func exists(path string) bool {