Merge pull request #418 from SpiNNakerManchester/allow_odd_rtes

Allow odd RTE values, as crashes can cause oddities!
SpiNNakerManchester · Sep 25, 2024 · ba87423 · ba87423
2 parents be480ae + da692d0
commit ba87423
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/spinnman/model/cpu_info.py b/spinnman/model/cpu_info.py
@@ -61,6 +61,7 @@ class CPUInfo(object):
         "__processor_state_register",
         "__registers",
         "__run_time_error",
+        "__run_time_error_value",
         "__software_error_count",
         "__filename_address",
         "__line_number",
@@ -102,7 +103,11 @@ def __init__(self, x: int, y: int, p: int, cpu_data: _vcpu_t):
         self.__application_name = app_name.decode('ascii')
 
         self.__registers: Sequence[int] = _REGISTERS_PATTERN.unpack(registers)
-        self.__run_time_error = RunTimeError(run_time_error)
+        self.__run_time_error_value = run_time_error
+        try:
+            self.__run_time_error = RunTimeError(run_time_error)
+        except ValueError:
+            self.__run_time_error = RunTimeError.UNRECOGNISED
         self.__state = CPUState(state)
 
         self.__application_mailbox_command = MailboxCommand(app_mailbox_cmd)
@@ -353,10 +358,13 @@ def get_status_string(self) -> str:
         :rtype: str
         """
         if self.state == CPUState.RUN_TIME_EXCEPTION:
+            rte_string = f"{self.run_time_error.name}"
+            if self.run_time_error == RunTimeError.UNRECOGNISED:
+                rte_string += f" ({self.__run_time_error_value})"
             return (
                 f"{self.__x}:{self.__y}:{self.__p} "
                 f"(ph: {self.__physical_cpu_id}) "
-                f"in state {self.__state.name}:{self.__run_time_error.name}\n"
+                f"in state {self.__state.name}:{rte_string}\n"
                 f"    r0={self.__registers[0]}, r1={self.__registers[1]}, "
                 f"r2={self.__registers[2]}, r3={self.__registers[3]}\n"
                 f"    r4={self.__registers[4]}, r5={self.__registers[5]}, "

diff --git a/spinnman/model/enums/run_time_error.py b/spinnman/model/enums/run_time_error.py
@@ -61,3 +61,5 @@ class RunTimeError(Enum):
     API = 19
     #: Sark software version conflict
     SARK_VERSRION_INCORRECT = 20
+    #: Unhandled exception
+    UNRECOGNISED = 99999