From patchwork Sat May 11 09:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1193 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 18EDF60E7A for ; Sat, 11 May 2019 11:19:57 +0200 (CEST) X-Halon-ID: f0bd0a02-73cd-11e9-8e2f-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [185.224.57.161]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id f0bd0a02-73cd-11e9-8e2f-005056917f90; Sat, 11 May 2019 11:19:56 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 11 May 2019 11:19:04 +0200 Message-Id: <20190511091907.10050-9-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190511091907.10050-1-niklas.soderlund@ragnatech.se> References: <20190511091907.10050-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 08/11] libcamera: media_device: Add functions to lock device for other processes X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2019 09:19:57 -0000 Add lock() and unlock() which are backed by lockf() and allows an instance of libcamera to claim exclusive access to a media device. These functions are the base of allowing multiple user of libcamera to coexist in the system without stepping on each others toes. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/include/media_device.h | 4 ++ src/libcamera/media_device.cpp | 58 +++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h index e513a2fee1b91a1b..7b88e2875d59dfc3 100644 --- a/src/libcamera/include/media_device.h +++ b/src/libcamera/include/media_device.h @@ -30,6 +30,9 @@ public: void release(); bool busy() const { return acquired_; } + bool lock(); + void unlock(); + int populate(); bool valid() const { return valid_; } @@ -58,6 +61,7 @@ private: int fd_; bool valid_; bool acquired_; + bool lockOwner_; int open(); void close(); diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 62c59e7e8fc0299f..874ecc06e4bd9c94 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -63,7 +63,8 @@ LOG_DEFINE_CATEGORY(MediaDevice) * populate() before the media graph can be queried. */ MediaDevice::MediaDevice(const std::string &deviceNode) - : deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false) + : deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false), + lockOwner_(false) { } @@ -118,6 +119,61 @@ void MediaDevice::release() acquired_ = false; } +/** + * \brief Lock the device for use by other instances of libcamera + * + * Multiple instances of libcamera might be running on the same system, at the + * same time. To allow the different instances to coexist, system resources in + * the form of media devices must be accessible for enumerating the cameras + * they provide at all times, while still allowing an instance to lock a + * resource while it prepares to actively use a camera from the resource. + * + * This method shall not be called from a pipeline handler implementation + * directly, as the base PipelineHandler implementation handles this on the + * behalf of the specified implementation. + * + * \return True if the device could be locked, false otherwise + * \sa unlock() + */ +bool MediaDevice::lock() +{ + if (fd_ == -1) + return false; + + /* Do not allow nested locking in the same libcamera instance. */ + if (lockOwner_) + return false; + + if (lockf(fd_, F_TLOCK, 0)) + return false; + + lockOwner_ = true; + + return true; +} + +/** + * \brief Unlock the device and free it for use for libcamera instances + * + * This method shall not be called from a pipeline handler implementation + * directly, as the base PipelineHandler implementation handles this on the + * behalf of the specified implementation. + * + * \sa lock() + */ +void MediaDevice::unlock() +{ + if (fd_ == -1) + return; + + if (!lockOwner_) + return; + + lockOwner_ = false; + + lockf(fd_, F_ULOCK, 0); +} + /** * \fn MediaDevice::busy() * \brief Check if a device is in use