Trade off memory for disk reads (take 2).

This commit is contained in:
Mike Auty
2019-05-09 00:49:36 +01:00
parent 1c0cd7ddaf
commit df4c81a7c0
+16 -5
View File
@@ -17,6 +17,7 @@
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
# specific language governing rights and limitations under the License.
#
import functools
import threading
from typing import Any, Dict, IO, List, Optional, Union
@@ -156,17 +157,27 @@ class FileLayer(interfaces.layers.DataLayerInterface):
raise exceptions.InvalidAddressException(self.name, invalid_address,
"Offset outside of the buffer boundaries")
return self._read(self._lock, self._file, self.name, offset, length, pad)
@staticmethod
@functools.lru_cache(maxsize = 512)
def _read(lock: Union[DummyLock, threading.Lock],
file_object: IO[Any],
name: str,
offset: int,
length: int,
pad: bool = False) -> bytes:
# TODO: implement locking for multi-threading
with self._lock:
self._file.seek(offset)
data = self._file.read(length)
with lock:
file_object.seek(offset)
data = file_object.read(length)
if len(data) < length:
if pad:
data += (b"\x00" * (length - len(data)))
else:
raise exceptions.InvalidAddressException(
self.name, offset + len(data), "Could not read sufficient bytes from the " + self.name + " file")
raise exceptions.InvalidAddressException(name, offset + len(data),
"Could not read sufficient bytes from the " + name + " file")
return data
def write(self, offset: int, data: bytes) -> None: