{"id":9707,"url":"https://patchwork.libcamera.org/api/1.1/patches/9707/?format=json","web_url":"https://patchwork.libcamera.org/patch/9707/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200922133537.258098-3-paul.elder@ideasonboard.com>","date":"2020-09-22T13:35:01","name":"[libcamera-devel,02/38] libcamera: ProcessManager: make ProcessManager lifetime explicitly managed","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c3d23f2e7f3368f72e27e28474b2d5f7e8137cdb","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9707/mbox/","series":[{"id":1309,"url":"https://patchwork.libcamera.org/api/1.1/series/1309/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1309","date":"2020-09-22T13:34:59","name":"IPA isolation implementation","version":1,"mbox":"https://patchwork.libcamera.org/series/1309/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9707/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9707/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 08A2AC3B5B\n\tfor ;\n\tTue, 22 Sep 2020 13:36:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CD8CA6036A;\n\tTue, 22 Sep 2020 15:36:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0C65B6036A\n\tfor ;\n\tTue, 22 Sep 2020 15:36:06 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 35C302D7;\n\tTue, 22 Sep 2020 15:35:59 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ruxX5eUW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600781762;\n\tbh=JjXq0HhaIOuiytbPK8fO+OOOeRDN5PGaoKCDYuHnHnE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ruxX5eUW+Xoke2UvVvfYDnEc8Z/zzo7DyJqC2q4RGy7uOJrDFpHVIEf4x2KINHanM\n\tDIFGbyjWyVwWGLhQSZkIQg6JRI1m4TAoiiI84dxlszATuO/aSj3bL7vyz1F29hrzWV\n\tNO1LRIqpMVlxzcdv+9vUlIhU6MSDMmsZBOEm+Kvw=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Sep 2020 22:35:01 +0900","Message-Id":"<20200922133537.258098-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200922133537.258098-1-paul.elder@ideasonboard.com>","References":"<20200922133537.258098-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 02/38] libcamera: ProcessManager: make\n\tProcessManager lifetime explicitly managed","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"If any Process instances are destroyed after the ProcessManager is\ndestroyed, then a segfault will occur.\n\nFix this by making the lifetime of the ProcessManager explicit, and make\nthe CameraManager construct and deconstruct (automatically, via a member\nvariable) the ProcessManager.\n\nUpdate the tests accordingly.\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \n\n---\nChanges in v2:\n- update changelog (member variable, instead of unique pointer)\n- update tests\n---\n include/libcamera/internal/process.h | 27 ++++++++++++++++\n src/libcamera/camera_manager.cpp | 2 ++\n src/libcamera/process.cpp | 46 ++++++++++++----------------\n test/log/log_process.cpp | 2 ++\n test/process/process_test.cpp | 2 ++\n 5 files changed, 52 insertions(+), 27 deletions(-)","diff":"diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\nindex 2688557c..458a2149 100644\n--- a/include/libcamera/internal/process.h\n+++ b/include/libcamera/internal/process.h\n@@ -7,6 +7,7 @@\n #ifndef __LIBCAMERA_INTERNAL_PROCESS_H__\n #define __LIBCAMERA_INTERNAL_PROCESS_H__\n \n+#include \n #include \n #include \n \n@@ -50,6 +51,32 @@ private:\n \tfriend class ProcessManager;\n };\n \n+class ProcessManager\n+{\n+public:\n+\tProcessManager();\n+\t~ProcessManager();\n+\n+\tvoid registerProcess(Process *proc);\n+\n+\tstatic ProcessManager *instance();\n+\n+\tint writePipe() const;\n+\n+\tconst struct sigaction &oldsa() const;\n+\n+private:\n+\tstatic ProcessManager *self_;\n+\n+\tvoid sighandler(EventNotifier *notifier);\n+\n+\tstd::list processes_;\n+\n+\tstruct sigaction oldsa_;\n+\tEventNotifier *sigEvent_;\n+\tint pipe_[2];\n+};\n+\n } /* namespace libcamera */\n \n #endif /* __LIBCAMERA_INTERNAL_PROCESS_H__ */\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 47d56256..b8d3ccc8 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -18,6 +18,7 @@\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/process.h\"\n #include \"libcamera/internal/thread.h\"\n #include \"libcamera/internal/utils.h\"\n \n@@ -67,6 +68,7 @@ private:\n \tstd::unique_ptr enumerator_;\n \n \tIPAManager ipaManager_;\n+\tProcessManager processManager_;\n };\n \n CameraManager::Private::Private(CameraManager *cm)\ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex 994190dc..72b5afe2 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -41,28 +41,6 @@ LOG_DEFINE_CATEGORY(Process)\n * The ProcessManager singleton keeps track of all created Process instances,\n * and manages the signal handling involved in terminating processes.\n */\n-class ProcessManager\n-{\n-public:\n-\tvoid registerProcess(Process *proc);\n-\n-\tstatic ProcessManager *instance();\n-\n-\tint writePipe() const;\n-\n-\tconst struct sigaction &oldsa() const;\n-\n-private:\n-\tvoid sighandler(EventNotifier *notifier);\n-\tProcessManager();\n-\t~ProcessManager();\n-\n-\tstd::list processes_;\n-\n-\tstruct sigaction oldsa_;\n-\tEventNotifier *sigEvent_;\n-\tint pipe_[2];\n-};\n \n namespace {\n \n@@ -127,8 +105,20 @@ void ProcessManager::registerProcess(Process *proc)\n \tprocesses_.push_back(proc);\n }\n \n+ProcessManager *ProcessManager::self_ = nullptr;\n+\n+/**\n+ * \\brief Construct a ProcessManager instance\n+ *\n+ * The ProcessManager class is meant to only be instantiated once, by the\n+ * CameraManager.\n+ */\n ProcessManager::ProcessManager()\n {\n+\tif (self_)\n+\t\tLOG(Process, Fatal)\n+\t\t\t<< \"Multiple ProcessManager objects are not allowed\";\n+\n \tsigaction(SIGCHLD, NULL, &oldsa_);\n \n \tstruct sigaction sa;\n@@ -145,6 +135,8 @@ ProcessManager::ProcessManager()\n \t\t\t<< \"Failed to initialize pipe for signal handling\";\n \tsigEvent_ = new EventNotifier(pipe_[0], EventNotifier::Read);\n \tsigEvent_->activated.connect(this, &ProcessManager::sighandler);\n+\n+\tself_ = this;\n }\n \n ProcessManager::~ProcessManager()\n@@ -153,21 +145,21 @@ ProcessManager::~ProcessManager()\n \tdelete sigEvent_;\n \tclose(pipe_[0]);\n \tclose(pipe_[1]);\n+\n+\tself_ = nullptr;\n }\n \n /**\n * \\brief Retrieve the Process manager instance\n *\n- * The ProcessManager is a singleton and can't be constructed manually. This\n- * method shall instead be used to retrieve the single global instance of the\n- * manager.\n+ * The ProcessManager is constructed by the CameraManager. This function shall\n+ * be used to retrieve the single instance of the manager.\n *\n * \\return The Process manager instance\n */\n ProcessManager *ProcessManager::instance()\n {\n-\tstatic ProcessManager processManager;\n-\treturn &processManager;\n+\treturn self_;\n }\n \n /**\ndiff --git a/test/log/log_process.cpp b/test/log/log_process.cpp\nindex b024f002..2a826222 100644\n--- a/test/log/log_process.cpp\n+++ b/test/log/log_process.cpp\n@@ -132,6 +132,8 @@ private:\n \t\texitCode_ = exitCode;\n \t}\n \n+\tProcessManager processManager_;\n+\n \tProcess proc_;\n \tProcess::ExitStatus exitStatus_;\n \tstring logPath_;\ndiff --git a/test/process/process_test.cpp b/test/process/process_test.cpp\nindex 42a26749..a3eaef80 100644\n--- a/test/process/process_test.cpp\n+++ b/test/process/process_test.cpp\n@@ -87,6 +87,8 @@ private:\n \t\texitCode_ = exitCode;\n \t}\n \n+\tProcessManager processManager_;\n+\n \tProcess proc_;\n \tenum Process::ExitStatus exitStatus_;\n \tint exitCode_;\n","prefixes":["libcamera-devel","02/38"]}