aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPaul Oliver <contact@pauloliver.dev>2024-02-29 02:29:14 +0100
committerPaul Oliver <contact@pauloliver.dev>2024-02-29 02:29:14 +0100
commitde427d319c699b8bed7ed73289b3698f13ac3acc (patch)
tree8ed7bf17bc45480589f39cff60a3258c6aad39cb /bin
parent8bef0b04edd10fe15589ae97edee5af177c635e0 (diff)
Numeric cycle now times out.
[#36] Using high numeric keys cycles simulation until a timeout is reached. This helps prevent Salis from hanging if a high number of cycles are requested.
Diffstat (limited to 'bin')
-rw-r--r--bin/README.md2
-rw-r--r--bin/handler.py12
2 files changed, 11 insertions, 3 deletions
diff --git a/bin/README.md b/bin/README.md
index 7340b8e..635f233 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -32,7 +32,7 @@ $ ./bin/salis.py load --file 16.sim
|`k` |Scroll/go to selected (PROCESS and WORLD page) |
|`X` |Toggle hex/decimal value printing |
|`M` |Toggle minimal mode |
-|Numbers `[1..0]` |Cycle simulation `2^((n-1) % 10)` steps |
+|Numbers `[1..0]` |Cycle simulation `2^((n-1) % 10)` steps (max) |
|Enter |Activate cursor (WORLD page) |
|Escape |Save and quit simulation |
diff --git a/bin/handler.py b/bin/handler.py
index 40fafea..3325391 100644
--- a/bin/handler.py
+++ b/bin/handler.py
@@ -20,12 +20,14 @@ console response. This ability gives an user a whole lot of power, and should
be used with care.
"""
-import os
import curses
+import os
+import time
class Handler:
KEY_ESCAPE = 27
+ CYCLE_TIMEOUT = 0.1
def __init__(self, sim):
""" Handler constructor. Simply link this class to the main simulation
@@ -195,12 +197,18 @@ class Handler:
raise RuntimeError(message)
def __cycle_sim(self, factor):
- """ Simply cycle Salis 'factor' number of times.
+ """ Simply cycle Salis 'factor' number of times. Do not cycle for more
+ than a given amount of time.
"""
+ time_max = time.time() + self.CYCLE_TIMEOUT
+
for _ in range(factor):
self.__sim.lib.sal_main_cycle()
self.__sim.check_autosave()
+ if time.time() > time_max:
+ break
+
def __get_inst_dict(self):
""" Transform the instruction list of the printer module into a
dictionary that's more useful for genome compilation. Instruction