jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resource timeout tuning

Browse Source
This commit is contained in:
Mark Qvist 2022-06-12 13:28:05 +02:00
parent 98b232bc4c
commit ae8fcb88d8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RNS/Resource.py
View File

@ -104,9 +104,11 @@ class Resource:
PART_TIMEOUT_FACTOR = 4 PART_TIMEOUT_FACTOR = 4
PART_TIMEOUT_FACTOR_AFTER_RTT = 2 PART_TIMEOUT_FACTOR_AFTER_RTT = 2
MAX_RETRIES = 5 MAX_RETRIES = 8
MAX_ADV_RETRIES = 4
SENDER_GRACE_TIME = 10 SENDER_GRACE_TIME = 10
RETRY_GRACE_TIME = 0.25 RETRY_GRACE_TIME = 0.25
PER_RETRY_DELAY = 0.5
WATCHDOG_MAX_SLEEP = 1 WATCHDOG_MAX_SLEEP = 1
@ -240,6 +242,7 @@ class Resource:
self.status = Resource.NONE self.status = Resource.NONE
self.link = link self.link = link
self.max_retries = Resource.MAX_RETRIES self.max_retries = Resource.MAX_RETRIES
self.max_adv_retries = Resource.MAX_ADV_RETRIES
self.retries_left = self.max_retries self.retries_left = self.max_retries
self.timeout_factor = self.link.traffic_timeout_factor self.timeout_factor = self.link.traffic_timeout_factor
self.part_timeout_factor = Resource.PART_TIMEOUT_FACTOR self.part_timeout_factor = Resource.PART_TIMEOUT_FACTOR
@ -404,6 +407,7 @@ class Resource:
self.adv_sent = self.last_activity self.adv_sent = self.last_activity
self.rtt = None self.rtt = None
self.status = Resource.ADVERTISED self.status = Resource.ADVERTISED
self.retries_left = self.max_adv_retries
self.link.register_outgoing_resource(self) self.link.register_outgoing_resource(self)
RNS.log("Sent resource advertisement for "+RNS.prettyhexrep(self.hash), RNS.LOG_DEBUG) RNS.log("Sent resource advertisement for "+RNS.prettyhexrep(self.hash), RNS.LOG_DEBUG)
except Exception as e: except Exception as e:
@ -458,7 +462,9 @@ class Resource:
window_remaining = self.outstanding_parts window_remaining = self.outstanding_parts
sleep_time = self.last_activity + (rtt*(self.part_timeout_factor+window_remaining)) + Resource.RETRY_GRACE_TIME - time.time() retries_used = self.max_retries - self.retries_left
extra_wait = retries_used * Resource.PER_RETRY_DELAY
sleep_time = self.last_activity + (rtt*(self.part_timeout_factor+window_remaining)) + Resource.RETRY_GRACE_TIME + extra_wait - time.time()
if sleep_time < 0: if sleep_time < 0:
if self.retries_left > 0: if self.retries_left > 0:
@ -478,7 +484,8 @@ class Resource:
self.cancel() self.cancel()
sleep_time = 0.001 sleep_time = 0.001
else: else:
max_wait = self.rtt * self.timeout_factor * self.max_retries + self.sender_grace_time max_extra_wait = sum([(r+1) * Resource.PER_RETRY_DELAY for r in range(self.MAX_RETRIES)])
max_wait = self.rtt * self.timeout_factor * self.max_retries + self.sender_grace_time + max_extra_wait
sleep_time = self.last_activity + max_wait - time.time() sleep_time = self.last_activity + max_wait - time.time()
if sleep_time < 0: if sleep_time < 0:
RNS.log("Resource timed out waiting for part requests", RNS.LOG_DEBUG) RNS.log("Resource timed out waiting for part requests", RNS.LOG_DEBUG)