From 5c85e7024027c90b1b054782e510691b8b9c7419 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 28 Nov 2021 05:45:34 +0200 Subject: libcamera: base: Rename FileDescriptor to SharedFD Now that we have a UniqueFD class, the name FileDescriptor is ambiguous. Rename it to SharedFD. Signed-off-by: Laurent Pinchart Reviewed-by: Hirokazu Honda Reviewed-by: Jacopo Mondi --- test/file-descriptor.cpp | 243 ------------------------ test/meson.build | 2 +- test/serialization/ipa_data_serializer_test.cpp | 14 +- test/shared-fd.cpp | 243 ++++++++++++++++++++++++ 4 files changed, 251 insertions(+), 251 deletions(-) delete mode 100644 test/file-descriptor.cpp create mode 100644 test/shared-fd.cpp (limited to 'test') diff --git a/test/file-descriptor.cpp b/test/file-descriptor.cpp deleted file mode 100644 index 76badc4c..00000000 --- a/test/file-descriptor.cpp +++ /dev/null @@ -1,243 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * file_descriptor.cpp - FileDescriptor test - */ - -#include -#include -#include -#include -#include - -#include -#include - -#include "test.h" - -using namespace libcamera; -using namespace std; - -class FileDescriptorTest : public Test -{ -protected: - int init() - { - desc1_ = nullptr; - desc2_ = nullptr; - - fd_ = open("/tmp", O_TMPFILE | O_RDWR, S_IRUSR | S_IWUSR); - if (fd_ < 0) - return TestFail; - - /* Cache inode number of temp file. */ - struct stat s; - if (fstat(fd_, &s)) - return TestFail; - - inodeNr_ = s.st_ino; - - return 0; - } - - int run() - { - /* Test creating empty FileDescriptor. */ - desc1_ = new FileDescriptor(); - - if (desc1_->fd() != -1) { - std::cout << "Failed fd numerical check (default constructor)" - << std::endl; - return TestFail; - } - - delete desc1_; - desc1_ = nullptr; - - /* - * Test creating FileDescriptor by copying numerical file - * descriptor. - */ - desc1_ = new FileDescriptor(fd_); - if (desc1_->fd() == fd_) { - std::cout << "Failed fd numerical check (lvalue ref constructor)" - << std::endl; - return TestFail; - } - - if (!isValidFd(fd_) || !isValidFd(desc1_->fd())) { - std::cout << "Failed fd validity after construction (lvalue ref constructor)" - << std::endl; - return TestFail; - } - - int fd = desc1_->fd(); - - delete desc1_; - desc1_ = nullptr; - - if (!isValidFd(fd_) || isValidFd(fd)) { - std::cout << "Failed fd validity after destruction (lvalue ref constructor)" - << std::endl; - return TestFail; - } - - /* - * Test creating FileDescriptor by taking ownership of - * numerical file descriptor. - */ - int dupFd = dup(fd_); - int dupFdCopy = dupFd; - - desc1_ = new FileDescriptor(std::move(dupFd)); - if (desc1_->fd() != dupFdCopy) { - std::cout << "Failed fd numerical check (rvalue ref constructor)" - << std::endl; - return TestFail; - } - - if (dupFd != -1 || !isValidFd(fd_) || !isValidFd(desc1_->fd())) { - std::cout << "Failed fd validity after construction (rvalue ref constructor)" - << std::endl; - return TestFail; - } - - fd = desc1_->fd(); - - delete desc1_; - desc1_ = nullptr; - - if (!isValidFd(fd_) || isValidFd(fd)) { - std::cout << "Failed fd validity after destruction (rvalue ref constructor)" - << std::endl; - return TestFail; - } - - /* Test creating FileDescriptor from other FileDescriptor. */ - desc1_ = new FileDescriptor(fd_); - desc2_ = new FileDescriptor(*desc1_); - - if (desc1_->fd() == fd_ || desc2_->fd() == fd_ || desc1_->fd() != desc2_->fd()) { - std::cout << "Failed fd numerical check (copy constructor)" - << std::endl; - return TestFail; - } - - if (!isValidFd(desc1_->fd()) || !isValidFd(desc2_->fd())) { - std::cout << "Failed fd validity after construction (copy constructor)" - << std::endl; - return TestFail; - } - - delete desc1_; - desc1_ = nullptr; - - if (!isValidFd(desc2_->fd())) { - std::cout << "Failed fd validity after destruction (copy constructor)" - << std::endl; - return TestFail; - } - - delete desc2_; - desc2_ = nullptr; - - /* Test creating FileDescriptor by taking over other FileDescriptor. */ - desc1_ = new FileDescriptor(fd_); - fd = desc1_->fd(); - desc2_ = new FileDescriptor(std::move(*desc1_)); - - if (desc1_->fd() != -1 || desc2_->fd() != fd) { - std::cout << "Failed fd numerical check (move constructor)" - << std::endl; - return TestFail; - } - - if (!isValidFd(desc2_->fd())) { - std::cout << "Failed fd validity after construction (move constructor)" - << std::endl; - return TestFail; - } - - delete desc1_; - desc1_ = nullptr; - delete desc2_; - desc2_ = nullptr; - - /* Test creating FileDescriptor by copy assignment. */ - desc1_ = new FileDescriptor(); - desc2_ = new FileDescriptor(fd_); - - fd = desc2_->fd(); - *desc1_ = *desc2_; - - if (desc1_->fd() != fd || desc2_->fd() != fd) { - std::cout << "Failed fd numerical check (copy assignment)" - << std::endl; - return TestFail; - } - - if (!isValidFd(desc1_->fd()) || !isValidFd(desc2_->fd())) { - std::cout << "Failed fd validity after construction (copy assignment)" - << std::endl; - return TestFail; - } - - delete desc1_; - desc1_ = nullptr; - delete desc2_; - desc2_ = nullptr; - - /* Test creating FileDescriptor by move assignment. */ - desc1_ = new FileDescriptor(); - desc2_ = new FileDescriptor(fd_); - - fd = desc2_->fd(); - *desc1_ = std::move(*desc2_); - - if (desc1_->fd() != fd || desc2_->fd() != -1) { - std::cout << "Failed fd numerical check (move assignment)" - << std::endl; - return TestFail; - } - - if (!isValidFd(desc1_->fd())) { - std::cout << "Failed fd validity after construction (move assignment)" - << std::endl; - return TestFail; - } - - delete desc1_; - desc1_ = nullptr; - delete desc2_; - desc2_ = nullptr; - - return TestPass; - } - - void cleanup() - { - delete desc2_; - delete desc1_; - - if (fd_ > 0) - close(fd_); - } - -private: - bool isValidFd(int fd) - { - struct stat s; - if (fstat(fd, &s)) - return false; - - /* Check that inode number matches cached temp file. */ - return s.st_ino == inodeNr_; - } - - int fd_; - ino_t inodeNr_; - FileDescriptor *desc1_, *desc2_; -}; - -TEST_REGISTER(FileDescriptorTest) diff --git a/test/meson.build b/test/meson.build index 42dfbc1f..daaa3862 100644 --- a/test/meson.build +++ b/test/meson.build @@ -40,7 +40,6 @@ internal_tests = [ ['event-dispatcher', 'event-dispatcher.cpp'], ['event-thread', 'event-thread.cpp'], ['file', 'file.cpp'], - ['file-descriptor', 'file-descriptor.cpp'], ['flags', 'flags.cpp'], ['hotplug-cameras', 'hotplug-cameras.cpp'], ['mapped-buffer', 'mapped-buffer.cpp'], @@ -49,6 +48,7 @@ internal_tests = [ ['object-delete', 'object-delete.cpp'], ['object-invoke', 'object-invoke.cpp'], ['pixel-format', 'pixel-format.cpp'], + ['shared-fd', 'shared-fd.cpp'], ['signal-threads', 'signal-threads.cpp'], ['threads', 'threads.cpp'], ['timer', 'timer.cpp'], diff --git a/test/serialization/ipa_data_serializer_test.cpp b/test/serialization/ipa_data_serializer_test.cpp index 5fcdcb8e..d2050a86 100644 --- a/test/serialization/ipa_data_serializer_test.cpp +++ b/test/serialization/ipa_data_serializer_test.cpp @@ -53,7 +53,7 @@ template int testPodSerdes(T in) { std::vector buf; - std::vector fds; + std::vector fds; std::tie(buf, fds) = IPADataSerializer::serialize(in); T out = IPADataSerializer::deserialize(buf, fds); @@ -72,7 +72,7 @@ int testVectorSerdes(const std::vector &in, ControlSerializer *cs = nullptr) { std::vector buf; - std::vector fds; + std::vector fds; std::tie(buf, fds) = IPADataSerializer>::serialize(in, cs); std::vector out = IPADataSerializer>::deserialize(buf, fds, cs); @@ -92,7 +92,7 @@ int testMapSerdes(const std::map &in, ControlSerializer *cs = nullptr) { std::vector buf; - std::vector fds; + std::vector fds; std::tie(buf, fds) = IPADataSerializer>::serialize(in, cs); std::map out = IPADataSerializer>::deserialize(buf, fds, cs); @@ -198,7 +198,7 @@ private: ControlSerializer cs(ControlSerializer::Role::Proxy); /* - * We don't test FileDescriptor serdes because it dup()s, so we + * We don't test SharedFD serdes because it dup()s, so we * can't check for equality. */ std::vector vecUint8 = { 1, 2, 3, 4, 5, 6 }; @@ -219,7 +219,7 @@ private: }; std::vector buf; - std::vector fds; + std::vector fds; if (testVectorSerdes(vecUint8) != TestPass) return TestFail; @@ -291,7 +291,7 @@ private: { { "a", { 1, 2, 3 } }, { "b", { 4, 5, 6 } }, { "c", { 7, 8, 9 } } }; std::vector buf; - std::vector fds; + std::vector fds; if (testMapSerdes(mapUintStr) != TestPass) return TestFail; @@ -359,7 +359,7 @@ private: std::string strEmpty = ""; std::vector buf; - std::vector fds; + std::vector fds; if (testPodSerdes(u32min) != TestPass) return TestFail; diff --git a/test/shared-fd.cpp b/test/shared-fd.cpp new file mode 100644 index 00000000..60e5d0aa --- /dev/null +++ b/test/shared-fd.cpp @@ -0,0 +1,243 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * shared_fd.cpp - SharedFD test + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include "test.h" + +using namespace libcamera; +using namespace std; + +class SharedFDTest : public Test +{ +protected: + int init() + { + desc1_ = nullptr; + desc2_ = nullptr; + + fd_ = open("/tmp", O_TMPFILE | O_RDWR, S_IRUSR | S_IWUSR); + if (fd_ < 0) + return TestFail; + + /* Cache inode number of temp file. */ + struct stat s; + if (fstat(fd_, &s)) + return TestFail; + + inodeNr_ = s.st_ino; + + return 0; + } + + int run() + { + /* Test creating empty SharedFD. */ + desc1_ = new SharedFD(); + + if (desc1_->fd() != -1) { + std::cout << "Failed fd numerical check (default constructor)" + << std::endl; + return TestFail; + } + + delete desc1_; + desc1_ = nullptr; + + /* + * Test creating SharedFD by copying numerical file + * descriptor. + */ + desc1_ = new SharedFD(fd_); + if (desc1_->fd() == fd_) { + std::cout << "Failed fd numerical check (lvalue ref constructor)" + << std::endl; + return TestFail; + } + + if (!isValidFd(fd_) || !isValidFd(desc1_->fd())) { + std::cout << "Failed fd validity after construction (lvalue ref constructor)" + << std::endl; + return TestFail; + } + + int fd = desc1_->fd(); + + delete desc1_; + desc1_ = nullptr; + + if (!isValidFd(fd_) || isValidFd(fd)) { + std::cout << "Failed fd validity after destruction (lvalue ref constructor)" + << std::endl; + return TestFail; + } + + /* + * Test creating SharedFD by taking ownership of + * numerical file descriptor. + */ + int dupFd = dup(fd_); + int dupFdCopy = dupFd; + + desc1_ = new SharedFD(std::move(dupFd)); + if (desc1_->fd() != dupFdCopy) { + std::cout << "Failed fd numerical check (rvalue ref constructor)" + << std::endl; + return TestFail; + } + + if (dupFd != -1 || !isValidFd(fd_) || !isValidFd(desc1_->fd())) { + std::cout << "Failed fd validity after construction (rvalue ref constructor)" + << std::endl; + return TestFail; + } + + fd = desc1_->fd(); + + delete desc1_; + desc1_ = nullptr; + + if (!isValidFd(fd_) || isValidFd(fd)) { + std::cout << "Failed fd validity after destruction (rvalue ref constructor)" + << std::endl; + return TestFail; + } + + /* Test creating SharedFD from other SharedFD. */ + desc1_ = new SharedFD(fd_); + desc2_ = new SharedFD(*desc1_); + + if (desc1_->fd() == fd_ || desc2_->fd() == fd_ || desc1_->fd() != desc2_->fd()) { + std::cout << "Failed fd numerical check (copy constructor)" + << std::endl; + return TestFail; + } + + if (!isValidFd(desc1_->fd()) || !isValidFd(desc2_->fd())) { + std::cout << "Failed fd validity after construction (copy constructor)" + << std::endl; + return TestFail; + } + + delete desc1_; + desc1_ = nullptr; + + if (!isValidFd(desc2_->fd())) { + std::cout << "Failed fd validity after destruction (copy constructor)" + << std::endl; + return TestFail; + } + + delete desc2_; + desc2_ = nullptr; + + /* Test creating SharedFD by taking over other SharedFD. */ + desc1_ = new SharedFD(fd_); + fd = desc1_->fd(); + desc2_ = new SharedFD(std::move(*desc1_)); + + if (desc1_->fd() != -1 || desc2_->fd() != fd) { + std::cout << "Failed fd numerical check (move constructor)" + << std::endl; + return TestFail; + } + + if (!isValidFd(desc2_->fd())) { + std::cout << "Failed fd validity after construction (move constructor)" + << std::endl; + return TestFail; + } + + delete desc1_; + desc1_ = nullptr; + delete desc2_; + desc2_ = nullptr; + + /* Test creating SharedFD by copy assignment. */ + desc1_ = new SharedFD(); + desc2_ = new SharedFD(fd_); + + fd = desc2_->fd(); + *desc1_ = *desc2_; + + if (desc1_->fd() != fd || desc2_->fd() != fd) { + std::cout << "Failed fd numerical check (copy assignment)" + << std::endl; + return TestFail; + } + + if (!isValidFd(desc1_->fd()) || !isValidFd(desc2_->fd())) { + std::cout << "Failed fd validity after construction (copy assignment)" + << std::endl; + return TestFail; + } + + delete desc1_; + desc1_ = nullptr; + delete desc2_; + desc2_ = nullptr; + + /* Test creating SharedFD by move assignment. */ + desc1_ = new SharedFD(); + desc2_ = new SharedFD(fd_); + + fd = desc2_->fd(); + *desc1_ = std::move(*desc2_); + + if (desc1_->fd() != fd || desc2_->fd() != -1) { + std::cout << "Failed fd numerical check (move assignment)" + << std::endl; + return TestFail; + } + + if (!isValidFd(desc1_->fd())) { + std::cout << "Failed fd validity after construction (move assignment)" + << std::endl; + return TestFail; + } + + delete desc1_; + desc1_ = nullptr; + delete desc2_; + desc2_ = nullptr; + + return TestPass; + } + + void cleanup() + { + delete desc2_; + delete desc1_; + + if (fd_ > 0) + close(fd_); + } + +private: + bool isValidFd(int fd) + { + struct stat s; + if (fstat(fd, &s)) + return false; + + /* Check that inode number matches cached temp file. */ + return s.st_ino == inodeNr_; + } + + int fd_; + ino_t inodeNr_; + SharedFD *desc1_, *desc2_; +}; + +TEST_REGISTER(SharedFDTest) -- cgit v1.2.1