{"id":14946,"url":"https://patchwork.libcamera.org/api/1.1/patches/14946/?format=json","web_url":"https://patchwork.libcamera.org/patch/14946/","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":"<20211201075348.3121186-7-hiroh@chromium.org>","date":"2021-12-01T07:53:42","name":"[libcamera-devel,v5,06/12] libcamera: Correct include headers for Mutex classes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2fd59d2bb224dd6abbf952731ef38b70c63cc683","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/14946/mbox/","series":[{"id":2791,"url":"https://patchwork.libcamera.org/api/1.1/series/2791/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2791","date":"2021-12-01T07:53:36","name":"Introduce clang thread safety annotations","version":5,"mbox":"https://patchwork.libcamera.org/series/2791/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14946/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14946/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 E298FBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  1 Dec 2021 07:54:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D19160720;\n\tWed,  1 Dec 2021 08:54:08 +0100 (CET)","from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com\n\t[IPv6:2607:f8b0:4864:20::1032])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ED66360710\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  1 Dec 2021 08:54:06 +0100 (CET)","by mail-pj1-x1032.google.com with SMTP id v23so17312724pjr.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 23:54:06 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:3892:a049:59ba:c772])\n\tby smtp.gmail.com with ESMTPSA id\n\tl9sm3500848pfu.55.2021.11.30.23.54.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 23:54:04 -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=\"CJ8CHRed\"; 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=1BXuhHBtpeQuWZSbzzWWhH2MYUJgctAU4AJvuOG+YC4=;\n\tb=CJ8CHRedDaV2d4lqnEU09wqjl9vA2hOcPNTak46H39dCUEqzmM3cdGcqfNyGydAow9\n\t8ScIYQU/L2NIIzrkCAlwIqH3k78C8qwKfkLw491B22S0drq/UfE5PEJeY4u6+hotYmDC\n\toFMChaVqU7saUcP+NZpd+brqkpoJNDuZaEB0Q=","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=1BXuhHBtpeQuWZSbzzWWhH2MYUJgctAU4AJvuOG+YC4=;\n\tb=oBokvXppJmvYpdJiqtfRlvkOPMP+vHjfV1fWOO/hbX6XINUP1Tweb8ZNHI7E0FB9la\n\tmAg2/D2zGai0T5renJxD6PNh8mdSVNQvkXdulLpLS4JidZmK543mzr5wrhrs48owwpI0\n\ttQEa/dy6o375lNgUeAqcN1/ss5snqmHQsYewSlODlT42r2YIEp4Qhbmv9wZJ2+iXu9fr\n\tTDlHc0bcPSsAEnt0COMA2/aDLq2fr/nZ8DqF1W+L67+34BNz94kMufzkGb4O635hPtPz\n\t3ox0BIPerqs3969OBcQL6cyTH7v53wiT9YQFueWbqpOAzO4nqlYneqvax4TjH8KEwIZJ\n\tSmsQ==","X-Gm-Message-State":"AOAM531njAJwIh6TSktQMw5IuBjqWF/CjESFRrhhJ0EOrql6rhhEnRiJ\n\teWGdpv5Jla3j/KmPRyV5/gciMeLFoCNV8g==","X-Google-Smtp-Source":"ABdhPJwV4KjCDtJvfhLbROvoMCSun3nECcZgwg8yHTzI54xm/bSVMaELgU/xZ6110P5HOJj+6zBqtw==","X-Received":"by 2002:a17:902:b78b:b0:143:baac:2ebc with SMTP id\n\te11-20020a170902b78b00b00143baac2ebcmr5446807pls.77.1638345244841; \n\tTue, 30 Nov 2021 23:54:04 -0800 (PST)","From":"Hirokazu Honda <hiroh@chromium.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Wed,  1 Dec 2021 16:53:42 +0900","Message-Id":"<20211201075348.3121186-7-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211201075348.3121186-1-hiroh@chromium.org>","References":"<20211201075348.3121186-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/base/semaphore.h | 3 ++-\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      | 2 +-\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, 10 insertions(+), 9 deletions(-)","diff":"diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h\nindex ec05fad3..c11e8dd1 100644\n--- a/include/libcamera/base/semaphore.h\n+++ b/include/libcamera/base/semaphore.h\n@@ -8,7 +8,8 @@\n #pragma once\n \n #include <libcamera/base/private.h>\n-#include <libcamera/base/thread.h>\n+\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..9df45d07 100644\n--- a/src/libcamera/base/signal.cpp\n+++ b/src/libcamera/base/signal.cpp\n@@ -7,7 +7,7 @@\n \n #include <libcamera/base/signal.h>\n \n-#include <libcamera/base/thread.h>\n+#include <libcamera/base/mutex.h>\n \n /**\n  * \\file base/signal.h\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","v5","06/12"]}