{"id":21666,"url":"https://patchwork.libcamera.org/api/1.1/patches/21666/?format=json","web_url":"https://patchwork.libcamera.org/patch/21666/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241018075942.1150378-2-chenghaoyang@chromium.org>","date":"2024-10-18T07:57:34","name":"[1/4] libcamera: Add signal disconnected for IPC","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c03e0ed7135a302fb9a9a80def4dc317a3ae7090","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21666/mbox/","series":[{"id":4715,"url":"https://patchwork.libcamera.org/api/1.1/series/4715/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4715","date":"2024-10-18T07:57:33","name":"IPC disconnect signals","version":1,"mbox":"https://patchwork.libcamera.org/series/4715/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21666/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21666/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 93D37C32FC\n\tfor ;\n\tFri, 18 Oct 2024 07:59:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 272086538E;\n\tFri, 18 Oct 2024 09:59:56 +0200 (CEST)","from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com\n\t[IPv6:2607:f8b0:4864:20::42d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DB49E65390\n\tfor ;\n\tFri, 18 Oct 2024 09:59:51 +0200 (CEST)","by mail-pf1-x42d.google.com with SMTP id\n\td2e1a72fcca58-71e5a62031aso1259884b3a.1\n\tfor ;\n\tFri, 18 Oct 2024 00:59:51 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(27.247.221.35.bc.googleusercontent.com. [35.221.247.27])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-71ea345b0c3sm901274b3a.172.2024.10.18.00.59.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 18 Oct 2024 00:59:49 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"caWPpEPm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1729238389; x=1729843189;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=N2LcTi4jGw13ltNq1rVNh6Kk02jZAT/tlEseKphVCtM=;\n\tb=caWPpEPmPnpQd9+TP/jnXbTh+8tq1e/k5KAChwg7nnEC/1tQnvvXl6JsOW0U8gTUym\n\t+9G3SjNoBSyjmdUQFWNYRXT5DeSNzsdpa2GMC8YtREmkZ6VtbRJrjXBXULv3EFxCqMUC\n\tfofIIPvesazAL1ZFr5HESWXChzHMujrPynxss=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1729238389; x=1729843189;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=N2LcTi4jGw13ltNq1rVNh6Kk02jZAT/tlEseKphVCtM=;\n\tb=RAcus9G1bzS+FY4n3xHKe0Kzg0YYt7FBTHDqxUXFZBmCM+gRHZVrXK+IsIiN/XqJIo\n\tRhNZ6vfCXjc94bJdxLC2nKWp3pu+pLzokqeYoL+aIjjPCJmWCuysAetnJ+YWOA6WER4c\n\tw6XNSt3/y8IyXh/IUBPjYIih5PBykZnM++a5cwCG4+IotutmN4HsBlaQGZTkP2sBmxrm\n\tbGd79FC7ZoGHXg9eTzwSuZG7fjVWx8WdQ4iKNlg1Suxox4piH9bn8ZnPW/9O9mFIm/KQ\n\tmxUfFrrZN86KVyKs02N5s//UaBUskFfpGafiIAg0B3nBnKEj85wgdo4AOCs+u+hUwsNp\n\tyLNA==","X-Gm-Message-State":"AOJu0YynqKkwhFR+8Zpk4f3Vk6JSaVHMw9bjYmXTqiDRHlGOV4cCQqze\n\t46d5ZYmmwPYWyV+H0oqXYsIQbfTwjqsYVlrmbXyl0YzPh2pQDgxNms0xoRKodKCxXFMC4AmqDd4\n\t=","X-Google-Smtp-Source":"AGHT+IHDqqE8uPioHbgeggKX8eCwKFk4GN6MkMjTJUJOB4r+yH8oAGUKP6+/LlZiFuambgEaw7j06A==","X-Received":"by 2002:a05:6a00:17a9:b0:71e:21:d2d8 with SMTP id\n\td2e1a72fcca58-71ea314b973mr2552732b3a.7.1729238389468; \n\tFri, 18 Oct 2024 00:59:49 -0700 (PDT)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHan-Lin Chen ","Subject":"[PATCH 1/4] libcamera: Add signal disconnected for IPC","Date":"Fri, 18 Oct 2024 07:57:34 +0000","Message-ID":"<20241018075942.1150378-2-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.47.0.rc1.288.g06298d1525-goog","In-Reply-To":"<20241018075942.1150378-1-chenghaoyang@chromium.org>","References":"<20241018075942.1150378-1-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This CL also adds an API in Camera::Private to trigger\nCamera::disconnected signal.\n\nSigned-off-by: Harvey Yang \nCo-developed-by: Han-Lin Chen \nSigned-off-by: Han-Lin Chen \n---\n include/libcamera/internal/camera.h | 2 ++\n .../libcamera/internal/ipc_pipe_unixsocket.h | 2 ++\n include/libcamera/internal/ipc_unixsocket.h | 2 ++\n src/libcamera/camera.cpp | 10 ++++++++\n src/libcamera/ipc_pipe_unixsocket.cpp | 8 +++++++\n src/libcamera/ipc_unixsocket.cpp | 24 +++++++++++++++++--\n .../module_ipa_proxy.cpp.tmpl | 8 +++++++\n .../module_ipa_proxy.h.tmpl | 2 ++\n 8 files changed, 56 insertions(+), 2 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nindex 0add0428b..0bef0980e 100644\n--- a/include/libcamera/internal/camera.h\n+++ b/include/libcamera/internal/camera.h\n@@ -33,6 +33,8 @@ public:\n \n \tPipelineHandler *pipe() { return pipe_.get(); }\n \n+\tvoid notifyDisconnection();\n+\n \tstd::list queuedRequests_;\n \tControlInfoMap controlInfo_;\n \tControlList properties_;\ndiff --git a/include/libcamera/internal/ipc_pipe_unixsocket.h b/include/libcamera/internal/ipc_pipe_unixsocket.h\nindex 8c972613f..09f65b102 100644\n--- a/include/libcamera/internal/ipc_pipe_unixsocket.h\n+++ b/include/libcamera/internal/ipc_pipe_unixsocket.h\n@@ -28,6 +28,8 @@ public:\n \n \tint sendAsync(const IPCMessage &data) override;\n \n+\tSignal<> *disconnected();\n+\n private:\n \tstruct CallData {\n \t\tIPCUnixSocket::Payload *response;\ndiff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h\nindex 48bb7a942..a1e326b6b 100644\n--- a/include/libcamera/internal/ipc_unixsocket.h\n+++ b/include/libcamera/internal/ipc_unixsocket.h\n@@ -39,6 +39,8 @@ public:\n \n \tSignal<> readyRead;\n \n+\tSignal<> disconnected;\n+\n private:\n \tstruct Header {\n \t\tuint32_t data;\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex a86f552a4..ef5a6725f 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -603,6 +603,16 @@ Camera::Private::~Private()\n * \\return The pipeline handler that created this camera\n */\n \n+/**\n+ * \\brief Notify the application that camera is disconnected with signal\n+ * Camera::disconnected\n+ */\n+void Camera::Private::notifyDisconnection()\n+{\n+\tCamera *o = LIBCAMERA_O_PTR();\n+\to->disconnected.emit();\n+}\n+\n /**\n * \\fn Camera::Private::validator()\n * \\brief Retrieve the control validator related to this camera\ndiff --git a/src/libcamera/ipc_pipe_unixsocket.cpp b/src/libcamera/ipc_pipe_unixsocket.cpp\nindex 668ec73b9..51fd3b1fb 100644\n--- a/src/libcamera/ipc_pipe_unixsocket.cpp\n+++ b/src/libcamera/ipc_pipe_unixsocket.cpp\n@@ -84,6 +84,14 @@ int IPCPipeUnixSocket::sendAsync(const IPCMessage &data)\n \treturn 0;\n }\n \n+Signal<> *IPCPipeUnixSocket::disconnected()\n+{\n+\tif (socket_)\n+\t\treturn &socket_->disconnected;\n+\n+\treturn nullptr;\n+}\n+\n void IPCPipeUnixSocket::readyRead()\n {\n \tIPCUnixSocket::Payload payload;\ndiff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp\nindex 002053e35..3d0248857 100644\n--- a/src/libcamera/ipc_unixsocket.cpp\n+++ b/src/libcamera/ipc_unixsocket.cpp\n@@ -186,11 +186,16 @@ int IPCUnixSocket::send(const Payload &payload)\n \tif (!hdr.data && !hdr.fds)\n \t\treturn -EINVAL;\n \n-\tret = ::send(fd_.get(), &hdr, sizeof(hdr), 0);\n+\tret = ::send(fd_.get(), &hdr, sizeof(hdr), MSG_NOSIGNAL);\n \tif (ret < 0) {\n \t\tret = -errno;\n \t\tLOG(IPCUnixSocket, Error)\n \t\t\t<< \"Failed to send: \" << strerror(-ret);\n+\t\tif (errno == ECONNRESET) {\n+\t\t\tdisconnected.emit();\n+\t\t\tfd_.reset();\n+\t\t}\n+\n \t\treturn ret;\n \t}\n \n@@ -241,6 +246,11 @@ int IPCUnixSocket::receive(Payload *payload)\n * \\brief A Signal emitted when a message is ready to be read\n */\n \n+/**\n+ * \\var IPCUnixSocket::disconnected\n+ * \\brief A Signal emitted when the Unix socket IPC is disconnected\n+ */\n+\n int IPCUnixSocket::sendData(const void *buffer, size_t length,\n \t\t\t const int32_t *fds, unsigned int num)\n {\n@@ -266,10 +276,15 @@ int IPCUnixSocket::sendData(const void *buffer, size_t length,\n \tif (fds)\n \t\tmemcpy(CMSG_DATA(cmsg), fds, num * sizeof(uint32_t));\n \n-\tif (sendmsg(fd_.get(), &msg, 0) < 0) {\n+\tif (sendmsg(fd_.get(), &msg, MSG_NOSIGNAL) < 0) {\n \t\tint ret = -errno;\n \t\tLOG(IPCUnixSocket, Error)\n \t\t\t<< \"Failed to sendmsg: \" << strerror(-ret);\n+\t\tif (errno == ECONNRESET) {\n+\t\t\tdisconnected.emit();\n+\t\t\tfd_.reset();\n+\t\t}\n+\n \t\treturn ret;\n \t}\n \n@@ -324,6 +339,11 @@ void IPCUnixSocket::dataNotifier()\n \t\t\tret = -errno;\n \t\t\tLOG(IPCUnixSocket, Error)\n \t\t\t\t<< \"Failed to receive header: \" << strerror(-ret);\n+\t\t\tif (errno == ECONNRESET) {\n+\t\t\t\tdisconnected.emit();\n+\t\t\t\tfd_.reset();\n+\t\t\t}\n+\n \t\t\treturn;\n \t\t}\n \ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\nindex ce3cc5ab6..27f03417a 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\n@@ -104,6 +104,14 @@ namespace {{ns}} {\n \t}\n }\n \n+Signal<> *{{proxy_name}}::disconnected()\n+{\n+\tif (ipc_)\n+\t\treturn ipc_->disconnected();\n+\n+\treturn nullptr;\n+}\n+\n {% if interface_event.methods|length > 0 %}\n void {{proxy_name}}::recvMessage(const IPCMessage &data)\n {\ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl\nindex e213b18a0..2b7ba872e 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl\n@@ -53,6 +53,8 @@ public:\n > {{method.mojom_name}};\n {% endfor %}\n \n+\tSignal<> *disconnected();\n+\n private:\n \tvoid recvMessage(const IPCMessage &data);\n \n","prefixes":["1/4"]}