we probably don't need this lock
This commit is contained in:
@@ -19,7 +19,7 @@ class LogFileModel:
|
||||
def __init__(self, file: str, settings: Settings):
|
||||
self.settings = settings
|
||||
self._file = os.path.realpath(file)
|
||||
self._lock = threading.RLock()
|
||||
# self._lock = threading.RLock()
|
||||
|
||||
def highlighters(self):
|
||||
return Highlighting.read_config(self.settings)
|
||||
@@ -50,7 +50,8 @@ class LogFileModel:
|
||||
return file_name
|
||||
|
||||
def read_range(self, start_byte: int, end_byte: int):
|
||||
with self._lock:
|
||||
# with self._lock:
|
||||
if True:
|
||||
with open(self._file, 'rb') as f:
|
||||
f.seek(start_byte)
|
||||
bytes = f.read(end_byte - start_byte)
|
||||
@@ -58,7 +59,8 @@ class LogFileModel:
|
||||
|
||||
def write_range(self, start_byte: int, end_byte: int, file: str):
|
||||
# print("write range: %d - %d -> %s" % (start_byte, end_byte, file))
|
||||
with self._lock, open(self._file, 'rb') as source, open(file, "w+b") as target:
|
||||
# with self._lock, open(self._file, 'rb') as source, open(file, "w+b") as target:
|
||||
with open(self._file, 'rb') as source, open(file, "w+b") as target:
|
||||
offset = start_byte
|
||||
source.seek(offset)
|
||||
while offset < end_byte:
|
||||
@@ -75,9 +77,12 @@ class LogFileModel:
|
||||
lines_to_find = lines + abs(scroll_lines)
|
||||
lines_to_return = math.ceil(lines)
|
||||
|
||||
# start = time.time()
|
||||
with self._lock:
|
||||
# print("data lock acquision %.4f" % (time.time() -start))
|
||||
start = time.time()
|
||||
# with self._lock:
|
||||
if True:
|
||||
duration = time.time() - start
|
||||
if duration > 10:
|
||||
print("data lock acquision %.4f" % ())
|
||||
# TODO handle lines longer than 4096 bytes
|
||||
# TODO abort file open after a few secons: https://docs.python.org/3/library/signal.html#example
|
||||
with open(self._file, 'rb') as f:
|
||||
|
||||
Reference in New Issue
Block a user