From patchwork Thu Feb 11 13:34:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11238 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D1D9DBD162 for ; Thu, 11 Feb 2021 13:34:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3EF4F63741; Thu, 11 Feb 2021 14:34:50 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gcl9cqTP"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A662601B5 for ; Thu, 11 Feb 2021 14:34:48 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8658B41; Thu, 11 Feb 2021 14:34:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1613050487; bh=LDsk5ScTlYIKz58Lx6lR/4bb1u/xlbes2LN80r4htgA=; h=From:To:Cc:Subject:Date:From; b=gcl9cqTP89e4eorQZvXORvM0+L6giM3ksrZTT7mGCTE0kuVcTITvGEY1XqIzYRX1e 3im4mvGP+augj8SkvA+YbWYsgNXNbBfgQw21LQc+H+ClHO/pscTvMwyZuollw2nvf+ jdqZqUoY0zv3/kqa8kFIOZIf332WL61R5YbLrgsM= From: Kieran Bingham To: libcamera devel Date: Thu, 11 Feb 2021 13:34:38 +0000 Message-Id: <20210211133444.764808-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 0/6] Delete Copy-Move-Assign X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Here's a series which has been niggling me on my task list since the topic came up which highlighted that the non-copyability of the FrameBufferAllocator had been incorrectly implemented. We previously discussed providing a non-copyable class which could be inherited or the addition of a macro. I've chosen to go down the macro route, because I think its clearer, easier to customise, and doesn't extend the inheritance (and thus increase the size) of classes. Along the way, the following tasks have occured: - Classes which delete their copy constructor and copy assignment operator, have had those replaced by LIBCAMERA_DISABLE_COPY_AND_MOVE. Where the existing copy/assignment deletion occured in public:, the LIBCAMERA_DISABLE_COPY_AND_MOVE addition has been placed in private: so that Doxygen does not complain. (and it should have the same effect) - The Buffer class deletes all of the copy, and move constructor and assignment operators, so this has been kept. But as the only class which goes this far, it seems to stand out on its own. I have simply converted to the new usage, I didn't want to change any functionality here. - Media objects deleted only their copy construtor. I believe this to be an oversight, as if the copy constructor is deleted, then the copy assignment operator should also be deleted. Therefore I see this macro as a win here. - MappedBuffer : This did not delete it's copy constructor, and I believe it should have - so I've added it. I have not done a thorough search of the tree to find other instances that should also delete anything yet though. I'm sure that more classes could be tightened up with the addition of these restrictions where necessary, or perhaps other variants might crop up. I'm not sure yet, but this can get the ball rolling in that case. Since the first v1 posting of this series, DELETE_COPY_MOVE_AND_ASSIGN is renamed to LIBCAMERA_DISABLE_COPY_AND_MOVE (using disable instead of deleted), and 'assign' has been removed from the macro names. The extensible class was also merged during this time, so it is first renamed to be a generic class.h and these macros are added there. Kieran Bingham (6): libcamera: Move extensible to class libcamera: class: Provide move and copy disablers libcamera: buffer: Utilise DISABLE_COPY_AND_MOVE libcamera: media_object: Utilise LIBCAMERA_DISABLE_COPY libcamera: Utilise LIBCAMERA_DISABLE_COPY libcamera: MappedBuffer: Disable copy and assignment include/libcamera/buffer.h | 10 +++---- include/libcamera/camera.h | 8 ++--- include/libcamera/camera_manager.h | 6 ++-- include/libcamera/{extensible.h => class.h} | 20 ++++++++++--- include/libcamera/controls.h | 7 ++--- include/libcamera/framebuffer_allocator.h | 7 +++-- include/libcamera/internal/buffer.h | 4 +++ .../libcamera/internal/byte_stream_buffer.h | 4 +-- include/libcamera/internal/camera_sensor.h | 6 ++-- include/libcamera/internal/file.h | 6 ++-- include/libcamera/internal/log.h | 6 +++- include/libcamera/internal/media_object.h | 9 ++++-- include/libcamera/internal/pipeline_handler.h | 4 +-- include/libcamera/internal/v4l2_subdevice.h | 5 ++-- include/libcamera/internal/v4l2_videodevice.h | 6 ++-- include/libcamera/meson.build | 1 - include/libcamera/request.h | 5 ++-- src/libcamera/{extensible.cpp => class.cpp} | 29 ++++++++++++++++--- src/libcamera/meson.build | 2 +- 19 files changed, 94 insertions(+), 51 deletions(-) rename include/libcamera/{extensible.h => class.h} (71%) rename src/libcamera/{extensible.cpp => class.cpp} (85%)