.

wcfs/client/wcfs.cpp

@@ -610,13 +610,16 @@ pair<FileH, error> _Conn::open(zodb::Oid foid) {
     FileH f; bool ok;
     tie(f, ok) = wconn._filehTab.get_(foid);
     if (ok) {
+        f->_nopen++; // XXX lock by f.mu ?
         wconn._mu.Unlock();
 
         f->_openReady.recv();
-        if (f->_openErr != nil)
+        if (f->_openErr != nil) {
+            // XXX lock/unlock wconn._mu around nopen-- ?
+            f->_nopen--;
             return make_pair(nil, E(f->_openErr));
+        }
 
-        // XXX incref open count
         return make_pair(f, nil);
     }
 
@@ -630,12 +633,15 @@ pair<FileH, error> _Conn::open(zodb::Oid foid) {
     f->_headf     = nil;
     f->blksize    = 0;
     f->_headfsize = 0;
+    f->_nopen     = 1;
+    f->_closed    = false;
 
     bool retok = false;
     wconn._filehTab[foid] = f;
     defer([&]() {
         if (!retok) {
             wconn._mu.Lock();
+            f->_nopen--; // XXX locking ok?
             // XXX assert filehTab[foid] == f
             wconn._filehTab.erase(foid);
             wconn._mu.Unlock();

wcfs/client/wcfs.h

@@ -181,7 +181,7 @@ struct _Conn : object {
     sync::RWMutex _atMu;
     zodb::Tid     at;
 
-    sync::RWMutex           _mu;       // _atMu.W  |  _atMu.R + _mu
+    sync::RWMutex           _mu;       // _atMu.W  |  _atMu.R + _mu     XXX -> _filehMu ?
     error                   _downErr;  // !nil if connection is closed or no longer operational
     dict<zodb::Oid, FileH>  _filehTab; // {} foid -> fileh
 
@@ -238,6 +238,8 @@ struct _FileH : object {
     sync::Mutex               _mu;     // atMu.W  |  atMu.R + _mu
     dict<int64_t, zodb::Tid>  _pinned; // {} blk -> rev   that wcfs already sent us for this file
     vector<Mapping>           _mmaps;  // []Mapping ↑blk_start    mappings of this file
+
+    // XXX protect by wconn.mu ?
     int                       _nopen;  // number of times Conn.open returned this fileh
     bool                      _closed; // y after .close()