From f36e2a96c494162ef1665ad2718fe564753cc29d Mon Sep 17 00:00:00 2001 From: cnc Date: Thu, 4 Jun 2026 19:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=80=83=E6=89=80=E6=9C=89=E5=88=86?= =?UTF-8?q?=E7=BB=84=EF=BC=8C=E5=AE=8C=E6=88=90=E5=B0=BD=E9=87=8F=E5=A4=9A?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E3=80=82=E7=A6=81=E6=AD=A2=E9=A1=BA?= =?UTF-8?q?=E6=89=8B=E6=89=A9=E5=8A=9F=E8=83=BD=20smoke=EF=BC=9A=E9=94=81?= =?UTF-8?q?=E5=AE=9APythonPlugin=E8=B4=9F=E7=8A=B6=E6=80=81=E7=9F=AD?= =?UTF-8?q?=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论：按 LinuxCNC src/emc/pythonplugin/python_plugin.cc 的 status < PLUGIN_OK 分支，补齐 WASM PythonPlugin shim 的 call/call_method 负状态短路探针；保持 Python 执行禁用，不扩展 smoke 解析。 --- check-linuxcnc-wasm-shims-source-map.sh | 2 ++ core/wasm_shims/pythonplugin/python_plugin.cc | 8 ++++++++ core/wasm_shims/pythonplugin/python_plugin_probe_main.cc | 6 ++++++ docs/linuxcnc-wasm-shims-source-map.md | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/check-linuxcnc-wasm-shims-source-map.sh b/check-linuxcnc-wasm-shims-source-map.sh index dfdacc1..88f86ec 100755 --- a/check-linuxcnc-wasm-shims-source-map.sh +++ b/check-linuxcnc-wasm-shims-source-map.sh @@ -33,6 +33,7 @@ grep -F 'print_rcs_error_new' "$linuxcnc_root/src/libnml/rcs/rcs_print.cc" >/dev grep -F 'rtapi_snprintf' "$linuxcnc_root/src/rtapi/uspace_common.h" >/dev/null grep -F 'class PythonPlugin' "$linuxcnc_root/src/emc/pythonplugin/python_plugin.hh" >/dev/null grep -F 'PythonPlugin::instantiate' "$linuxcnc_root/src/emc/pythonplugin/python_plugin.cc" >/dev/null +grep -F 'if (status < PLUGIN_OK)' "$linuxcnc_root/src/emc/pythonplugin/python_plugin.cc" >/dev/null grep -F '#define TOOL_MMAP_FILENAME ".tool.mmap"' "$linuxcnc_root/src/emc/tooldata/tooldata_mmap.cc" >/dev/null grep -F 'int tool_nml_register(CANON_TOOL_TABLE *tblptr)' "$linuxcnc_root/src/emc/tooldata/tooldata_nml.cc" >/dev/null grep -F 'int tooldata_db_init(char progname_plus_args[]' "$linuxcnc_root/src/emc/tooldata/tooldata_db.cc" >/dev/null @@ -118,6 +119,7 @@ for phrase in [ "RS274/WASM manifest", "browser-safe LinuxCNC adaptations", "inactive-DB return values", + "negative-status short-circuit behavior", ]: if phrase not in source_map: raise SystemExit(f"docs/linuxcnc-wasm-shims-source-map.md missing boundary phrase: {phrase}") diff --git a/core/wasm_shims/pythonplugin/python_plugin.cc b/core/wasm_shims/pythonplugin/python_plugin.cc index 2100e2e..65c559c 100644 --- a/core/wasm_shims/pythonplugin/python_plugin.cc +++ b/core/wasm_shims/pythonplugin/python_plugin.cc @@ -58,6 +58,9 @@ int PythonPlugin::call(const char *, if (!callable) { return PLUGIN_NO_CALLABLE; } + if (status < PLUGIN_OK) { + return status; + } retval = boost::python::object(); exception_msg = handle_pyerror(); @@ -72,6 +75,11 @@ int PythonPlugin::run_string(const char *, boost::python::object &retval, bool) } int PythonPlugin::call_method(boost::python::object, boost::python::object &retval) { + // LinuxCNC source basis: src/emc/pythonplugin/python_plugin.cc returns the + // existing negative plugin status before invoking a Python callable. + if (status < PLUGIN_OK) { + return status; + } retval = boost::python::object(); status = PLUGIN_OK; return status; diff --git a/core/wasm_shims/pythonplugin/python_plugin_probe_main.cc b/core/wasm_shims/pythonplugin/python_plugin_probe_main.cc index bf04a28..72fb00c 100644 --- a/core/wasm_shims/pythonplugin/python_plugin_probe_main.cc +++ b/core/wasm_shims/pythonplugin/python_plugin_probe_main.cc @@ -17,6 +17,12 @@ int main() { return 7; } boost::python::object retval; + if (plugin->call(nullptr, "noop", boost::python::object(), boost::python::object(), retval) != PLUGIN_BAD_INIFILE) { + return 14; + } + if (plugin->call_method(boost::python::object(), retval) != PLUGIN_BAD_INIFILE) { + return 15; + } if (plugin->run_string("noop", retval, false) != PLUGIN_OK) { return 3; } diff --git a/docs/linuxcnc-wasm-shims-source-map.md b/docs/linuxcnc-wasm-shims-source-map.md index d7fbcb4..81c2aa3 100644 --- a/docs/linuxcnc-wasm-shims-source-map.md +++ b/docs/linuxcnc-wasm-shims-source-map.md @@ -24,7 +24,7 @@ only; it must not add CNC behavior and must not expand the temporary smoke parse | `core/wasm_shims/rtapi_compat.cc` | `src/rtapi/uspace_common.h`, `src/rtapi/rtapi.h` | Provides userspace RTAPI formatting declarations used by RS274/NML code. | | `core/wasm_shims/tooldata/tooldata_mmap_backend.cc` | `src/emc/tooldata/tooldata_mmap.cc` | Replaces native mmap storage with an in-memory WASM-safe backend for probes. | | `core/wasm_shims/tooldata/tooldata_runtime_stubs.cc` | `src/emc/tooldata/tooldata_nml.cc`, `src/emc/tooldata/tooldata_db.cc` | Satisfies NML and external tool database entry points without native services, preserving inactive-DB return values. | -| `core/wasm_shims/pythonplugin/python_plugin.cc` | `src/emc/pythonplugin/python_plugin.cc`, `src/emc/pythonplugin/python_plugin.hh` | Keeps LinuxCNC PythonPlugin API available while Python execution is disabled for browser-safe probes. | +| `core/wasm_shims/pythonplugin/python_plugin.cc` | `src/emc/pythonplugin/python_plugin.cc`, `src/emc/pythonplugin/python_plugin.hh` | Keeps LinuxCNC PythonPlugin API and negative-status short-circuit behavior available while Python execution is disabled for browser-safe probes. | ## Boundaries