Commit 13ee0416 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent a4d63fbb
......@@ -568,7 +568,7 @@ class ZBigFile(LivePersistent):
def _default_use_wcfs():
virtmem = os.environ.get("WENDELIN_CORE_VIRTMEM", "rw:uvmm") # unset -> !wcfs
virtmem = virtmem.lower()
return {"r:wcfs+w:uvmm": True, "rw:uvmm": True}[virtmem]
return {"r:wcfs+w:uvmm": True, "rw:uvmm": False}[virtmem]
......
......@@ -67,11 +67,11 @@ class Conn(object):
zconn = zfile._p_jar
# XXX ._start is probably ZODB5 only -> check ZODB4 and ZODB3
zat = p64(u64(zconn._start)-1) # before -> at
zat = p64(u64(zconn._storage._start)-1) # before -> at
# XXX pinned to @revX/... for now -> TODO /head/bigfile/...
path = '%s/@%s/bigfile/%s' % (self.mountpoint, ashex(zat), ashex(self._p_oid))
fd = os.open(path)
path = '%s/@%s/bigfile/%s' % (self.mountpoint, ashex(zat), ashex(zfile._p_oid))
fd = os.open(path, os.O_RDONLY)
return FileH(fd)
......@@ -82,12 +82,13 @@ class Conn(object):
# XXX it should implement wcfs invalidation protocol and remmap head/... parts
# to pinned as requested.
import mmap
from bigarray.array_ram import _VMA, pagesize # XXX hack
from bigarray import pagesize # XXX hack
from bigarray.array_ram import _VMA # XXX hack
class FileH(object):
# .fd
def __init__(self, fd):
self.fd
self.fd = fd
def __del__(self):
os.close(self.fd)
......@@ -177,7 +178,8 @@ def join(zurl, autostart=_default_autostart(), shared=False):
# start wcfs with telling it to automatically exit when there is no client activity.
# XXX extra opts -> join args -> test + -v=1 if running py.test -v
# XXX ^^^ check log level?
return _start(zurl, "-autoexit", '-d', '-alsologtostderr', '-v=1')
#return _start(zurl, "-autoexit", '-d', '-alsologtostderr', '-v=1')
return _start(zurl, "-autoexit", '-alsologtostderr')
# _start starts wcfs server for ZODB @ zurl.
......
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