.

bigfile/_file_zodb.pyx

@@ -67,19 +67,19 @@ from wendelin.lib.zodb import zconn_at
 cdef public class _ZBigFile(BigFile) [object _ZBigFile, type _ZBigFile_Type]:
     cdef object     zself   # reference to ZBigFile
     cdef wcfs.Oid   foid    # = .zself._p_oid
-    cdef wcfs.Conn  wconn   # WCFS connection   XXX -> zconn instead ?  XXX wconn is shared between files
+    cdef wcfs.FileH wfileh  # WCFS file handle
 
     # XXX Cython does not allow __new__ nor to change arguments passed to __cinit__ / __init__
     @staticmethod
     def _new(zself, blksize):
         cdef _ZBigFile obj = _ZBigFile.__new__(_ZBigFile, blksize)
-        obj.zself = zself
-        obj.foid  = -1  # Note: zself._p_oid could be yet None for newly created ZBigFile
-        obj.wconn = nil # XXX
+        obj.zself  = zself
+#       obj.foid   = -1  # Note: zself._p_oid could be yet None for newly created ZBigFile
+        obj.wfileh = nil # opened by blkmmapper
         return obj
 
     def __dealloc__(_ZBigFile zf):
-        zf.wconn = nil
+        zf.wfileh = nil
 
 
     # redirect load/store/mapper to main class
@@ -91,17 +91,18 @@ cdef public class _ZBigFile(BigFile) [object _ZBigFile, type _ZBigFile_Type]:
     #
     # it is called from PyBigFile.fileh_open(mmap_overlay=True) and .zfile
     # should be already associaed with jar and have oid.
-    def blkmapper(_ZBigFile zf):
-        cdef wcfs.PyConn pywconn
-        if zf.wconn == nil:
+    def blkmmapper(_ZBigFile zf):
+        cdef wcfs.PyFileH pywfileh
+        if zf.wfileh == nil:
             zconn = zf.zself._p_jar
             assert zconn is not None
             # XXX locking? or rely on that ZODB objects for must be used from under 1 thread only?
-            zf.foid = u64(zf.zself._p_oid)
+#           zf.foid = u64(zf.zself._p_oid)
 
             # join zconn to wconn; link to wconn from _ZBigFile
-            pywconn = pywconnOf(zconn)
-            zf.wconn = pywconn.wconn
+            pywconn  = pywconnOf(zconn)
+            pywfileh = pywconn.open(zf.zself._p_oid)
+            zf.wfileh = pywfileh.wfileh
 
 
 # functions that we give to virtmem bigfile_ops .mmap*

bigfile/file_zodb.cpp

@@ -23,8 +23,10 @@
 #include "bigfile/_file_zodb.h"
 
 void* virt_mmap_setup_read(VMA *vma, BigFile *file, blk_t blk, size_t blklen) {
-    _ZBigFile* _zfile = static_cast<_ZBigFile*>(file);
-    wcfs::FileH fileh; // XXX = ... somehow from file
+    //_ZBigFile* _zfile = static_cast<_ZBigFile*>(file);
+    _ZBigFile* _zfile = NULL;   // XXX
+
+    wcfs::FileH fileh = _zfile->wfileh;
     wcfs::Mapping mmap;
     error err;