.

wcfs/internal/wcfs_virtmem.cpp

@@ -163,16 +163,16 @@ tuple<Conn, error> WCFS::connect(zodb::Tid at) {
 // XXX what happens to file mmappings?
 error _Conn::close() {   // XXX error -> void?
     _Conn& wconn = *this;
+    // XXX err ctx
+    error err;
 
-    wconn._wlink->close();  // XXX err
-#if 0
-    wconn._pinCancel()
-    try:
-        wconn._pinWG.wait()
-    except Exception as e:  // canceled - ok
-        if e is not context.canceled:
-            raise
-#endif
+    err = wconn._wlink->close();
+    if (err != nil)
+        return err;
+    wconn._pinCancel();
+    err = wconn._pinWG->wait();
+    if (err != context::canceled)  // canceled - ok
+        return err;
 
     // close all files - both that have no mappings and that still have opened mappings.
     // XXX after file is closed mappings continue to survive, but we can no
@@ -191,7 +191,7 @@ error _Conn::close() {   // XXX error -> void?
     }
 
     wconn._filetab.clear();
-    return nil; // XXX -> err ?
+    return nil;
 }
 
 // _pinner receives pin messages from wcfs and adjusts wconn mappings.