diff options
Diffstat (limited to 'src/test/philo.py')
| -rw-r--r-- | src/test/philo.py | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/test/philo.py b/src/test/philo.py index cb8d369..9039ac0 100644 --- a/src/test/philo.py +++ b/src/test/philo.py @@ -6,7 +6,7 @@ # By: charles <me@cacharle.xyz> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/09/27 17:49:41 by charles #+# #+# # -# Updated: 2020/09/27 18:35:25 by charles ### ########.fr # +# Updated: 2020/09/29 10:54:03 by cacharle ### ########.fr # # # # ############################################################################ # @@ -15,14 +15,10 @@ import time import enum import itertools +import test.error as error -class FormatError(Exception): - pass - - -class LogError(Exception): - pass - +def current_ms(): + return int(time.time() * 1000) class Event(enum.Enum): EATING = 1 @@ -34,11 +30,11 @@ class Event(enum.Enum): @staticmethod def to_verb(event): return { - Event.EATING: "eat", + Event.EATING: "eat", Event.SLEEPING: "sleep", Event.THINKING: "think", - Event.DIED: "die", - Event.NONE: "none", + Event.DIED: "die", + Event.NONE: "none", }[event] @@ -51,9 +47,9 @@ class Log: line ) if match is None: - raise FormatError("couldn't parse line") + raise error.Format(line, "wrong format") - curr = int(time.time() * 1000) + curr = current_ms() self.timestamp = Log._parse_ranged_int(match.group("timestamp"), curr - 100, curr + 100) self.id = Log._parse_ranged_int(match.group("id"), 1, philo_num) @@ -69,13 +65,13 @@ class Log: try: value = int(s) if not (lo <= value <= hi): - raise FormatError("`{}` should be between {} - {}".format(s, lo, hi)) + raise error.Format(s, "should be between {} - {}".format(lo, hi)) except ValueError: - raise FormatError("`{}` sould be an integer".format(s)) + raise error.Format(s, "sould be an integer".format(s)) return value def __repr__(self): - return "Log({}ms #{} {})".format(self.timestamp, self.id, self.event) + return "{}ms #{} {}".format(self.timestamp, self.id, self.event) class Philo: @@ -84,40 +80,44 @@ class Philo: self.id = id_ self.meal_num = meal_num self._timeout_eat = timeout_eat + # self._start_time = current_ms() def add_log(self, log): self._logs.append(log) def check(self): + if len(self._logs) == 0: + return grouped = [(e, list(g)) for e, g in itertools.groupby(self._logs, (lambda x: x.event))] for e, g in grouped: if e is Event.EATING: if len(g) != self.meal_num: - raise LogError("should eat {} times".format(self.meal_num)) + raise error.Log(self._logs, "should eat {} times".format(self.meal_num)) else: if len(g) != 1: - raise LogError("should {} 1 time".format(Event.to_verb(e))) + raise error.Log(self._logs, "should {} 1 time".format(Event.to_verb(e))) events = [e for e, _ in grouped] for e1, e2 in zip(events, events[1:]): if e2 is Event.DIED: break second = { - Event.THINKING: Event.EATING, + Event.THINKING: Event.EATING, Event.EATING: Event.SLEEPING, - Event.SLEEPING: Event.EATING + Event.SLEEPING: Event.THINKING }[e1] - if second is not e2: - raise LogError("{} should switch to {}, actual {}".format(e1, second, e2)) + if e2 is not second: + raise error.Log(self._logs, "invalid switch {} -> {}".format(e1, e2)) - last_eat_time = int(time.time() * 1000) + last_eat = None for log in reversed(self._logs): if log.event is Event.EATING: - last_eat_time = log.timestamp + last_eat = log break - - if int(time.time() * 1000) - last_eat_time > self._timeout_eat + 20: - raise LogError("should be dead") + last = self._logs[-1] + if last_eat is not None and last_eat is not last: + if last.timestamp - last_eat.timestamp > self._timeout_eat + 20: + raise error.Log(self._logs, "{} should be dead {}".format(self.id, last.timestamp)) @property def last_event(self): @@ -134,22 +134,22 @@ class Table: self.dead = False def add_log(self, log): - if self.dead: - raise LogError("should not output after one died") - if log.event is Event.DIED: - self.dead = True self._logs.append(log) philo = next(p for p in self._philos if p.id == log.id) philo.add_log(log) + if self.dead: + raise error.Log(self._logs, "should not output after death") + if log.event is Event.DIED: + self.dead = True def check(self): if self.dead: return fork_used = 2 * len([p for p in self._philos if p.last_event == Event.EATING]) if fork_used > self._philo_num: - raise LogError("using nonexistant forks") + raise error.Log(self._logs, "using nonexistant forks") for l1, l2 in zip(self._logs, self._logs[1:]): if l1.timestamp > l2.timestamp: - raise LogError("timestamp not in ordered") + raise error.Log("timestamp not in ordered") for p in self._philos: p.check() |