.

wcfs/internal/wcfs_watchlink.cpp

@@ -51,10 +51,10 @@ pair<WatchLink, error> WCFS::_openwatch() {
 
     context::Context serveCtx;
     tie(serveCtx, wlink->_serveCancel) = context::with_cancel(context::background());
-#if 0
-    wlink->_serveWG = sync.WorkGroup(serveCtx)
-    wlink->_serveWG.go(wlink._serveRX)
-#endif
+    wlink->_serveWG = sync::NewWorkGroup(serveCtx);
+    wlink->_serveWG->go([wlink](context::Context ctx) -> error {
+	return wlink->_serveRX(ctx);
+    });
 
     return make_pair(wlink, nil);
 }
@@ -87,14 +87,10 @@ error _WatchLink::close() {
     //
     // XXX -> better pthread_kill(SIGINT) instead of relying on wcfs proper behaviour?
     // XXX -> we now have `kill -QUIT` to wcfs.go on test timeout - remove ^^^ comments?
-#if 0
-    error err = wlink._serveWG.wait();
+    error err = wlink._serveWG->wait();
     // canceled is expected and ok
-    if (err == context.canceled)
+    if (err == context::canceled)
         err = nil;
-#else
-    error err = nil;
-#endif
 
     error err2 = wlink._f->close();
     if (err == nil)

wcfs/internal/wcfs_watchlink.h

@@ -87,9 +87,7 @@ class _WatchLink : public object {
     sync::Once      _txclose1;
 
     func<void()>    _serveCancel;
-#if 0
-    sync.WorkGroup *_serveWG
-#endif
+    sync::WorkGroup _serveWG;
 
     // don't new - create only via WCFS._openwatch()
 private: