oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BigFile lock seek and read until previous request finished, fix seek relative to bigfile end

Browse source
This commit is contained in:
shortcutme 2018-08-16 16:20:11 +02:00
parent f5ab2f63c0
commit 879eb6295d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/Bigfile/BigfilePlugin.py
View file

@ -3,10 +3,11 @@ import os
import subprocess import subprocess
import shutil import shutil
import collections import collections
import gevent
import math import math
import msgpack import msgpack
import gevent
import gevent.lock
from Plugin import PluginManager from Plugin import PluginManager
from Debug import Debug from Debug import Debug
@ -475,8 +476,10 @@ class BigFile(object):
self.piecefield = self.site.storage.piecefields[self.sha512] self.piecefield = self.site.storage.piecefields[self.sha512]
self.f = open(file_path, "rb+") self.f = open(file_path, "rb+")
self.read_lock = gevent.lock.Semaphore()
def read(self, buff=64 * 1024): def read(self, buff=64 * 1024):
with self.read_lock:
pos = self.f.tell() pos = self.f.tell()
read_until = min(self.size, pos + buff) read_until = min(self.size, pos + buff)
requests = [] requests = []
@ -519,8 +522,12 @@ class BigFile(object):
return self.f.read(buff) return self.f.read(buff)
def seek(self, pos): def seek(self, pos, whence=0):
return self.f.seek(pos) with self.read_lock:
if whence == 2: # Relative from file end
pos = self.size + pos # Use the real size instead of size on the disk
whence = 0
return self.f.seek(pos, whence)
def tell(self): def tell(self):
self.f.tell() self.f.tell()

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.3" self.version = "0.6.3"
self.rev = 3546 self.rev = 3549
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}