salabim 25.0.7__py3-none-any.whl → 25.0.9__py3-none-any.whl

salabim/salabim.py

@@ -1,13 +1,13 @@
-#               _         _      _               ____   ____       ___      _____
-#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | ___|     / _ \    |___  |
-#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) ||___ \    | | | |      / /
-#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/  ___) | _ | |_| | _   / /
-#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____||____/ (_) \___/ (_) /_/
+#               _         _      _               ____   ____       ___       ___
+#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | ___|     / _ \     / _ \
+#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) ||___ \    | | | |   | (_) |
+#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/  ___) | _ | |_| | _  \__, |
+#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____||____/ (_) \___/ (_)   /_/
 #                    discrete event simulation
 #
 #  see www.salabim.org for more information, the documentation and license information
 
-__version__ = "25.0.7"
+__version__ = "25.0.9"
 import heapq
 import random
 import time
@@ -7263,7 +7263,6 @@ by adding at the end:
             self.status._value = scheduled
             if self.env._yieldless:
                 self._glet = greenlet.greenlet(lambda: self._process(**kwargs_p), parent=self.env._glet)
-                self.env.glets.append(self._glet)
             self._reschedule(scheduled_time, priority, urgent, "activate", cap_now, extra=extra)
         self.setup(**kwargs)
 
@@ -7503,13 +7502,14 @@ by adding at the end:
         return return_or_print(result, as_str, file)
 
     def _push(self, t, priority, urgent, return_value=None, switch=True):
-        self.env._seq += 1
-        if urgent:
-            seq = -self.env._seq
-        else:
-            seq = self.env._seq
-        self._on_event_list = True
-        heapq.heappush(self.env._event_list, (t, priority, seq, self, return_value))
+        if t!=inf:
+            self.env._seq += 1
+            if urgent:
+                seq = -self.env._seq
+            else:
+                seq = self.env._seq
+            self._on_event_list = True
+            heapq.heappush(self.env._event_list, (t, priority, seq, self, return_value))
         if self.env._yieldless:
             if self is self.env._current_component:
                 self.env._glet.switch()
@@ -7937,7 +7937,6 @@ by adding:
             lineno = self.lineno_txt(add_at=True)
             self.env.print_trace("", "", self.name() + " passivate", merge_blanks(lineno, self._modetxt()))
         self.status._value = passive
-        self._push(inf, 0, False, None)
 
         if self.env._yieldless:
             if self is self.env._current_component:
@@ -8079,8 +8078,6 @@ by adding:
             self.env.print_trace("", "", "cancel " + self.name() + " " + self._modetxt())
         self.status._value = data
         if self.env._yieldless:
-            self._glet.throw()
-            self._glet = None
             if self is self.env._current_component:
                 self.env._glet.switch()
 
@@ -10560,7 +10557,6 @@ class Environment:
     ):
         _check_overlapping_parameters(self, "__init__", "setup")
 
-        self.glets = []
         if name is None:
             if isdefault_env:
                 name = "default environment"
@@ -10743,10 +10739,6 @@ class Environment:
         """
         pass
 
-    def cancel_all(self):
-        for t, priority, sequence, comp, return_value in self._event_list:
-            comp.cancel()
-
     def serialize(self) -> int:
         self.serial += 1
         return self.serial

{salabim-25.0.7.dist-info → salabim-25.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: salabim
-Version: 25.0.7
+Version: 25.0.9
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-25.0.7.dist-info → salabim-25.0.9.dist-info}/RECORD

@@ -3,8 +3,8 @@ salabim/LICENSE.txt,sha256=eTPlcDJz4G0096Qv-wfMjm1Wxbd4ilDlsYg5rN4HjWQ,1106
 salabim/__init__.py,sha256=r7qPLvlmX0dkZDyjuTo8Jo3ex3sD1L4pmK6K5ib9vyw,56
 salabim/calibri.ttf,sha256=RWpf8Uo31RfvGGNaSt9-2sXSuN87AVE_NFMRsV3LhBk,1330156
 salabim/mplus-1m-regular.ttf,sha256=EuFHr90BJjuAn_r5MleJFN-WfkeWJ4tf7DweI5zr8tU,289812
-salabim/salabim.py,sha256=fPJt1KQCzcKvY1zxVVsaZMWumB9KCUa03SySJaMYwoE,1125723
-salabim-25.0.7.dist-info/METADATA,sha256=ETRykdUqh-or7N6LKOHNYFV_FXhwa0QmCFYJx4jKPgI,3399
-salabim-25.0.7.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-salabim-25.0.7.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-25.0.7.dist-info/RECORD,,
+salabim/salabim.py,sha256=vSMVcWlHrZKShotu15QJ_THLqTUbheGw5gsLnoDhca0,1125470
+salabim-25.0.9.dist-info/METADATA,sha256=cJClhCPVdf31-iu49ZJwLmP1u43l6MFBUZBesLrf92s,3399
+salabim-25.0.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+salabim-25.0.9.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-25.0.9.dist-info/RECORD,,

{salabim-25.0.7.dist-info → salabim-25.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any