[libcamera-devel] [PATCH v2 1/8] utils: ipc: proxy: Assert asynchronous calls execute in the running state

[Jacopo Mondi]

Hi Kieran

On Fri, Mar 12, 2021 at 05:47:20AM +0000, Kieran Bingham wrote:
> From: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
>
> Signals and calls from the IPA should not occur after the IPA has been
> put into the stopped state.
>
> Add assertions to catch and prevent any messages being processed after
> this.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>

Thanks
  j

> ---
>  .../generators/libcamera_templates/module_ipa_proxy.cpp.tmpl  | 2 ++
>  utils/ipc/generators/libcamera_templates/proxy_functions.tmpl | 4 ++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
> index f75b1206cad4..e3b541db4e36 100644
> --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
> +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl
> @@ -173,6 +173,7 @@ void {{proxy_name}}::recvMessage(const IPCMessage &data)
>  	{%- endfor -%}
>  );
>  {% elif method|is_async %}
> +	ASSERT(running_);
>  	proxy_.invokeMethod(&ThreadProxy::{{method.mojom_name}}, ConnectionTypeQueued,
>  	{%- for param in method|method_param_names -%}
>  		{{param}}{{- ", " if not loop.last}}
> @@ -225,6 +226,7 @@ void {{proxy_name}}::recvMessage(const IPCMessage &data)
>  {% for method in interface_event.methods %}
>  {{proxy_funcs.func_sig(proxy_name, method, "Thread")}}
>  {
> +	ASSERT(running_);
>  	{{method.mojom_name}}.emit({{method.parameters|params_comma_sep}});
>  }
>
> diff --git a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
> index c2ac42fca45b..13dc8fdcab6e 100644
> --- a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
> +++ b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl
> @@ -26,12 +26,12 @@
>  	if (!running_)
>  		return;
>
> -	running_ = false;
> -
>  	proxy_.invokeMethod(&ThreadProxy::stop, ConnectionTypeBlocking);
>
>  	thread_.exit();
>  	thread_.wait();
> +
> +	running_ = false;
>  {%- endmacro -%}
>
>
> --
> 2.25.1
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel