Commit 622fb217 authored by Kirill Smelkov's avatar Kirill Smelkov

setup: Split virtmem into its own DSO

Upcoming libwcfs (C++ part of WCFS client) will need to use virtmem code
and link to libvirtmem.
parent 9742fe7b
...@@ -39,6 +39,7 @@ all : bigfile/_bigfile.so ...@@ -39,6 +39,7 @@ all : bigfile/_bigfile.so
ccan_config := 3rdparty/ccan/config.h ccan_config := 3rdparty/ccan/config.h
bigfile/_bigfile.so : $(ccan_config) FORCE bigfile/_bigfile.so : $(ccan_config) FORCE
$(PYTHON) setup.py build_dso --inplace
$(PYTHON) setup.py ll_build_ext --inplace $(PYTHON) setup.py ll_build_ext --inplace
......
...@@ -70,7 +70,9 @@ def _with_defaults(what, *argv, **kw): ...@@ -70,7 +70,9 @@ def _with_defaults(what, *argv, **kw):
else: else:
ccdefault.append('-std=gnu++11') # not c++11 since we use typeof ccdefault.append('-std=gnu++11') # not c++11 since we use typeof
ccdefault.append('-fvisibility=hidden') # by default symbols not visible outside DSO # DSOs are not yet annotated for visibility
if what != _DSO:
ccdefault.append('-fvisibility=hidden') # by default symbols not visible outside DSO
_ = kw.get('extra_compile_args', [])[:] _ = kw.get('extra_compile_args', [])[:]
_[0:0] = ccdefault _[0:0] = ccdefault
...@@ -249,6 +251,18 @@ def readfile(path): ...@@ -249,6 +251,18 @@ def readfile(path):
with open(path, 'r') as f: with open(path, 'r') as f:
return f.read() return f.read()
libvirtmem_h = [
'3rdparty/include/linux/list.h',
'include/wendelin/bigfile/file.h',
'include/wendelin/bigfile/pagemap.h',
'include/wendelin/bigfile/ram.h',
'include/wendelin/bigfile/types.h',
'include/wendelin/bigfile/virtmem.h',
'include/wendelin/bug.h',
'include/wendelin/list.h',
'include/wendelin/utils.h',
]
setup( setup(
name = 'wendelin.core', name = 'wendelin.core',
version = '0.13', version = '0.13',
...@@ -262,32 +276,29 @@ setup( ...@@ -262,32 +276,29 @@ setup(
keywords = 'bigdata out-of-core numpy virtual-memory', keywords = 'bigdata out-of-core numpy virtual-memory',
x_dsos = [DSO('wendelin.bigfile.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'],
depends = libvirtmem_h,
define_macros = [('_GNU_SOURCE',None)],
language = 'c')],
ext_modules = [ ext_modules = [
PyGoExt('wendelin.bigfile._bigfile', PyGoExt('wendelin.bigfile._bigfile',
['bigfile/_bigfile.c', ['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'],
depends = [ depends = [
'bigfile/_bigfile.h', 'bigfile/_bigfile.h',
'include/wendelin/compat_py2.h', 'include/wendelin/compat_py2.h',
'3rdparty/include/linux/list.h', ] + libvirtmem_h,
'include/wendelin/bigfile/file.h',
'include/wendelin/bigfile/pagemap.h',
'include/wendelin/bigfile/ram.h',
'include/wendelin/bigfile/types.h',
'include/wendelin/bigfile/virtmem.h',
'include/wendelin/bug.h',
'include/wendelin/list.h',
'include/wendelin/utils.h',
],
define_macros = [('_GNU_SOURCE',None)], define_macros = [('_GNU_SOURCE',None)],
language = 'c'), language = 'c',
dsos = ['wendelin.bigfile.libvirtmem']),
], ],
package_dir = {'wendelin': ''}, package_dir = {'wendelin': ''},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment