Commit e57a136e authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 10db71c2
...@@ -34,12 +34,12 @@ ifeq ($(CC),) ...@@ -34,12 +34,12 @@ ifeq ($(CC),)
$(error "Cannot defermine py-CC") $(error "Cannot defermine py-CC")
endif endif
all : pyext wcfs/wcfs all : bigfile/_bigfile.so wcfs/wcfs
ccan_config := 3rdparty/ccan/config.h ccan_config := 3rdparty/ccan/config.h
pyext : $(ccan_config) FORCE bigfile/_bigfile.so : $(ccan_config) FORCE
$(PYTHON) setup.py build_dso --inplace $(PYTHON) setup.py build_dso --inplace
$(PYTHON) setup.py ll_build_ext --inplace $(PYTHON) setup.py ll_build_ext --inplace
...@@ -170,14 +170,14 @@ test.vgdrd: $(TESTS:%=%.vgdrdrun) ...@@ -170,14 +170,14 @@ test.vgdrd: $(TESTS:%=%.vgdrdrun)
# run python tests # run python tests
PYTEST_IGNORE := --ignore=3rdparty --ignore=build --ignore=t PYTEST_IGNORE := --ignore=3rdparty --ignore=build --ignore=t
test.py : pyext wcfs/wcfs test.py : bigfile/_bigfile.so wcfs/wcfs
$(PYTEST) $(PYTEST_IGNORE) $(PYTEST) $(PYTEST_IGNORE)
# test.py via Valgrind (very slow) # test.py via Valgrind (very slow)
test.py.vghel: pyext wcfs/wcfs test.py.vghel: bigfile/_bigfile.so wcfs/wcfs
$(call vgxrun,--tool=helgrind, $(PYTEST) $(PYTEST_IGNORE)) $(call vgxrun,--tool=helgrind, $(PYTEST) $(PYTEST_IGNORE))
test.py.drd: pyext wcfs/wcfs test.py.drd: bigfile/_bigfile.so wcfs/wcfs
$(call vgxrun,--tool=drd, $(PYTEST) $(PYTEST_IGNORE)) $(call vgxrun,--tool=drd, $(PYTEST) $(PYTEST_IGNORE))
...@@ -202,5 +202,5 @@ bench : bench.t bench.py ...@@ -202,5 +202,5 @@ bench : bench.t bench.py
bench.t : $(BENCHV.C:%=%.trun) bench.t : $(BENCHV.C:%=%.trun)
bench.py: pyext wcfs/wcfs bench.py: bigfile/_bigfile.so wcfs/wcfs
$(PYBENCH) --count=3 --forked $(PYTEST_IGNORE) $(PYBENCH) --count=3 --forked $(PYTEST_IGNORE)
...@@ -936,7 +936,7 @@ pybigfile_remmap_blk_read(VMA *vma, BigFile *file0, blk_t blk) ...@@ -936,7 +936,7 @@ pybigfile_remmap_blk_read(VMA *vma, BigFile *file0, blk_t blk)
return file->blkmmap_ops->remmap_blk_read(vma, file0, blk); return file->blkmmap_ops->remmap_blk_read(vma, file0, blk);
} }
static void static int
pybigfile_munmap(VMA *vma, BigFile *file0) pybigfile_munmap(VMA *vma, BigFile *file0)
{ {
PyBigFile *file = container_of(file0, PyBigFile, file); PyBigFile *file = container_of(file0, PyBigFile, file);
......
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