Dev

.clang-format

@@ -79,6 +79,9 @@ IncludeCategories:
   - Regex:           '^["<]libstored/'
     Priority:        1
     SortPriority:    0
+  - Regex:           '^<(cassert|assert\.h)>$'
+    Priority:        3
+    SortPriority:    0
   - Regex:           '.*'
     Priority:        2
     SortPriority:    0

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+# SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 #
 # SPDX-License-Identifier: CC0-1.0
 
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         gcc: [12, 13, 14]
-        cxx: [C++03, C++11, C++14, C++17]
+        cxx: [C++03, C++11, C++14, C++17, C++20, C++23]
         zmq: [zmq, nozmq]
         include:
           - gcc: 13
@@ -32,7 +32,7 @@ jobs:
       CXX: g++-${{matrix.gcc}}
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: |
           sudo apt update
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: |
           sudo apt update
@@ -68,7 +68,7 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [msvc, gcc]
-        cxx: [C++03, C++11, C++14, C++17]
+        cxx: [C++03, C++11, C++14, C++17, C++20, C++23]
         zmq: [zmq, nozmq]
         exclude:
           - compiler: msvc
@@ -86,10 +86,10 @@ jobs:
 #            zth: zth
     steps:
       - name: checkout
-        uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+        uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
       - name: bootstrap
         run: |
           dist\win32\bootstrap.cmd
@@ -104,7 +104,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: dist/macos/bootstrap.sh
       - name: venv
@@ -120,7 +120,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: |
           sudo apt update
@@ -137,7 +137,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: |
           sudo apt update
@@ -153,7 +153,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: bootstrap
         run: |
           sudo apt update

CHANGELOG.rst

@@ -1,7 +1,7 @@
 
 
 ..
-   SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+   SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 
    SPDX-License-Identifier: CC0-1.0
 
@@ -24,14 +24,29 @@ The format is based on `Keep a Changelog`_, and this project adheres to
 Added
 `````
 
+...
+
+.. _Unreleased: https://github.com/DEMCON/libstored/compare/v2.2.0...HEAD
+
+
+
+`2.2.0`_ - 2026-03-27
+---------------------
+
+Added
+`````
+
 - ``libstored.protocol.ArqLayer`` for general-purpose ARQ.
 
 Fixed
 `````
 
 - ``ZmqClient`` assertion during cleanup
+- ``AsyncioWorker`` coro scheduling from MainThread asyncio loop.
+- Fix stopping fast poll in ``ZmqClient`` when all objects are stopped polling.
+- ``libstored.gui`` performance on Windows.
 
-.. _Unreleased: https://github.com/DEMCON/libstored/compare/v2.1.0...HEAD
+.. _2.2.0: https://github.com/DEMCON/libstored/releases/tag/v2.2.0
 
 
 

REUSE.toml

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
+#
+# SPDX-License-Identifier: CC0-1.0
+
+version = 1
+
+[[annotations]]
+path = "extern/material.io/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Google"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "presentation/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2020-2026 Jochem Rutgers"
+SPDX-License-Identifier = "CC-BY-4.0"
+
+[[annotations]]
+path = ".vscode/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2020-2026 Jochem Rutgers"
+SPDX-License-Identifier = "CC0-1.0"

dist/common/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+# SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 #
 # SPDX-License-Identifier: MPL-2.0
 
@@ -18,9 +18,9 @@ trap gotErr ERR
 function show_help {
 	echo -e "Usage: $0 [<opt>...] [--] [<other cmake arguments>]\n"
 	echo "where opt is:"
-	echo "  Debug         RelWithDebInfo Release"
+	echo "  Debug RelWithDebInfo Release"
 	echo "                Set CMAKE_BUILD_TYPE to this value"
-	echo "  C++98         C++03 C++11 C++14 C++17 C++20"
+	echo "  C++98 C++03 C++11 C++14 C++17 C++20 C++23"
 	echo "                Set the C++ standard"
 	echo "  conf          Configure only, don't build"
 	echo "  dev           Enable development-related options"
@@ -77,6 +77,8 @@ while [[ ! -z ${1:-} ]]; do
 			cmake_opts="${cmake_opts} -DCMAKE_CXX_STANDARD=17 -DCMAKE_C_STANDARD=11";;
 		C++20)
 			cmake_opts="${cmake_opts} -DCMAKE_CXX_STANDARD=20 -DCMAKE_C_STANDARD=11";;
+		C++23)
+			cmake_opts="${cmake_opts} -DCMAKE_CXX_STANDARD=23 -DCMAKE_C_STANDARD=11";;
 		conf)
 			do_build=0;;
 		dev)

dist/common/requirements.txt

@@ -17,5 +17,5 @@ breathe
 sphinxcontrib-wavedrom
 
 # Other
-reuse
+reuse >= 6.0.0
 cmake_format

dist/win32/build.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-rem SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+rem SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 rem
 rem SPDX-License-Identifier: MPL-2.0
 
@@ -85,6 +85,10 @@ if %1 == C++20 (
 	set cmake_opts=%cmake_opts% -DCMAKE_CXX_STANDARD=20 -DCMAKE_C_STANDARD=11
 	goto next_param
 )
+if %1 == C++23 (
+	set cmake_opts=%cmake_opts% -DCMAKE_CXX_STANDARD=23 -DCMAKE_C_STANDARD=11
+	goto next_param
+)
 if %1 == conf (
 	set do_build=0
 	goto next_param
@@ -229,10 +233,10 @@ exit /b 0
 echo Usage: %0 [^<opt^>...] [--] [^<other cmake arguments^>]
 echo.
 echo where opt is:
-echo   Debug         RelWithDebInfo Release
+echo   Debug RelWithDebInfo Release
 echo                 Set CMAKE_BUILD_TYPE to this value
 echo   gcc           Use gcc instead of default compiler
-echo   C++98         C++03 C++11 C++14 C++17 C++20
+echo   C++98 C++03 C++11 C++14 C++17 C++20 C++23
 echo                 Set the C++ standard
 echo   conf          Configure only, don't build
 echo   dev           Enable development-related options

python/libstored/asyncio/worker.py

@@ -335,34 +335,37 @@ def run_sync(*args, block: bool = True, sync: bool | None = None, **kwargs) -> t
             sync is None or (loop is None) == sync or not block
         ), "sync argument contradicts current context"
 
-        if loop is not None and not sync:
+        w = None
+        logger = None
+        if isinstance(self, Work):
+            logger = self.logger
+            w = self.worker
+            if loop is not w.loop:
+                logger.debug("Running %s in worker %s", f.__qualname__, str(w))
+            else:
+                logger.debug("Running %s in current worker", f.__qualname__)
+        else:
+            if hasattr(self, "logger"):
+                logger = self.logger
+                logger.debug("Running %s in default worker", f.__qualname__)
+            global default_worker
+            w = default_worker
+
+        if w is None or not w.is_running():
+            if hasattr(self, "logger"):
+                logger = self.logger
+                logger.debug("No worker running, creating new one")
+            w = AsyncioWorker()
+
+        if loop is not None and not sync and loop is w.loop:
             # We are in an event loop, just start the coro.
             coro = f(*args, **kwargs)
             if block:
                 return coro
             else:
                 return asyncio.ensure_future(coro)
         else:
-            # We are not in an event loop, run the coro in the (default) worker.
-            w = None
-            logger = None
-            if isinstance(self, Work):
-                logger = self.logger
-                logger.debug("Running %s in worker %s", f.__qualname__, str(self.worker))
-                w = self.worker
-            else:
-                if hasattr(self, "logger"):
-                    logger = self.logger
-                    logger.debug("Running %s in default worker", f.__qualname__)
-                global default_worker
-                w = default_worker
-
-            if w is None or not w.is_running():
-                if hasattr(self, "logger"):
-                    logger = self.logger
-                    logger.debug("No worker running, creating new one")
-                w = AsyncioWorker()
-
+            # We are not in the (proper) event loop, run the coro in the (default) worker.
             future = w.execute(f(*args, **kwargs))
             if block:
                 return lexc.DeadlockChecker(future).result()

python/libstored/asyncio/zmq.py

@@ -3045,7 +3045,7 @@ async def _poll(self, o: Object, interval_s: float | None):
                 await self._fast_poll_macro.remove(o)
                 await self.alias(o, temporary=True, permanentRef=self._fast_poll_macro)
 
-                if len(self._fast_poll_macro) == 0:
+                if len(self._fast_poll_macro) <= 1: # time is always included, so check for <= 1
                     await self._poll_fast_stop()
 
             # Stop trace, if any

python/libstored/gui/__main__.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+# SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 #
 # SPDX-License-Identifier: MPL-2.0
 
@@ -30,7 +30,6 @@
 from .. import exceptions as lexc
 from .. import protocol as lprot
 
-
 #####################################################################
 # Style
 #
@@ -694,6 +693,7 @@ def set_objects(self, objects: list[laio_zmq.Object]):
         for o in self._objects:
             o.destroy()
         self._objects = []
+        self._filtered_objects = []
 
         for o in natsort.natsorted(objects, key=lambda o: o.name, alg=natsort.ns.IGNORECASE):
             object_row = ObjectRow(self._app, self, o, show_plot=self._show_plot)
@@ -1193,8 +1193,8 @@ def __init__(
 
         self.root.title(f"libstored GUI")
         icon_path = os.path.join(os.path.dirname(__file__), "twotone_bug_report_black_48dp.png")
-        icon = tk.PhotoImage(file=icon_path)
-        self.root.iconphoto(False, icon)
+        self._icon = tk.PhotoImage(file=icon_path)
+        self.root.iconphoto(False, self._icon)
 
         global plotter
         if Plotter.available and plotter is None:
@@ -1337,6 +1337,8 @@ def cleanup(self):
             plotter = None
 
         self.disconnect_all()
+        self._objects.set_objects([])
+        self._polled_objects.set_objects([])
         self.logger.debug("Close client")
         self._close_async()
         super().cleanup()

src/protocol.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020-2025 Jochem Rutgers
+// SPDX-FileCopyrightText: 2020-2026 Jochem Rutgers
 //
 // SPDX-License-Identifier: MPL-2.0
 
@@ -1394,7 +1394,7 @@ void Crc8Layer::decode(void* buffer, size_t len)
 	uint8_t* buffer_ = static_cast<uint8_t*>(buffer);
 	uint8_t crc = init;
 	for(size_t i = 0; i < len - 1; i++)
-		crc = compute(crc, buffer_[i]);
+		crc = compute(buffer_[i], crc);
 
 	if(crc != buffer_[len - 1])
 		// Invalid.
@@ -1407,7 +1407,7 @@ void Crc8Layer::encode(void const* buffer, size_t len, bool last)
 {
 	uint8_t const* buffer_ = static_cast<uint8_t const*>(buffer);
 	for(size_t i = 0; i < len; i++)
-		m_crc = compute(m_crc, buffer_[i]);
+		m_crc = compute(buffer_[i], m_crc);
 
 	base::encode(buffer, len, false);
 

tests/CMakeLists.txt

@@ -292,6 +292,16 @@ if(LIBSTORED_HAVE_LIBZMQ
 	)
 endif()
 
+if(LIBSTORED_PYLIBSTORED)
+	add_test(NAME test_async
+		 COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../python
+			 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_async.py
+	)
+
+	set_tests_properties(test_async PROPERTIES TIMEOUT 60)
+	add_launch_json_py(test_async ${CMAKE_CURRENT_SOURCE_DIR}/test_async.py)
+endif()
+
 if(VIVADO_CMD)
 	if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fpga/vivado/test_fpga/test_fpga.xpr)
 		execute_process(