summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-06-10 16:50:21 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-04 23:05:03 +0200
commitc49e888848154741af703596b0e70efdb0e0ec9e (patch)
tree640bb36de3497001ac72ea46af8f368d5cce93e5 /src
parentbf26505dc891aa3e32220c05ea671266cb3ef422 (diff)
libcamera: process: Manage pipe fds by UniqueFD
Manages the file descriptors owned by Process for pipe by UniqueFDs. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/process.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp
index eca1b300..0e6b4e1d 100644
--- a/src/libcamera/process.cpp
+++ b/src/libcamera/process.cpp
@@ -69,7 +69,7 @@ void sigact(int signal, siginfo_t *info, void *ucontext)
void ProcessManager::sighandler()
{
char data;
- ssize_t ret = read(pipe_[0], &data, sizeof(data));
+ ssize_t ret = read(pipe_[0].get(), &data, sizeof(data));
if (ret < 0) {
LOG(Process, Error)
<< "Failed to read byte from signal handler pipe";
@@ -129,10 +129,15 @@ ProcessManager::ProcessManager()
sigaction(SIGCHLD, &sa, NULL);
- if (pipe2(pipe_, O_CLOEXEC | O_DIRECT | O_NONBLOCK))
+ int pipe[2];
+ if (pipe2(pipe, O_CLOEXEC | O_DIRECT | O_NONBLOCK))
LOG(Process, Fatal)
<< "Failed to initialize pipe for signal handling";
- sigEvent_ = new EventNotifier(pipe_[0], EventNotifier::Read);
+
+ pipe_[0] = UniqueFD(pipe[0]);
+ pipe_[1] = UniqueFD(pipe[1]);
+
+ sigEvent_ = new EventNotifier(pipe_[0].get(), EventNotifier::Read);
sigEvent_->activated.connect(this, &ProcessManager::sighandler);
self_ = this;
@@ -141,9 +146,8 @@ ProcessManager::ProcessManager()
ProcessManager::~ProcessManager()
{
sigaction(SIGCHLD, &oldsa_, NULL);
+
delete sigEvent_;
- close(pipe_[0]);
- close(pipe_[1]);
self_ = nullptr;
}
@@ -170,7 +174,7 @@ ProcessManager *ProcessManager::instance()
*/
int ProcessManager::writePipe() const
{
- return pipe_[1];
+ return pipe_[1].get();
}
/**