Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-06-23 14:14:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resource performance and memory optimisations

Browse source
This commit is contained in:
Mark Qvist 2025-05-10 20:57:32 +02:00
parent 552663c625
commit b5d854a55c
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
RNS/Resource.py
View file

@ -118,7 +118,7 @@ class Resource:
# #
# Capped at 16777215 (0xFFFFFF) per segment to # Capped at 16777215 (0xFFFFFF) per segment to
# fit in 3 bytes in resource advertisements. # fit in 3 bytes in resource advertisements.
MAX_EFFICIENT_SIZE = 16 * 1024 * 1024 - 1 MAX_EFFICIENT_SIZE = 1 * 1024 * 1024 - 1
RESPONSE_MAX_GRACE_TIME = 10 RESPONSE_MAX_GRACE_TIME = 10
# Max metadata size is 16777215 (0xFFFFFF) bytes # Max metadata size is 16777215 (0xFFFFFF) bytes
@ -398,19 +398,20 @@ class Resource:
self.data += self.compressed_data self.data += self.compressed_data
self.compressed = True self.compressed = True
self.uncompressed_data = None
else: else:
self.data = b"" self.data = b""
self.data += RNS.Identity.get_random_hash()[:Resource.RANDOM_HASH_SIZE] self.data += RNS.Identity.get_random_hash()[:Resource.RANDOM_HASH_SIZE]
self.data += self.uncompressed_data self.data += self.uncompressed_data
self.uncompressed_data = self.data
self.compressed = False self.compressed = False
self.compressed_data = None self.compressed_data = None
if auto_compress: if auto_compress:
RNS.log("Compression did not decrease size, sending uncompressed", RNS.LOG_EXTREME) RNS.log("Compression did not decrease size, sending uncompressed", RNS.LOG_EXTREME)
self.compressed_data = None
self.uncompressed_data = None
# Resources handle encryption directly to # Resources handle encryption directly to
# make optimal use of packet MTU on an entire # make optimal use of packet MTU on an entire
# encrypted stream. The Resource instance will # encrypted stream. The Resource instance will
@ -464,6 +465,7 @@ class Resource:
RNS.log("Hashmap computation concluded in "+str(round(time.time()-hashmap_computation_began, 3))+" seconds", RNS.LOG_EXTREME) RNS.log("Hashmap computation concluded in "+str(round(time.time()-hashmap_computation_began, 3))+" seconds", RNS.LOG_EXTREME)
self.data = None
if advertise: if advertise:
self.advertise() self.advertise()
else: else:
@ -548,8 +550,7 @@ class Resource:
if self.link: self.link.expected_rate = self.eifr if self.link: self.link.expected_rate = self.eifr
def watchdog_job(self): def watchdog_job(self):
thread = threading.Thread(target=self.__watchdog_job) thread = threading.Thread(target=self.__watchdog_job, daemon=True)
thread.daemon = True
thread.start() thread.start()
def __watchdog_job(self): def __watchdog_job(self):
@ -685,6 +686,8 @@ class Resource:
metadata_file.close() metadata_file.close()
del packed_metadata del packed_metadata
data = self.data[3+metadata_size:] data = self.data[3+metadata_size:]
else:
data = self.data
self.file = open(self.storagepath, "ab") self.file = open(self.storagepath, "ab")
self.file.write(data) self.file.write(data)
@ -790,6 +793,15 @@ class Resource:
self.__prepare_next_segment() self.__prepare_next_segment()
while self.next_segment == None: time.sleep(0.05) while self.next_segment == None: time.sleep(0.05)
self.data = None
self.metadata = None
self.parts = None
self.input_file = None
self.link = None
self.req_hashlist = None
self.hashmap = None
self.next_segment.advertise() self.next_segment.advertise()
else: else:
pass pass