Make the cycle more precise

Measure each cycle of process image synchronisation and do not build a mean value for that.
The cycle function is now exactly timed, even if the individual runtimes are different.
This commit is contained in:
2021-10-17 19:11:04 +02:00
parent 5c3568d4b8
commit b90e858fef
3 changed files with 17 additions and 26 deletions

View File

@@ -22,7 +22,7 @@ __author__ = "Sven Sager <akira@revpimodio.org>"
__copyright__ = "Copyright (C) 2020 Sven Sager" __copyright__ = "Copyright (C) 2020 Sven Sager"
__license__ = "LGPLv3" __license__ = "LGPLv3"
__name__ = "revpimodio2" __name__ = "revpimodio2"
__version__ = "2.5.8" __version__ = "2.5.8b"
# Global package values # Global package values
OFF = 0 OFF = 0

View File

@@ -365,7 +365,7 @@ class ProcimgWriter(Thread):
""" """
__slots__ = "__dict_delay", "__eventth", "_eventqth", "__eventwork", \ __slots__ = "__dict_delay", "__eventth", "_eventqth", "__eventwork", \
"_adjwait", "_eventq", "_modio", \ "_eventq", "_modio", \
"_refresh", "_work", "daemon", "lck_refresh", "newdata" "_refresh", "_work", "daemon", "lck_refresh", "newdata"
def __init__(self, parentmodio): def __init__(self, parentmodio):
@@ -375,7 +375,6 @@ class ProcimgWriter(Thread):
self.__eventth = Thread(target=self.__exec_th) self.__eventth = Thread(target=self.__exec_th)
self._eventqth = queue.Queue() self._eventqth = queue.Queue()
self.__eventwork = False self.__eventwork = False
self._adjwait = 0
self._eventq = queue.Queue() self._eventq = queue.Queue()
self._modio = parentmodio self._modio = parentmodio
self._refresh = 0.05 self._refresh = 0.05
@@ -512,17 +511,18 @@ class ProcimgWriter(Thread):
def run(self): def run(self):
"""Startet die automatische Prozessabbildsynchronisierung.""" """Startet die automatische Prozessabbildsynchronisierung."""
fh = self._modio._create_myfh() fh = self._modio._create_myfh()
self._adjwait = self._refresh
mrk_warn = True mrk_warn = True
mrk_dt = default_timer()
bytesbuff = bytearray(self._modio._length) bytesbuff = bytearray(self._modio._length)
# First sync of cycle time to start the main loop and match exact time
sleep(self._refresh - (default_timer() % self._refresh))
while not self._work.is_set(): while not self._work.is_set():
ot = mrk_dt ot = default_timer()
# Lockobjekt holen und Fehler werfen, wenn nicht schnell genug # Lockobjekt holen und Fehler werfen, wenn nicht schnell genug
if not self.lck_refresh.acquire(timeout=self._adjwait): if not self.lck_refresh.acquire(timeout=self._refresh):
warnings.warn( warnings.warn(
"cycle time of {0} ms exceeded during executing function" "cycle time of {0} ms exceeded during executing function"
"".format(int(self._refresh * 1000)), "".format(int(self._refresh * 1000)),
@@ -609,22 +609,15 @@ class ProcimgWriter(Thread):
self._eventq.put(tup_fire, False) self._eventq.put(tup_fire, False)
del self.__dict_delay[tup_fire] del self.__dict_delay[tup_fire]
# Sleep and not .wait (.wait uses system clock) if default_timer() - ot > self._refresh:
sleep(self._adjwait) warnings.warn(
"cycle time of {0} ms exceeded - can not hold cycle time!"
# Wartezeit anpassen um echte self._refresh zu erreichen "".format(int(self._refresh * 1000)),
mrk_dt = default_timer() RuntimeWarning
if mrk_dt - ot >= self._refresh: )
self._adjwait -= 0.001
if self._adjwait < 0:
warnings.warn(
"cycle time of {0} ms exceeded several times - can not"
" hold cycle time!".format(int(self._refresh * 1000)),
RuntimeWarning
)
self._adjwait = 0
else: else:
self._adjwait += 0.001 # Sleep and not .wait (.wait uses system clock)
sleep(self._refresh - (default_timer() % self._refresh))
# Alle am Ende erneut aufwecken # Alle am Ende erneut aufwecken
self._collect_events(False) self._collect_events(False)
@@ -639,9 +632,7 @@ class ProcimgWriter(Thread):
"""Setzt die Zykluszeit in Millisekunden. """Setzt die Zykluszeit in Millisekunden.
@param value <class 'int'> Millisekunden""" @param value <class 'int'> Millisekunden"""
if type(value) == int and 5 <= value <= 2000: if type(value) == int and 5 <= value <= 2000:
waitdiff = self._refresh - self._adjwait
self._refresh = value / 1000 self._refresh = value / 1000
self._adjwait = 0 if waitdiff < 0 else self._refresh - waitdiff
else: else:
raise ValueError( raise ValueError(
"refresh time must be 5 to 2000 milliseconds" "refresh time must be 5 to 2000 milliseconds"

View File

@@ -17,7 +17,7 @@ setup(
license="LGPLv3", license="LGPLv3",
name="revpimodio2", name="revpimodio2",
version="2.5.8", version="2.5.8b",
packages=["revpimodio2"], packages=["revpimodio2"],
python_requires="~=3.2", python_requires="~=3.2",