Implement per-driver lpp_timeout (#166)

* implement per-driver lpp_timeout

* fix conftest v1

Author: PeterKraus

docs/source/driver_develop.rst

@@ -21,6 +21,7 @@ When the *driver* process is launched (as a ``tomato-driver``), it's given infor
 The following keywords in the driver-specific settings in the |setfile|_ are reserved for use by **tomato**:
 
 - ``idle_measurement_interval``: Specifies the interval (in seconds) after which the :func:`cmp_measure` function of all *components* registered on the *driver* should be called. The :func:`cmp_measure` checks that *components* are idle, i.e. without a running :class:`Task`. Overrides any :obj:`DriverInterface.idle_measurement_interval`.
+- ``lpp_timeout``: Specifies the timeout (in seconds) after which the communication with this *driver* interface will be retried. When unset, defaults to :obj:`tomato.daemon.lpp.REQ_TIMEOUT` (in milliseconds).
 
 
 Communication between *jobs* and *drivers*

src/tomato/daemon/job.py

@@ -506,10 +506,15 @@ def job_thread(
         endpoint=f"tcp://127.0.0.1:{driver.port}", context=context, sender=sender
     )
 
+    if "lpp_timeout" in driver.settings:
+        lppargs["timeout"] = driver.settings["lpp_timeout"] * 1000
+        logger.debug(
+            "%s: setting lpp_timeout to %d ms", component.role, lppargs["timeout"]
+        )
+
     logger.info(
         "%s: job thread of %s attached to tomato-daemon", component.role, component.name
     )
-
     kwargs = dict(address=component.address, channel=component.channel)
 
     datapath = Path(jobpath) / f"{component.role}.pkl"
@@ -600,7 +605,7 @@ def job_thread(
             if tN - tP > device.pollrate:
                 logger.debug("%s: polling task for data", taskid)
                 msg = dict(cmd="task_data", params={**kwargs})
-                ret, req = lpp.comm(req, msg, **lppargs, timeout=5000)
+                ret, req = lpp.comm(req, msg, **lppargs)  # , timeout=5000)
                 if req.closed:
                     thread.crashed = True
                     sys.exit()
@@ -637,7 +642,7 @@ def job_thread(
             ):
                 logger.info("%s: task stop trigger met", taskid)
                 msg = dict(cmd="task_stop", params={**kwargs})
-                ret, req = lpp.comm(req, msg, **lppargs, timeout=5000)
+                ret, req = lpp.comm(req, msg, **lppargs)  # , timeout=5000)
                 if req.closed:
                     thread.crashed = True
                     sys.exit()
@@ -653,7 +658,7 @@ def job_thread(
         # Store final task data, housekeeping.
         logger.info("%s: task fetching final data", taskid)
         msg = dict(cmd="task_data", params={**kwargs})
-        ret, req = lpp.comm(req, msg, **lppargs, timeout=5000)
+        ret, req = lpp.comm(req, msg, **lppargs)  # , timeout=5000)
         if req.closed:
             thread.crashed = True
             sys.exit()
@@ -673,7 +678,7 @@ def job_thread(
         msg = dict(cmd="dev_reset", params={**kwargs})
     else:
         msg = dict(cmd="cmp_reset", params={**kwargs})
-    ret, req = lpp.comm(req, msg, **lppargs, timeout=5000)
+    ret, req = lpp.comm(req, msg, **lppargs)  # , timeout=5000)
     if req.closed:
         thread.crashed = True
         sys.exit()

src/tomato/tomato/__init__.py

@@ -491,6 +491,7 @@ def init(
 
         [drivers]
         example_counter.idle_measurement_interval = 1
+        example_counter.lpp_timeout = 2
         """
     )
     if not appdir.exists():

tests/conftest.py

@@ -60,12 +60,12 @@ def stop_tomato_daemon(port: int = 12345):
     for p in psutil.process_iter(["name"]):
         for name in ["tomato-daemon", "tomato-job", "tomato-driver"]:
             if name in p.info["name"]:
-                pc = p.children()
-                pc.append(p)
-                for proc in pc:
-                    procs.append(proc)
-                    try:
-                        proc.terminate()
-                    except psutil.NoSuchProcess:
-                        pass
+                try:
+                    pc = p.children()
+                    pc.append(p)
+                    for proc in pc:
+                        procs.append(proc)
+                    proc.terminate()
+                except psutil.NoSuchProcess:
+                    pass
     gone, alive = psutil.wait_procs(procs, timeout=1)