summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-10-22 14:35:12 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-02-12 14:35:21 +0000
commitf9c0cf2a3a32ff9306da9931218909fa222e8295 (patch)
treef6c65279e3ffa966aae9b59a3590650cb8d2b024 /include
parent640f48d60399fe63f549f6cb5fa8623a6b6b2810 (diff)
libcamera: MappedBuffer: Disable copy and assignment
MappedBuffers have a custom move constructor and assignment operator to ensure that memory is not unmapped during object manipulation. Because of the user-defined move constructor, the implicitly-declared copy-constructor will already be deleted, however delete it explicitly to help readability of the code, and make it clear that the object can not be copied. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/internal/buffer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/buffer.h
index b7b0173f..9da1fbd1 100644
--- a/include/libcamera/internal/buffer.h
+++ b/include/libcamera/internal/buffer.h
@@ -10,6 +10,7 @@
#include <sys/mman.h>
#include <vector>
+#include <libcamera/class.h>
#include <libcamera/buffer.h>
#include <libcamera/span.h>
@@ -34,6 +35,9 @@ protected:
int error_;
std::vector<Plane> maps_;
+
+private:
+ LIBCAMERA_DISABLE_COPY(MappedBuffer)
};
class MappedFrameBuffer : public MappedBuffer
cess.cpp - Logging in isolated child process test */ #include <fcntl.h> #include <iostream> #include <random> #include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <vector> #include <libcamera/logging.h> #include <libcamera/base/event_dispatcher.h> #include <libcamera/base/log.h> #include <libcamera/base/thread.h> #include <libcamera/base/timer.h> #include <libcamera/base/utils.h> #include "libcamera/internal/process.h" #include "test.h" using namespace std; using namespace libcamera; static const string message("hello from the child"); LOG_DEFINE_CATEGORY(LogProcessTest) class LogProcessTestChild { public: int run(int status, int num) { usleep(50000); string logPath = "/tmp/libcamera.worker.test." + to_string(num) + ".log"; if (logSetFile(logPath.c_str()) < 0) return TestSkip; LOG(LogProcessTest, Warning) << message; return status; } }; class LogProcessTest : public Test { protected: int init() { random_device random; num_ = random(); logPath_ = "/tmp/libcamera.worker.test." + to_string(num_) + ".log"; proc_.finished.connect(this, &LogProcessTest::procFinished); return 0; } int run() { EventDispatcher *dispatcher = Thread::current()->eventDispatcher(); Timer timeout; int exitCode = 42; vector<std::string> args; args.push_back(to_string(exitCode)); args.push_back(to_string(num_)); int ret = proc_.start("/proc/self/exe", args); if (ret) { cerr << "failed to start process" << endl; return TestFail; } timeout.start(200); while (timeout.isRunning()) dispatcher->processEvents(); if (exitStatus_ != Process::NormalExit) { cerr << "process did not exit normally" << endl; return TestFail; } if (exitCode_ == TestSkip) return TestSkip; if (exitCode_ != exitCode) { cerr << "exit code should be " << exitCode << ", actual is " << exitCode_ << endl; return TestFail; } int fd = open(logPath_.c_str(), O_RDONLY, S_IRUSR); if (fd < 0) { cerr << "failed to open tmp log file" << endl; return TestFail; } char buf[200]; memset(buf, 0, sizeof(buf)); if (read(fd, buf, sizeof(buf)) < 0) { cerr << "Failed to read tmp log file" << endl; close(fd); return TestFail; } close(fd); string str(buf); if (str.find(message) == string::npos) return TestFail; return TestPass; } void cleanup() { unlink(logPath_.c_str()); } private: