.

wcfs/wcfs.go

@@ -477,7 +477,16 @@ type Head struct {
 type Watch struct {
 	fsNode
 
-	// TODO
+	// head/watch opens
+	// XXX protected by ... head.zconnMu ?
+	watchTab map[*Watcher]struct{}
+}
+
+// /head/watch handle			- served by Watcher.
+type Watcher struct {
+	sk *FileSock
+
+	// XXX
 }
 
 // /(head|<rev>)/bigfile/		- served by BigFileDir.
@@ -580,7 +589,7 @@ func (_ *zodbCacheControl) PCacheClassify(obj zodb.IPersistent) zodb.PCachePolic
 	return 0
 }
 
-func traceWatch(format string, argv ...interface{}) {
+func traceZWatch(format string, argv ...interface{}) {
 	if !log.V(1) {	// XXX -> 2?
 		return
 	}
@@ -595,7 +604,7 @@ func (root *Root) zwatcher(ctx context.Context) (err error) {
 	defer xerr.Contextf(&err, "zwatch")	// XXX more in context?
 	// XXX unmount on error? -> always EIO?
 
-	traceWatch(">>>")
+	traceZWatch(">>>")
 
 	zwatchq := make(chan zodb.Event)
 	at0 := root.zstor.AddWatch(zwatchq)	// XXX -> to main thread to avoid race
@@ -606,22 +615,22 @@ func (root *Root) zwatcher(ctx context.Context) (err error) {
 	var ok bool
 
 	for {
-		traceWatch("select ...")
+		traceZWatch("select ...")
 		select {
 		case <-ctx.Done():
-			traceWatch("cancel")
+			traceZWatch("cancel")
 			return ctx.Err()
 
 		// TODO handle errors from ZODB watch stream
 		case zevent, ok = <-zwatchq:
 			if !ok {
-				traceWatch("zwatchq closed")
+				traceZWatch("zwatchq closed")
 				return nil // closed	XXX ok?
 			}
 
 		}
 
-		traceWatch("zevent: %s", zevent)
+		traceZWatch("zevent: %s", zevent)
 
 		var zδ *zodb.EventCommit
 		switch zevent := zevent.(type) {
@@ -1560,7 +1569,8 @@ func main() {
 	}
 
 	watch := &Watch{
-		fsNode: newFSNode(fSticky),
+		fsNode:   newFSNode(fSticky),
+		watchTab: make(map[*Watcher]struct{}),
 	}
 
 	bfdir := &BigFileDir{