.

bigfile/__init__.py

@@ -21,4 +21,6 @@
 
 """TODO big module-level picture description"""
 
+import golang   # so that golang.so -> libgolang.so is found and loaded
+
 from ._bigfile import BigFile, WRITEOUT_STORE, WRITEOUT_MARKSTORED, ram_reclaim

setup.py

@@ -29,6 +29,7 @@ import os
 import sys
 
 
+"""
 libvirtmem = DSO('wendelin.bigfile.libvirtmem',
                ['bigfile/pagefault.c',
                 'bigfile/pagemap.c',
@@ -64,18 +65,22 @@ libvirtmem = DSO('wendelin.bigfile.libvirtmem',
                 '-Wl,--no-undefined',   # check DSO for undefined symbols at link time
             ]
             )
+"""
 
-_bigfile = Extension('wendelin.bigfile._bigfile',
+#_bigfile = Extension('wendelin.bigfile._bigfile',
+_bigfile = PyGoExt('wendelin.bigfile._bigfile',
             sources = [
                 'bigfile/_bigfile.c',
-                #'bigfile/pagefault.c',
-                #'bigfile/pagemap.c',
-                #'bigfile/ram.c',
-                #'bigfile/ram_shmfs.c',
-                #'bigfile/ram_hugetlbfs.c',
-                #'bigfile/virtmem.c',
-                #'lib/bug.c',
-                #'lib/utils.c',
+
+                # TODO split -> libvirtmem
+                'bigfile/pagefault.c',
+                'bigfile/pagemap.c',
+                'bigfile/ram.c',
+                'bigfile/ram_shmfs.c',
+                'bigfile/ram_hugetlbfs.c',
+                'bigfile/virtmem.c',
+                'lib/bug.c',
+                'lib/utils.c',
             ],
             include_dirs = [
                 './include',
@@ -105,7 +110,7 @@ _bigfile = Extension('wendelin.bigfile._bigfile',
             #    '-Wl,--no-undefined',   # check DSO for undefined symbols at link time
             #]
 
-            dsos = ['wendelin.bigfile.libvirtmem'],
+            #dsos = ['wendelin.bigfile.libvirtmem'],
             )
 
 
@@ -268,7 +273,7 @@ setup(
 
     keywords    = 'bigdata out-of-core numpy virtual-memory',
 
-    x_dsos      = [libvirtmem],
+    #x_dsos      = [libvirtmem],
     ext_modules = [
                     _bigfile,
 

wcfs/internal/wcfs_virtmem.cpp

@@ -229,8 +229,8 @@ void _Conn::_pin1(PinReq *req) {
         //trace("\tremmapblk %d @%s" % (req->blk, (h(req.at) if req.at else "head")))
         // check if virtmem did not dirtied page corresponding to this block already
 // XXX reenable (link to libbigfile dso)
-        virt_lock();
 #if 0
+        virt_lock();
         TODO (mmap->file->blksize != mmap->fileh->ramh->ram->pagesize);
         if (!__fileh_page_isdirty(mmap->fileh, req->blk)) {
 #endif