summaryrefslogtreecommitdiff
path: root/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-03-23 13:55:09 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-03-29 12:18:02 +0100
commit70238ceca5b2f0be1330ecb9664ae0f59f151152 (patch)
treed4fb849274346c59b92f3faf2caf19be7a1eeac1 /utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
parente7d367bf65c749ca1cee79db6d12a1fc130ff80e (diff)
utils: ipc: proxy: Track IPA with a state machine
Asynchronous tasks can only be submitted while the IPA is running. Further more, the shutdown sequence can not be tracked with a simple running flag. We can also be in the state 'Stopping' where we have not yet completed all events, but we must not commence anything new. Refactor the running_ boolean into a stateful enum to track this. Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'utils/ipc/generators/libcamera_templates/proxy_functions.tmpl')
-rw-r--r--utils/ipc/generators/libcamera_templates/proxy_functions.tmpl7
1 files changed, 5 insertions, 2 deletions
diff --git a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
index 8addc2fa..ea9cc86b 100644
--- a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
+++ b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
@@ -23,9 +23,12 @@
# \brief Generate function body for IPA stop() function for thread
#}
{%- macro stop_thread_body() -%}
- if (!running_)
+ ASSERT(state_ != ProxyStopping);
+ if (state_ != ProxyRunning)
return;
+ state_ = ProxyStopping;
+
proxy_.invokeMethod(&ThreadProxy::stop, ConnectionTypeBlocking);
thread_.exit();
@@ -33,7 +36,7 @@
Thread::current()->dispatchMessages(Message::Type::InvokeMessage);
- running_ = false;
+ state_ = ProxyStopped;
{%- endmacro -%}