Patch Detail
Show a patch.
GET /api/1.1/patches/21627/?format=api
{ "id": 21627, "url": "https://patchwork.libcamera.org/api/1.1/patches/21627/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21627/", "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": "<20241015065533.356466-2-chenghaoyang@chromium.org>", "date": "2024-10-15T06:54:36", "name": "[v4,1/1] libcamera: add method to set thread affinity", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "da3e9b6a446ae1bec61108c0969b821898ca57ea", "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/21627/mbox/", "series": [ { "id": 4699, "url": "https://patchwork.libcamera.org/api/1.1/series/4699/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4699", "date": "2024-10-15T06:54:35", "name": "Add thread affinity", "version": 4, "mbox": "https://patchwork.libcamera.org/series/4699/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21627/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21627/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 02466C0F2A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 15 Oct 2024 06:55:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4505A65385;\n\tTue, 15 Oct 2024 08:55:46 +0200 (CEST)", "from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com\n\t[IPv6:2607:f8b0:4864:20::102c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 28AFD6537D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 15 Oct 2024 08:55:42 +0200 (CEST)", "by mail-pj1-x102c.google.com with SMTP id\n\t98e67ed59e1d1-2e2e88cb0bbso2701082a91.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 14 Oct 2024 23:55:42 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(199.211.81.34.bc.googleusercontent.com. [34.81.211.199])\n\tby smtp.gmail.com with ESMTPSA id\n\t98e67ed59e1d1-2e392f75624sm790215a91.53.2024.10.14.23.55.38\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 14 Oct 2024 23:55:39 -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=\"Ewikc5uK\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1728975340; x=1729580140;\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=jcQ/uYmurIcrmbh97DA61AFT7ZM0z5RxJmrf5o+Rlhk=;\n\tb=Ewikc5uKXU4lR/E89a4oNbgkp+ezd3J17eIwGthdLJPZzOS/onObbRXCbTqvynUUbK\n\t+LPhO/GzDT2+uSG01+XOkPaknWUvFmyJb9OKg/0nNvY7D5q2xWh4w5OTDpU3sIXKde/P\n\t38DtJ2+bSK2W19MvDcTgfUBsL+LoCi5/vZxhg=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1728975340; x=1729580140;\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=jcQ/uYmurIcrmbh97DA61AFT7ZM0z5RxJmrf5o+Rlhk=;\n\tb=VK3/XD4Yo+TNWROIK3rPQS6tuCzgpuN0OsjjcH9dBLVheOBtI5gT5q8OsqIssEAJY9\n\tSrpSHf+IxUcNdF8hmljwFBpTBso3F5FxYD/3KUtq4FqfSxdJmLYnnbf3C1O+jkjPVhas\n\tlQGjTrd9phphayzkJZlRILvMtqbGwGaC4Veyh+b4akQprd1vUKjRdJ0hVbQnH2ob7dnj\n\tBU3Qb1TcfFem+1RVDdEU2d6MxAhznoLCqqMB43RrJR3PtwNL5k0VFHDJKc8UHygkSOJL\n\tVAWr9aPRBUaep0lr9CIyy5hi3F7LnvYIPByq/YS9sVlJTv88FWgfMZZ7SlMAHISGySV9\n\tUIfA==", "X-Gm-Message-State": "AOJu0YwlHrgCYQMJYJH4X+zBgrHcCJPgMa32QNo1LUhl976gMNkkAzOl\n\tZG4oXJZF3DQZL3364376Arz7/8GshW4L98UQFWsaDTpu2mRhBlyjSmrzO7WnI57qqyp4Qi4X8Pc\n\t=", "X-Google-Smtp-Source": "AGHT+IFcuIALwMYQ65nz7LW67kaIA5SoM6f1V4CFoqhilM5qxxz9oWo29o3BjTCVzpQMcZvgsHvHrw==", "X-Received": "by 2002:a17:90a:6886:b0:2e2:d16e:8769 with SMTP id\n\t98e67ed59e1d1-2e2f0aa8914mr16648865a91.15.1728975339945; \n\tMon, 14 Oct 2024 23:55:39 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Han-Lin Chen <hanlinchen@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v4 1/1] libcamera: add method to set thread affinity", "Date": "Tue, 15 Oct 2024 06:54:36 +0000", "Message-ID": "<20241015065533.356466-2-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.rc1.288.g06298d1525-goog", "In-Reply-To": "<20241015065533.356466-1-chenghaoyang@chromium.org>", "References": "<20241015065533.356466-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": "From: Han-Lin Chen <hanlinchen@chromium.org>\n\nAdd method to set thread affinity to Thread class.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n include/libcamera/base/thread.h | 5 ++++\n src/libcamera/base/thread.cpp | 53 +++++++++++++++++++++++++++++++++\n 2 files changed, 58 insertions(+)", "diff": "diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\nindex 4f33de63d..58cae341b 100644\n--- a/include/libcamera/base/thread.h\n+++ b/include/libcamera/base/thread.h\n@@ -15,6 +15,7 @@\n \n #include <libcamera/base/message.h>\n #include <libcamera/base/signal.h>\n+#include <libcamera/base/span.h>\n #include <libcamera/base/utils.h>\n \n namespace libcamera {\n@@ -35,6 +36,8 @@ public:\n \tvoid exit(int code = 0);\n \tbool wait(utils::duration duration = utils::duration::max());\n \n+\tvoid setThreadAffinity(const Span<const unsigned int> &cpus);\n+\n \tbool isRunning();\n \n \tSignal<> finished;\n@@ -54,6 +57,8 @@ private:\n \tvoid startThread();\n \tvoid finishThread();\n \n+\tvoid setThreadAffinityInternal();\n+\n \tvoid postMessage(std::unique_ptr<Message> msg, Object *receiver);\n \tvoid removeMessages(Object *receiver);\n \ndiff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\nindex 8735670b8..5491e3f90 100644\n--- a/src/libcamera/base/thread.cpp\n+++ b/src/libcamera/base/thread.cpp\n@@ -9,6 +9,7 @@\n \n #include <atomic>\n #include <list>\n+#include <optional>\n #include <sys/syscall.h>\n #include <sys/types.h>\n #include <unistd.h>\n@@ -128,6 +129,8 @@ private:\n \tint exitCode_;\n \n \tMessageQueue messages_;\n+\n+\tstd::optional<cpu_set_t> cpuset_ = std::nullopt;\n };\n \n /**\n@@ -254,6 +257,8 @@ void Thread::start()\n \tdata_->exit_.store(false, std::memory_order_relaxed);\n \n \tthread_ = std::thread(&Thread::startThread, this);\n+\n+\tsetThreadAffinityInternal();\n }\n \n void Thread::startThread()\n@@ -410,6 +415,54 @@ bool Thread::wait(utils::duration duration)\n \treturn hasFinished;\n }\n \n+/**\n+ * \\brief Set the CPU affinity mask of the thread\n+ * \\param[in] cpus The list of CPU indices that the thread is set affinity to\n+ *\n+ * The cpu indices should be within [0, std::thread::hardware_concurrency()),\n+ * and the total number should not exceed `CPU_SETSIZE`. Invalid indices and\n+ * extra indices will be ignored.\n+ */\n+void Thread::setThreadAffinity(const Span<const unsigned int> &cpus)\n+{\n+\tconst unsigned int numCpus = std::thread::hardware_concurrency();\n+\n+\tMutexLocker locker(data_->mutex_);\n+\tdata_->cpuset_ = cpu_set_t();\n+\tCPU_ZERO(&data_->cpuset_.value());\n+\n+\tunsigned int count = 0;\n+\tfor (const unsigned int &cpu : cpus) {\n+\t\tif (count == CPU_SETSIZE) {\n+\t\t\tLOG(Thread, Error) << \"cpus_ already contains \" << CPU_SETSIZE\n+\t\t\t\t\t << \" cpus. Ignoring the rest.\";\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (cpu >= numCpus) {\n+\t\t\tLOG(Thread, Error) << \"Ignore an invalid cpu index: \" << cpu;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t++count;\n+\t\tCPU_SET(cpu, &data_->cpuset_.value());\n+\t}\n+\n+\tif (data_->running_)\n+\t\tsetThreadAffinityInternal();\n+}\n+\n+void Thread::setThreadAffinityInternal()\n+{\n+\tif (!data_->cpuset_)\n+\t\treturn;\n+\n+\tauto handle = thread_.native_handle();\n+\n+\tpthread_setaffinity_np(handle, sizeof(data_->cpuset_.value()),\n+\t\t\t &data_->cpuset_.value());\n+}\n+\n /**\n * \\brief Check if the thread is running\n *\n", "prefixes": [ "v4", "1/1" ] }