Patch Detail
Show a patch.
GET /api/1.1/patches/21668/?format=api
{ "id": 21668, "url": "https://patchwork.libcamera.org/api/1.1/patches/21668/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21668/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "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-4-chenghaoyang@chromium.org>", "date": "2024-10-18T07:57:36", "name": "[3/4] libcamera: Detect IPC disconnection with poll", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "fa8f4eb61ed6b7d7d3921230c6cba35b6b0c7131", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21668/mbox/", "series": [ { "id": 4715, "url": "https://patchwork.libcamera.org/api/1.1/series/4715/?format=api", "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/21668/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21668/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 BC5ACC32FC\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 18 Oct 2024 08:00:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D29D065395;\n\tFri, 18 Oct 2024 09:59:59 +0200 (CEST)", "from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com\n\t[IPv6:2607:f8b0:4864:20::42c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EB5636538B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 18 Oct 2024 09:59:54 +0200 (CEST)", "by mail-pf1-x42c.google.com with SMTP id\n\td2e1a72fcca58-71e5a1c9071so1404981b3a.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 18 Oct 2024 00:59:54 -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.51\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 18 Oct 2024 00:59:52 -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=\"me2Y4Pmw\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1729238393; x=1729843193;\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=yci7oVr/bgnEF/hXg58IG8sMXvpOTd+bGIWcstS8MbU=;\n\tb=me2Y4PmwK2YKI7GZzzvIcPrXzqOImo+7jTBr3xNb7izRyp4hIrf+hw1UFgJ6USHBoz\n\tnpak9GIM5M/FMPBlIfCN6zl73pN9tGoJUDy3vPe5Z7FjnLOuCxKekT1Lr4NgyoPRIL6A\n\t9J5n9WnusUdTRurZEipxB/wPsGkXPGSc26xcg=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1729238393; x=1729843193;\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=yci7oVr/bgnEF/hXg58IG8sMXvpOTd+bGIWcstS8MbU=;\n\tb=aJvVf8J5/DicbXydpo6alD+ejDMgPFo2tr8I+oIMN3Bf3p4Ldh0zIB7paX82TWyrF2\n\txHYbJOpW6ircxMzVR3cUs2p4ZheOITc0VXYtD8aBXuaFmFTPk5v/q1Px9HhliuXYN+OK\n\tX64fSrdHiDFjhNIQe9eTPiLxyuwHbeH22cN78hQiDxvT1mzrgvxBhIoMhSuZeWgLf9cQ\n\tlf1niy0FkAy/6WP7EgEXHWXQMssaL+OeeuLXnbkE5HXwKV0kEG9x3wwUdrsM0FPvp6CD\n\tNjfxOXDtgM6iokaOQMr+90YguzYJDVT18xw7i2TFQoNfGr51sEH2LCq8NIsp0oDzzjlx\n\tBP3Q==", "X-Gm-Message-State": "AOJu0YzDyK1OBXAoRqGH4p2CGAshaginAHwdU6KcEPu+ZtoHAomrPUKr\n\toJmXhsxNQWovErerajjKFMYJ6/8oXObXlIsA0SrEbjxHt9AN9lqBXEgj0qIbZ4APLaK6tFHru5c\n\t=", "X-Google-Smtp-Source": "AGHT+IGvoLanVK8O8Qe7p6il9oCWUUvslUlkoHNJzXqF3qbhoNoId7vjvz1uPdAKJkxm2uujl/Rrcw==", "X-Received": "by 2002:a05:6a00:896:b0:71e:7174:3ae with SMTP id\n\td2e1a72fcca58-71ea320dfa0mr2290324b3a.11.1729238393114; \n\tFri, 18 Oct 2024 00:59:53 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@chromium.org>,\n\tYudhistira Erlandinata <yerlandinata@chromium.org>", "Subject": "[PATCH 3/4] libcamera: Detect IPC disconnection with poll", "Date": "Fri, 18 Oct 2024 07:57:36 +0000", "Message-ID": "<20241018075942.1150378-4-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Previously an IPC disconnection will only be detected when there's an\nIPC message. This CL fixes the issue with poll event: POLLHUP.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\nCo-developed-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\nSigned-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\n---\n include/libcamera/base/event_notifier.h | 1 +\n include/libcamera/internal/ipc_unixsocket.h | 1 +\n src/libcamera/base/event_dispatcher_poll.cpp | 9 +++++++++\n src/libcamera/base/event_notifier.cpp | 5 +++++\n src/libcamera/ipc_unixsocket.cpp | 8 ++++++++\n 5 files changed, 24 insertions(+)", "diff": "diff --git a/include/libcamera/base/event_notifier.h b/include/libcamera/base/event_notifier.h\nindex 158f2d44b..9ddc1824f 100644\n--- a/include/libcamera/base/event_notifier.h\n+++ b/include/libcamera/base/event_notifier.h\n@@ -35,6 +35,7 @@ public:\n \tvoid setEnabled(bool enable);\n \n \tSignal<> activated;\n+\tSignal<> disconnected;\n \n protected:\n \tvoid message(Message *msg) override;\ndiff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h\nindex a1e326b6b..535be6fbf 100644\n--- a/include/libcamera/internal/ipc_unixsocket.h\n+++ b/include/libcamera/internal/ipc_unixsocket.h\n@@ -51,6 +51,7 @@ private:\n \tint recvData(void *buffer, size_t length, int32_t *fds, unsigned int num);\n \n \tvoid dataNotifier();\n+\tvoid EventNotifierDisconnected();\n \n \tUniqueFD fd_;\n \tbool headerReceived_;\ndiff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp\nindex 52bfb34e2..fdfeeff06 100644\n--- a/src/libcamera/base/event_dispatcher_poll.cpp\n+++ b/src/libcamera/base/event_dispatcher_poll.cpp\n@@ -263,6 +263,15 @@ void EventDispatcherPoll::processNotifiers(const std::vector<struct pollfd> &pol\n \t\t\tif (!notifier)\n \t\t\t\tcontinue;\n \n+\t\t\tif (pfd.revents & POLLHUP) {\n+\t\t\t\tLOG(Event, Debug) << \"Got signal POLLHUP.\"\n+\t\t\t\t\t\t << \" Disconnecting IPC\";\n+\n+\t\t\t\tnotifier->disconnected.emit();\n+\t\t\t\tunregisterEventNotifier(notifier);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n \t\t\t/*\n \t\t\t * If the file descriptor is invalid, disable the\n \t\t\t * notifier immediately.\ndiff --git a/src/libcamera/base/event_notifier.cpp b/src/libcamera/base/event_notifier.cpp\nindex 495c281d9..a5a583ac6 100644\n--- a/src/libcamera/base/event_notifier.cpp\n+++ b/src/libcamera/base/event_notifier.cpp\n@@ -131,6 +131,11 @@ void EventNotifier::setEnabled(bool enable)\n * parameter.\n */\n \n+/**\n+ * \\var EventNotifier::disconnected\n+ * \\brief Signal emitted when the file descriptor is disconnected\n+ */\n+\n void EventNotifier::message(Message *msg)\n {\n \tif (msg->type() == Message::ThreadMoveMessage) {\ndiff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp\nindex 3d0248857..609549b6f 100644\n--- a/src/libcamera/ipc_unixsocket.cpp\n+++ b/src/libcamera/ipc_unixsocket.cpp\n@@ -133,9 +133,17 @@ int IPCUnixSocket::bind(UniqueFD fd)\n \tnotifier_ = new EventNotifier(fd_.get(), EventNotifier::Read);\n \tnotifier_->activated.connect(this, &IPCUnixSocket::dataNotifier);\n \n+\tnotifier_->disconnected.connect(\n+\t\tthis, &IPCUnixSocket::EventNotifierDisconnected);\n+\n \treturn 0;\n }\n \n+void IPCUnixSocket::EventNotifierDisconnected()\n+{\n+\tdisconnected.emit();\n+}\n+\n /**\n * \\brief Close the IPC channel\n *\n", "prefixes": [ "3/4" ] }