NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: process: fix compilation on Chromium OS

Browse source 
Commit 3d20beca66 ("libcamera: Add Process and ProcessManager
classes") causes the build to fail in the Chromium OS build environment,
because the return values of some function calls marked with the
__warn_unused_result__ attribute are ignored. Fix this.

Fixes: 3d20beca66 ("libcamera: Add Process and ProcessManager classes")
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder 2019-07-12 17:20:34 +09:00
parent 2d5b3a236e
commit df23ab95f3
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libcamera/process.cpp
View file

@ -69,7 +69,9 @@ namespace {
void sigact(int signal, siginfo_t *info, void *ucontext)
{
char data = 0;
write(ProcessManager::instance()->writePipe(), &data, sizeof(data));
/* We're in a signal handler so we can't log any message,
* and we need to continue anyway. */
(void)write(ProcessManager::instance()->writePipe(), &data, sizeof(data));
const struct sigaction &oldsa = ProcessManager::instance()->oldsa();
if (oldsa.sa_flags & SA_SIGINFO) {
@ -85,7 +87,11 @@ void sigact(int signal, siginfo_t *info, void *ucontext)
void ProcessManager::sighandler(EventNotifier *notifier)
{
char data;
read(pipe_[0], &data, sizeof(data));
if (read(pipe_[0], &data, sizeof(data))) {
LOG(Process, Error)
<< "Failed to read byte from signal handler pipe";
return;
}
for (auto it = processes_.begin(); it != processes_.end(); ) {
Process *process = *it;
@ -128,7 +134,9 @@ ProcessManager::ProcessManager()
sigaction(SIGCHLD, &sa, NULL);
pipe2(pipe_, O_CLOEXEC | O_DIRECT | O_NONBLOCK);
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);
sigEvent_->activated.connect(this, &ProcessManager::sighandler);
}