.

bigfile/_file_zodb.pyx

@@ -26,7 +26,7 @@
 
 from __future__ import print_function, absolute_import
 
-cdef extern from "wcfs/internal/wcfs.h":
+cdef extern from "wcfs/client/wcfs.h":
     pass
 
 cdef extern from "bigfile/_bigfile.h":
@@ -46,7 +46,7 @@ cdef extern from * nogil:
     const bigfile_ops ZBigFile_mmap_ops
 
 import wcfs as pywcfs
-from wcfs.internal cimport _wcfs as wcfs
+from wcfs.client cimport _wcfs as wcfs
 from golang cimport nil
 from cpython cimport PyCapsule_New
 

bigfile/file_zodb.cpp

@@ -20,7 +20,7 @@
 // File file_zodb.cpp provides blkmmapper functions for _ZBigFile.
 // MMapping is implemented via WCFS.
 
-#include "wcfs/internal/wcfs.h"
+#include "wcfs/client/wcfs.h"
 #include "wendelin/bigfile/file.h"
 #include "wendelin/bigfile/virtmem.h"
 #include "bigfile/_bigfile.h"

setup.py

@@ -266,10 +266,10 @@ setup(
                     define_macros       = [('_GNU_SOURCE',None), ('BUILDING_LIBVIRTMEM',None)],
                     language = 'c'),
 
-                   DSO('wendelin.wcfs.internal.libwcfs',
-                    ['wcfs/internal/wcfs.cpp',
-                     'wcfs/internal/wcfs_watchlink.cpp',
-                     'wcfs/internal/wcfs_misc.cpp'],
+                   DSO('wendelin.wcfs.client.libwcfs',
+                    ['wcfs/client/wcfs.cpp',
+                     'wcfs/client/wcfs_watchlink.cpp',
+                     'wcfs/client/wcfs_misc.cpp'],
                     dsos = ['wendelin.bigfile.libvirtmem'])],
 
     ext_modules = [
@@ -282,11 +282,11 @@ setup(
                     PyGoExt('wendelin.bigfile._file_zodb',
                         ['bigfile/_file_zodb.pyx',
                          'bigfile/file_zodb.cpp'],
-                        dsos = ['wendelin.wcfs.internal.libwcfs']),
+                        dsos = ['wendelin.wcfs.client.libwcfs']),
 
-                    PyGoExt('wendelin.wcfs.internal._wcfs',
-                        ['wcfs/internal/_wcfs.pyx'],
-                        dsos = ['wendelin.wcfs.internal.libwcfs']),
+                    PyGoExt('wendelin.wcfs.client._wcfs',
+                        ['wcfs/client/_wcfs.pyx'],
+                        dsos = ['wendelin.wcfs.client.libwcfs']),
 
                     PyGoExt('wendelin.wcfs.internal.wcfs_test',
                         ['wcfs/internal/wcfs_test.pyx']),

wcfs/__init__.py

@@ -58,7 +58,7 @@ from persistent import Persistent
 from ZODB.FileStorage import FileStorage
 from zodbtools.util import ashex as h
 
-from .internal._wcfs import \
+from .client._wcfs import \
     PyWCFS          as _WCFS,       \
     PyWatchLink     as WatchLink,   \
     PyPinReq        as PinReq       \

wcfs/client/.gitignore

+/_wcfs.cpp

wcfs/internal/_wcfs.pxd → wcfs/client/_wcfs.pxd

@@ -36,20 +36,20 @@ from libcpp.vector cimport vector
 
 
 # XXX -> pygolang
-cdef extern from "wcfs/internal/wcfs_misc.h" namespace "io" nogil:
+cdef extern from "wcfs/client/wcfs_misc.h" namespace "io" nogil:
     error EOF "io::EOF_"
     error ErrUnexpectedEOF
 
-cdef extern from "wcfs/internal/wcfs_misc.h" namespace "zodb" nogil:
+cdef extern from "wcfs/client/wcfs_misc.h" namespace "zodb" nogil:
     ctypedef uint64_t Tid
     ctypedef uint64_t Oid
 
-cdef extern from "wcfs/internal/wcfs_misc.h" namespace "wcfs" nogil:
+cdef extern from "wcfs/client/wcfs_misc.h" namespace "wcfs" nogil:
     const Tid TidHead
 
 
 # pyx/nogil description for C++ classes
-cdef extern from "wcfs/internal/wcfs_watchlink.h" namespace "wcfs" nogil:
+cdef extern from "wcfs/client/wcfs_watchlink.h" namespace "wcfs" nogil:
     cppclass _WatchLink:
         error close()
         error closeWrite()
@@ -80,7 +80,7 @@ cdef extern from "wcfs/internal/wcfs_watchlink.h" namespace "wcfs" nogil:
     error _twlinkwrite(WatchLink wlink, const string& pkt)
 
 
-cdef extern from "wcfs/internal/wcfs.h" namespace "wcfs" nogil:
+cdef extern from "wcfs/client/wcfs.h" namespace "wcfs" nogil:
     cppclass WCFS:
         string  mountpoint
 

wcfs/internal/.gitignore

 /io.c
 /mm.c
-/_wcfs.cpp
 /wcfs_test.cpp

wcfs/wcfs_test.py

@@ -51,8 +51,8 @@ from zodbtools.util import ashex as h, fromhex
 import pytest; xfail = pytest.mark.xfail
 from pytest import raises, fail
 from .internal import io, mm
-from .internal._wcfs import _tpywlinkwrite as _twlinkwrite
 from .internal.wcfs_test import _tDB, read_nogil, install_sigbus_trap, fadvise_dontneed
+from .client._wcfs import _tpywlinkwrite as _twlinkwrite
 
 
 # setup: