From patchwork Sun Jul 12 14:44:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8745 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 87411BD792 for ; Sun, 12 Jul 2020 14:44:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D9FC36059B; Sun, 12 Jul 2020 16:44:47 +0200 (CEST) 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="OHUX6JQ6"; 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 9C17960553 for ; Sun, 12 Jul 2020 16:44:45 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 14B4F514 for ; Sun, 12 Jul 2020 16:44:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594565085; bh=THdfDQdrAo8snr4U/HP5Lz0tEW0rvScablw+oZ3uEXM=; h=From:To:Subject:Date:From; b=OHUX6JQ6twTddXYp4JNnlba5qTdgQ/hV+6tL1eGwgDTDKctTArFP5m4IGPJP6oiVT j6GPy36Fu/I7qalBaB1pv3HK0yVYLAXaRYJ9JjUr41mZCFl0jHZKZpJtCk4vj8G/UL X68QptRpVm+H7jv8eNnTgDV83bRWpxVBuErPDoNY= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 12 Jul 2020 17:44:16 +0300 Message-Id: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/4] libcamera: file: Add read/write support 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" Add basic support to read and write data from/to a file, along with retrieving and setting the current read/write position. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/internal/file.h | 7 ++ src/libcamera/file.cpp | 111 +++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h index e3e72132e336..ead94cdf29c9 100644 --- a/include/libcamera/internal/file.h +++ b/include/libcamera/internal/file.h @@ -49,6 +49,12 @@ public: int error() const { return error_; } ssize_t size() const; + off_t pos() const { return pos_; } + off_t seek(off_t pos); + + ssize_t read(const Span &data); + ssize_t write(const Span &data); + Span map(off_t offset = 0, ssize_t size = -1, MapFlag flags = MapNoOption); bool unmap(uint8_t *addr); @@ -61,6 +67,7 @@ private: std::string name_; int fd_; OpenMode mode_; + off_t pos_; int error_; std::map maps_; diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index c471bde3fc68..8bd109090919 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -73,7 +73,7 @@ LOG_DEFINE_CATEGORY(File); * before performing I/O operations. */ File::File(const std::string &name) - : name_(name), fd_(-1), mode_(NotOpen), error_(0) + : name_(name), fd_(-1), mode_(NotOpen), pos_(0), error_(0) { } @@ -84,7 +84,7 @@ File::File(const std::string &name) * setFileName(). */ File::File() - : fd_(-1), mode_(NotOpen), error_(0) + : fd_(-1), mode_(NotOpen), pos_(0), error_(0) { } @@ -202,6 +202,7 @@ void File::close() ::close(fd_); fd_ = -1; mode_ = NotOpen; + pos_ = 0; } /** @@ -237,6 +238,112 @@ ssize_t File::size() const return st.st_size; } +/** + * \fn off_t File::pos() const + * \brief Return current read or write position + * + * If the file is closed, this function returns 0. + * + * \return The current read or write position + */ + +/** + * \brief Set the read or write position + * \param[in] pos The desired position + * \return The resulting offset from the beginning of the file on success, or a + * negative error code otherwise + */ +off_t File::seek(off_t pos) +{ + if (!isOpen()) + return -EINVAL; + + off_t ret = lseek(fd_, pos, SEEK_SET); + if (ret < 0) + return -errno; + + pos_ = ret; + return ret; +} + +/** + * \brief Read data from the file + * \param[in] data Memory to read data into + * + * Read at most \a data.size() bytes from the file into \a data.data(), and + * return the number of bytes read. If less data than requested is available, + * the returned byte count may be smaller than the requested size. If no more + * data is available, 0 is returned. + * + * The position of the file as returned by pos() is advanced by the number of + * bytes read. If an error occurs, the position isn't modified. + * + * \return The number of bytes read on success, or a negative error code + * otherwise + */ +ssize_t File::read(const Span &data) +{ + if (!isOpen()) + return -EINVAL; + + size_t readBytes = 0; + ssize_t ret = 0; + + /* Retry in case of interrupted system calls. */ + while (readBytes < data.size()) { + ret = ::read(fd_, data.data() + readBytes, + data.size() - readBytes); + if (ret <= 0) + break; + + readBytes += ret; + } + + if (ret < 0 && !readBytes) + return -errno; + + pos_ += readBytes; + return readBytes; +} + +/** + * \brief Write data to the file + * \param[in] data Memory containing data to be written + * + * Write at most \a data.size() bytes from \a data.data() to the file, and + * return the number of bytes written. If the file system doesn't have enough + * space for the data, the returned byte count may be less than requested. + * + * The position of the file as returned by pos() is advanced by the number of + * bytes written. If an error occurs, the position isn't modified. + * + * \return The number of bytes written on success, or a negative error code + * otherwise + */ +ssize_t File::write(const Span &data) +{ + if (!isOpen()) + return -EINVAL; + + size_t writtenBytes = 0; + + /* Retry in case of interrupted system calls. */ + while (writtenBytes < data.size()) { + ssize_t ret = ::write(fd_, data.data() + writtenBytes, + data.size() - writtenBytes); + if (ret <= 0) + break; + + writtenBytes += ret; + } + + if (data.size() && !writtenBytes) + return -errno; + + pos_ += writtenBytes; + return writtenBytes; +} + /** * \brief Map a region of the file in the process memory * \param[in] offset The region offset within the file From patchwork Sun Jul 12 14:44:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8746 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 8137FBD792 for ; Sun, 12 Jul 2020 14:44:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 811CD60589; Sun, 12 Jul 2020 16:44:48 +0200 (CEST) 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="uytcLn6G"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E1F4960559 for ; Sun, 12 Jul 2020 16:44:45 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6636B9CC for ; Sun, 12 Jul 2020 16:44:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594565085; bh=7pvIDD3iJYGX9B31F62a+AXTUr7R/RkrFkc8hhBS5hs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=uytcLn6Gv0dNYhquyRqoCotk294UnLXTjPcZ9jZnOfH0/G1CmvrnKbCuy92cDEQlE N3QRP6K+iryf3Zc0+zI2rq/AlFKfvrGERnLtyVUQ9nKWainWH1xuLCgVS7LA0dA4/Q Qbx5Lvbwth5kmTQ8magcgK5tFaBSMeMjI1iO3c9M= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 12 Jul 2020 17:44:17 +0300 Message-Id: <20200712144419.21457-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> References: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/4] test: file: Add read/write tests 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" Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- test/file.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/test/file.cpp b/test/file.cpp index 287831f3ef37..7688a9dc224a 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -30,11 +30,9 @@ protected: if (fd == -1) return TestFail; - ssize_t ret = write(fd, "libcamera", 9); - close(fd); - return ret == 9 ? TestPass : TestFail; + return TestPass; } int run() @@ -191,7 +189,68 @@ protected: return TestFail; } + file.close(); + + /* Test read and write. */ + std::array buffer = { 0 }; + + strncpy(reinterpret_cast(buffer.data()), "libcamera", + buffer.size()); + + file.setFileName(fileName_); + + if (file.read(buffer) >= 0) { + cerr << "Read succeeded on closed file" << endl; + return TestFail; + } + + if (file.write(buffer) >= 0) { + cerr << "Write succeeded on closed file" << endl; + return TestFail; + } + + file.open(File::ReadOnly); + + if (file.write(buffer) >= 0) { + cerr << "Write succeeded on read-only file" << endl; + return TestFail; + } + + file.close(); + + file.open(File::ReadWrite); + + if (file.write({ buffer.data(), 9 }) != 9) { + cerr << "Write test failed" << endl; + return TestFail; + } + + if (file.read(buffer) != 0) { + cerr << "Read at end of file test failed" << endl; + return TestFail; + } + + if (file.seek(0) != 0) { + cerr << "Seek test failed" << endl; + return TestFail; + } + + if (file.read(buffer) != 9) { + cerr << "Read test failed" << endl; + return TestFail; + } + + if (file.pos() != 9) { + cerr << "Position test failed" << endl; + return TestFail; + } + + file.close(); + /* Test mapping and unmapping. */ + file.setFileName("/proc/self/exe"); + file.open(File::ReadOnly); + Span data = file.map(); if (data.empty()) { cerr << "Mapping of complete file failed" << endl; From patchwork Sun Jul 12 14:44:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8747 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 59602BD792 for ; Sun, 12 Jul 2020 14:44:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 473BB605A7; Sun, 12 Jul 2020 16:44:49 +0200 (CEST) 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="nsovdzhi"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2589660553 for ; Sun, 12 Jul 2020 16:44:46 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BA357DC4 for ; Sun, 12 Jul 2020 16:44:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594565085; bh=uxCB+MLhJuSW1VvUkO6kR84shuC0hnMrYGFKLYY23eg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nsovdzhiUtXtx+llrtJZ8zhjBQXSTpAquOFWy6lLgxLNBnAgcNkwDCu2eYZ53Fo4x XNIRCuk8A6CSQMD1nTrSfao3Bc4gamoWbgmULSNrbwDkY6xGssGoMrwMLiK2qRhaBr U4W7OC66p5clkH+9+7pfPPkRXxqEw1ghgj0IdgF8= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 12 Jul 2020 17:44:18 +0300 Message-Id: <20200712144419.21457-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> References: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/4] test: file: Add file creation test 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" Add a test to verify file creation with File::open(). The test is expected to fail as the File::open() implementation is not correct. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- test/file.cpp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/test/file.cpp b/test/file.cpp index 7688a9dc224a..f458f355ccad 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -31,6 +31,7 @@ protected: return TestFail; close(fd); + unlink(fileName_.c_str()); return TestPass; } @@ -191,14 +192,37 @@ protected: file.close(); + /* Test file creation. */ + file.setFileName(fileName_); + + if (file.exists()) { + cerr << "Temporary file already exists" << endl; + return TestFail; + } + + if (file.open(File::ReadOnly)) { + cerr << "Read-only open succeeded on nonexistent file" << endl; + return TestFail; + } + + if (!file.open(File::WriteOnly)) { + cerr << "Write-only open failed on nonexistent file" << endl; + return TestFail; + } + + if (!file.exists()) { + cerr << "Write-only open failed to create file" << endl; + return TestFail; + } + + file.close(); + /* Test read and write. */ std::array buffer = { 0 }; strncpy(reinterpret_cast(buffer.data()), "libcamera", buffer.size()); - file.setFileName(fileName_); - if (file.read(buffer) >= 0) { cerr << "Read succeeded on closed file" << endl; return TestFail; From patchwork Sun Jul 12 14:44:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8748 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 9293ABDB1C for ; Sun, 12 Jul 2020 14:44:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 00217605A9; Sun, 12 Jul 2020 16:44:49 +0200 (CEST) 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="m38qBXQT"; 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 76F2660553 for ; Sun, 12 Jul 2020 16:44:46 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 19162514 for ; Sun, 12 Jul 2020 16:44:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594565086; bh=P8w89z8xbNHDF349DY+fLiUMnmCNQQdr8/6RU2YdgfY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=m38qBXQTtW08hPA3IljWpZU242PdgVFOs+IC2UTactlbhEgHQykD//EJnk6DV3dAl H0oQQsltVBhi5NdjHGp7Cj+Fz2XKvqUL5MKAhCsWfBvnug7r+F90zp5xvF6OdG477s E/+wR658AEuh0I6088GezhGpRBTDYXZm3XCGnGu0= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 12 Jul 2020 17:44:19 +0300 Message-Id: <20200712144419.21457-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> References: <20200712144419.21457-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/4] libcamera: file: Create the file on open() if it doesn't exist 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" When a file is opened in WriteOnly or ReadWrite mode, create it if it doesn't exist. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/libcamera/file.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index 8bd109090919..77701666e438 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -148,8 +148,9 @@ bool File::exists() const * \param[in] mode The open mode * * This function opens the file specified by fileName() in \a mode. If the file - * doesn't exist and the mode is WriteOnly or ReadWrite, this - * function will attempt to create the file. + * doesn't exist and the mode is WriteOnly or ReadWrite, this function will + * attempt to create the file with initial permissions set to 0666 (modified by + * the process' umask). * * The error() status is updated. * @@ -163,8 +164,10 @@ bool File::open(File::OpenMode mode) } int flags = (mode & ReadWrite) - 1; + if (mode & WriteOnly) + flags |= O_CREAT; - fd_ = ::open(name_.c_str(), flags); + fd_ = ::open(name_.c_str(), flags, 0666); if (fd_ < 0) { error_ = -errno; return false;