{"id":14903,"url":"https://patchwork.libcamera.org/api/1.1/patches/14903/?format=json","web_url":"https://patchwork.libcamera.org/patch/14903/","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":"<20211130155600.2203123-7-hiroh@chromium.org>","date":"2021-11-30T15:55:54","name":"[libcamera-devel,v3,06/12] libcamera: Correct include headers for Mutex classes","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4243673dd4a0cd5cfbad0d421840a4b290273a36","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14903/mbox/","series":[{"id":2785,"url":"https://patchwork.libcamera.org/api/1.1/series/2785/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2785","date":"2021-11-30T15:55:48","name":"Introduce clang thread safety annotations","version":3,"mbox":"https://patchwork.libcamera.org/series/2785/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14903/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14903/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 D53E0C324F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Nov 2021 15:56:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 70A6F60710;\n\tTue, 30 Nov 2021 16:56:24 +0100 (CET)","from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com\n\t[IPv6:2607:f8b0:4864:20::62c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 83DEF6071A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 16:56:19 +0100 (CET)","by mail-pl1-x62c.google.com with SMTP id v19so15253544plo.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 07:56:19 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:c90a:5a53:b139:1336])\n\tby smtp.gmail.com with ESMTPSA id\n\tpc10sm3510283pjb.9.2021.11.30.07.56.16\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 07:56:17 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"iGKJuh7E\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ax9Q5IE+2lzgN/6viRT9yW1Y2YQJjHoAjbGe2VAh9io=;\n\tb=iGKJuh7EUsxWv79EK/FERPm4p5aQ2CwTLxQn9hPLzjrUkxb7CFt1imWlEl1CYJ6P6g\n\t1icLEPXuUD5t32t1M+jZfj90K3ivgjeSN6O8LzeIniZFGF1DsFD68MkO9TcZDM0rATpC\n\tj8YQu7bfeAm9HN8RQDqwO/i1hepztMshbjNjI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=ax9Q5IE+2lzgN/6viRT9yW1Y2YQJjHoAjbGe2VAh9io=;\n\tb=A9zo3mcDgDvJ2URMuNNey6UKWV+E44yc3RjOEe5XhaVhQhL2tWBWSy2DyMHqo1mtHV\n\ttpwRbDgNxIHQ+NRLnwL2i2PiQPL9AlUPIIWlpUtbBUxAFn3E/KeE6bQXdfNHSqGGp2vZ\n\tfxUBTf8MuPTeUpPf9PhqwKEO33FG8EjxFOahKGrP5tBZZe6I1uk3T5OA6PUPpeTiU98T\n\ty1YTo1CxuV6u+/YLrC7PsgZU1k9EeLvjOvvJ3ZTMy3c+jWsH4uUF8xpj0Ge+hylIT4G3\n\t0wErZoPnWdIRg0BtGu5DGwNYxt68Bo/L7BMCFiOzCLif0zuu5kjOIELIAyTpB+CMi5a0\n\tYFrA==","X-Gm-Message-State":"AOAM530NXB/tQREI1ZOWt81E9vDs54LGUwldRThU16IRBfleb3ACRC66\n\tBFPdXoMXPAFVNU7owf3foJu1xiAaL/eBYQ==","X-Google-Smtp-Source":"ABdhPJyIuehuy+Z8VkjzabKQAiS6Ldd+RhpDnk4sYMDhr83e2tEMr+uVlfTPnIwcT82arIQm57LAxw==","X-Received":"by 2002:a17:902:7616:b0:143:a8cd:ef0 with SMTP id\n\tk22-20020a170902761600b00143a8cd0ef0mr259355pll.48.1638287777810; \n\tTue, 30 Nov 2021 07:56:17 -0800 (PST)","From":"Hirokazu Honda <hiroh@chromium.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Wed,  1 Dec 2021 00:55:54 +0900","Message-Id":"<20211130155600.2203123-7-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211130155600.2203123-1-hiroh@chromium.org>","References":"<20211130155600.2203123-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 06/12] libcamera: Correct include\n\theaders for Mutex classes","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":"Mutex classes are defined in mutex.h. This replaces thread.h\ninclude for the Mutex classes with mutex.h.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n include/libcamera/base/semaphore.h | 2 +-\n include/libcamera/base/thread.h    | 1 -\n src/android/camera_device.cpp      | 1 -\n src/android/camera_device.h        | 2 +-\n src/android/camera_hal_manager.h   | 2 +-\n src/android/camera_request.h       | 2 +-\n src/android/camera_stream.h        | 1 +\n src/libcamera/base/semaphore.cpp   | 1 -\n src/libcamera/base/signal.cpp      | 3 +--\n src/libcamera/base/thread.cpp      | 1 +\n src/libcamera/camera_manager.cpp   | 1 +\n src/v4l2/v4l2_camera.h             | 2 +-\n 12 files changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h\nindex ec05fad3..271d5427 100644\n--- a/include/libcamera/base/semaphore.h\n+++ b/include/libcamera/base/semaphore.h\n@@ -8,7 +8,7 @@\n #pragma once\n \n #include <libcamera/base/private.h>\n-#include <libcamera/base/thread.h>\n+#include <libcamera/base/mutex.h>\n \n namespace libcamera {\n \ndiff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\nindex 44678c34..9d00f102 100644\n--- a/include/libcamera/base/thread.h\n+++ b/include/libcamera/base/thread.h\n@@ -14,7 +14,6 @@\n #include <libcamera/base/private.h>\n \n #include <libcamera/base/message.h>\n-#include <libcamera/base/mutex.h>\n #include <libcamera/base/signal.h>\n #include <libcamera/base/utils.h>\n \ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f2e0bdbd..d74307a2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -14,7 +14,6 @@\n #include <vector>\n \n #include <libcamera/base/log.h>\n-#include <libcamera/base/thread.h>\n #include <libcamera/base/utils.h>\n \n #include <libcamera/control_ids.h>\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex bda0b376..a945f5de 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -17,7 +17,7 @@\n #include <libcamera/base/class.h>\n #include <libcamera/base/log.h>\n #include <libcamera/base/message.h>\n-#include <libcamera/base/thread.h>\n+#include <libcamera/base/mutex.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/framebuffer.h>\ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex cc310f90..765701b2 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -17,7 +17,7 @@\n #include <system/camera_metadata.h>\n \n #include <libcamera/base/class.h>\n-#include <libcamera/base/thread.h>\n+#include <libcamera/base/mutex.h>\n \n #include <libcamera/camera_manager.h>\n \ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 88d501a8..887dbe86 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -12,7 +12,7 @@\n #include <vector>\n \n #include <libcamera/base/class.h>\n-#include <libcamera/base/thread.h>\n+#include <libcamera/base/mutex.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/framebuffer.h>\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex adb5a37d..e4eb953a 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -13,6 +13,7 @@\n \n #include <hardware/camera3.h>\n \n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/thread.h>\n \n #include <libcamera/camera.h>\ndiff --git a/src/libcamera/base/semaphore.cpp b/src/libcamera/base/semaphore.cpp\nindex bf730c87..4fe30293 100644\n--- a/src/libcamera/base/semaphore.cpp\n+++ b/src/libcamera/base/semaphore.cpp\n@@ -6,7 +6,6 @@\n  */\n \n #include <libcamera/base/semaphore.h>\n-#include <libcamera/base/thread.h>\n \n /**\n  * \\file base/semaphore.h\ndiff --git a/src/libcamera/base/signal.cpp b/src/libcamera/base/signal.cpp\nindex 9c2319c5..2fd7e01d 100644\n--- a/src/libcamera/base/signal.cpp\n+++ b/src/libcamera/base/signal.cpp\n@@ -5,10 +5,9 @@\n  * signal.cpp - Signal & slot implementation\n  */\n \n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/signal.h>\n \n-#include <libcamera/base/thread.h>\n-\n /**\n  * \\file base/signal.h\n  * \\brief Signal & slot implementation\ndiff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\nindex b2043b7e..6bda9d14 100644\n--- a/src/libcamera/base/thread.cpp\n+++ b/src/libcamera/base/thread.cpp\n@@ -17,6 +17,7 @@\n #include <libcamera/base/event_dispatcher_poll.h>\n #include <libcamera/base/log.h>\n #include <libcamera/base/message.h>\n+#include <libcamera/base/mutex.h>\n \n /**\n  * \\page thread Thread Support\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 77ff3bd1..70d73822 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -12,6 +12,7 @@\n #include <libcamera/camera.h>\n \n #include <libcamera/base/log.h>\n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/thread.h>\n #include <libcamera/base/utils.h>\n \ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex bf1b6de4..9307d61d 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -10,8 +10,8 @@\n #include <deque>\n #include <utility>\n \n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/semaphore.h>\n-#include <libcamera/base/thread.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/file_descriptor.h>\n","prefixes":["libcamera-devel","v3","06/12"]}