[{"id":5045,"web_url":"https://patchwork.libcamera.org/comment/5045/","msgid":"<20200605101923.GJ5852@pendragon.ideasonboard.com>","date":"2020-06-05T10:19:23","subject":"Re: [libcamera-devel] [PATCH v2 1/7] IPAManager: make IPAManager\n\tlifetime explicitly managed","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Fri, Jun 05, 2020 at 06:01:00PM +0900, Paul Elder wrote:\n> If any ipa_context instances are destroyed after the IPAManager is\n> destroyed, then a segfault will occur, since the modules have been\n> unloaded by the IPAManager and the context function pointers have been\n> freed.\n> \n> Fix this by making the lifetime of the IPAManager explicit, and make the\n> CameraManager construct and deconstruct (automatically, via a unique\n> pointer) the IPAManager.\n> \n> Also update the IPA interface test to do the construction and\n> deconstruction of the IPAManager, as it does not use the CameraManager.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> Changes in v2: Move the IPAManager instance into\n> \t CameraManager::Private from CameraManager\n> ---\n> include/libcamera/camera_manager.h | 1 -\n> include/libcamera/internal/ipa_manager.h | 6 ++++--\n> src/libcamera/camera_manager.cpp | 3 +++\n> src/libcamera/ipa_manager.cpp | 20 ++++++++++++++++++--\n> test/ipa/ipa_interface_test.cpp | 5 +++++\n> 5 files changed, 30 insertions(+), 5 deletions(-)\n> \n> diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\n> index 079f848a..00658a70 100644\n> --- a/include/libcamera/camera_manager.h\n> +++ b/include/libcamera/camera_manager.h\n> @@ -18,7 +18,6 @@ namespace libcamera {\n> \n> class Camera;\n> class EventDispatcher;\n> -\n> class CameraManager : public Object\n> {\n> public:\n> diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\n> index 16d74291..43f700d3 100644\n> --- a/include/libcamera/internal/ipa_manager.h\n> +++ b/include/libcamera/internal/ipa_manager.h\n> @@ -22,6 +22,9 @@ namespace libcamera {\n> class IPAManager\n> {\n> public:\n> +\tIPAManager();\n> +\t~IPAManager();\n> +\n> \tstatic IPAManager *instance();\n> \n> \tstd::unique_ptr createIPA(PipelineHandler *pipe,\n> @@ -29,8 +32,7 @@ public:\n> \t\t\t\t\t uint32_t minVersion);\n> \n> private:\n> -\tIPAManager();\n> -\t~IPAManager();\n> +\tstatic IPAManager *self_;\n> \n> \tvoid parseDir(const char *libDir, unsigned int maxDepth,\n> \t\t std::vector &files);\n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 849377ad..da806fa7 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -15,6 +15,7 @@\n> \n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/event_dispatcher_poll.h\"\n> +#include \"libcamera/internal/ipa_manager.h\"\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/pipeline_handler.h\"\n> #include \"libcamera/internal/thread.h\"\n> @@ -63,6 +64,8 @@ private:\n> \n> \tstd::vector> pipes_;\n> \tstd::unique_ptr enumerator_;\n> +\n> +\tIPAManager ipaManager_;\n> };\n> \n> CameraManager::Private::Private(CameraManager *cm)\n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index 505cf610..abb681a3 100644\n> --- a/src/libcamera/ipa_manager.cpp\n> +++ b/src/libcamera/ipa_manager.cpp\n> @@ -93,8 +93,21 @@ LOG_DEFINE_CATEGORY(IPAManager)\n> * plain C API, or to transmit the data to the isolated process through IPC.\n> */\n> \n> +IPAManager *IPAManager::self_ = nullptr;\n> +\n> +/**\n> + * \\brief Construct an IPAManager instance\n> + *\n> + * The IPAManager class is meant to only be instantiated once, by the\n> + * CameraManager. Pipeline handlers shall use the instance() function to access\n> + * the IPAManager instance.\n> + */\n> IPAManager::IPAManager()\n> {\n> +\tif (self_)\n> +\t\tLOG(IPAManager, Fatal)\n> +\t\t\t<< \"Multiple IPAManager objects are not allowed\";\n> +\n> \tunsigned int ipaCount = 0;\n> \n> \t/* User-specified paths take precedence. */\n> @@ -134,12 +147,16 @@ IPAManager::IPAManager()\n> \tif (!ipaCount)\n> \t\tLOG(IPAManager, Warning)\n> \t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n> +\n> +\tself_ = this;\n> }\n> \n> IPAManager::~IPAManager()\n> {\n> \tfor (IPAModule *module : modules_)\n> \t\tdelete module;\n> +\n> +\tself_ = nullptr;\n> }\n> \n> /**\n> @@ -153,8 +170,7 @@ IPAManager::~IPAManager()\n> */\n> IPAManager *IPAManager::instance()\n\nI think the documentation needs to be updated too. With this handled,\n\nReviewed-by: Laurent Pinchart \n\n> {\n> -\tstatic IPAManager ipaManager;\n> -\treturn &ipaManager;\n> +\treturn self_;\n> }\n> \n> /**\n> diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\n> index 2f02af49..153493ba 100644\n> --- a/test/ipa/ipa_interface_test.cpp\n> +++ b/test/ipa/ipa_interface_test.cpp\n> @@ -39,11 +39,15 @@ public:\n> \t~IPAInterfaceTest()\n> \t{\n> \t\tdelete notifier_;\n> +\t\tipa_.reset();\n> +\t\tipaManager_.reset();\n> \t}\n> \n> protected:\n> \tint init() override\n> \t{\n> +\t\tipaManager_ = make_unique();\n> +\n> \t\t/* Create a pipeline handler for vimc. */\n> \t\tstd::vector &factories =\n> \t\t\tPipelineHandlerFactory::factories();\n> @@ -161,6 +165,7 @@ private:\n> \n> \tstd::shared_ptr pipe_;\n> \tstd::unique_ptr ipa_;\n> +\tstd::unique_ptr ipaManager_;\n> \tenum IPAOperationCode trace_;\n> \tEventNotifier *notifier_;\n> \tint fd_;","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2BBAD603C9\n\tfor ;\n\tFri, 5 Jun 2020 12:19:41 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B6ECD27C;\n\tFri, 5 Jun 2020 12:19:40 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"kPAb5rG/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1591352380;\n\tbh=hBnf/VoOXRNzSX/Dd4YeG/ZSxVE1S1Q1n6GNrscQVSU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=kPAb5rG/8O+4jrdISreTcbOIjwmJ6l1cDyNTzfzcaa4nLqhvj+URR03exi9MXzdzl\n\twd2R2KO11PO8v8Xh5mc/3n5hCUUIHRE+Qc57zdv+f3Sb3Tm9jhMPvd1BzBzmHKCEp+\n\tmuMH2W8r3oemhMxxbDWVOEt7tZwVV1rTM3hP/LNk=","Date":"Fri, 5 Jun 2020 13:19:23 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200605101923.GJ5852@pendragon.ideasonboard.com>","References":"<20200605090106.15424-1-paul.elder@ideasonboard.com>\n\t<20200605090106.15424-2-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200605090106.15424-2-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 1/7] IPAManager: make IPAManager\n\tlifetime 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","X-List-Received-Date":"Fri, 05 Jun 2020 10:19:41 -0000"}},{"id":5053,"web_url":"https://patchwork.libcamera.org/comment/5053/","msgid":"<20200605180839.GD5864@oden.dyn.berto.se>","date":"2020-06-05T18:08:39","subject":"Re: [libcamera-devel] [PATCH v2 1/7] IPAManager: make IPAManager\n\tlifetime explicitly managed","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Paul,\n\nThanks for your work.\n\nOn 2020-06-05 18:01:00 +0900, Paul Elder wrote:\n> If any ipa_context instances are destroyed after the IPAManager is\n> destroyed, then a segfault will occur, since the modules have been\n> unloaded by the IPAManager and the context function pointers have been\n> freed.\n> \n> Fix this by making the lifetime of the IPAManager explicit, and make the\n> CameraManager construct and deconstruct (automatically, via a unique\n> pointer) the IPAManager.\n> \n> Also update the IPA interface test to do the construction and\n> deconstruction of the IPAManager, as it does not use the CameraManager.\n> \n> Signed-off-by: Paul Elder \n\nReviewed-by: Niklas Söderlund \n\n> \n> ---\n> Changes in v2: Move the IPAManager instance into\n> \t CameraManager::Private from CameraManager\n> ---\n> include/libcamera/camera_manager.h | 1 -\n> include/libcamera/internal/ipa_manager.h | 6 ++++--\n> src/libcamera/camera_manager.cpp | 3 +++\n> src/libcamera/ipa_manager.cpp | 20 ++++++++++++++++++--\n> test/ipa/ipa_interface_test.cpp | 5 +++++\n> 5 files changed, 30 insertions(+), 5 deletions(-)\n> \n> diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\n> index 079f848a..00658a70 100644\n> --- a/include/libcamera/camera_manager.h\n> +++ b/include/libcamera/camera_manager.h\n> @@ -18,7 +18,6 @@ namespace libcamera {\n> \n> class Camera;\n> class EventDispatcher;\n> -\n> class CameraManager : public Object\n> {\n> public:\n> diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\n> index 16d74291..43f700d3 100644\n> --- a/include/libcamera/internal/ipa_manager.h\n> +++ b/include/libcamera/internal/ipa_manager.h\n> @@ -22,6 +22,9 @@ namespace libcamera {\n> class IPAManager\n> {\n> public:\n> +\tIPAManager();\n> +\t~IPAManager();\n> +\n> \tstatic IPAManager *instance();\n> \n> \tstd::unique_ptr createIPA(PipelineHandler *pipe,\n> @@ -29,8 +32,7 @@ public:\n> \t\t\t\t\t uint32_t minVersion);\n> \n> private:\n> -\tIPAManager();\n> -\t~IPAManager();\n> +\tstatic IPAManager *self_;\n> \n> \tvoid parseDir(const char *libDir, unsigned int maxDepth,\n> \t\t std::vector &files);\n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 849377ad..da806fa7 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -15,6 +15,7 @@\n> \n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/event_dispatcher_poll.h\"\n> +#include \"libcamera/internal/ipa_manager.h\"\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/pipeline_handler.h\"\n> #include \"libcamera/internal/thread.h\"\n> @@ -63,6 +64,8 @@ private:\n> \n> \tstd::vector> pipes_;\n> \tstd::unique_ptr enumerator_;\n> +\n> +\tIPAManager ipaManager_;\n> };\n> \n> CameraManager::Private::Private(CameraManager *cm)\n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index 505cf610..abb681a3 100644\n> --- a/src/libcamera/ipa_manager.cpp\n> +++ b/src/libcamera/ipa_manager.cpp\n> @@ -93,8 +93,21 @@ LOG_DEFINE_CATEGORY(IPAManager)\n> * plain C API, or to transmit the data to the isolated process through IPC.\n> */\n> \n> +IPAManager *IPAManager::self_ = nullptr;\n> +\n> +/**\n> + * \\brief Construct an IPAManager instance\n> + *\n> + * The IPAManager class is meant to only be instantiated once, by the\n> + * CameraManager. Pipeline handlers shall use the instance() function to access\n> + * the IPAManager instance.\n> + */\n> IPAManager::IPAManager()\n> {\n> +\tif (self_)\n> +\t\tLOG(IPAManager, Fatal)\n> +\t\t\t<< \"Multiple IPAManager objects are not allowed\";\n> +\n> \tunsigned int ipaCount = 0;\n> \n> \t/* User-specified paths take precedence. */\n> @@ -134,12 +147,16 @@ IPAManager::IPAManager()\n> \tif (!ipaCount)\n> \t\tLOG(IPAManager, Warning)\n> \t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n> +\n> +\tself_ = this;\n> }\n> \n> IPAManager::~IPAManager()\n> {\n> \tfor (IPAModule *module : modules_)\n> \t\tdelete module;\n> +\n> +\tself_ = nullptr;\n> }\n> \n> /**\n> @@ -153,8 +170,7 @@ IPAManager::~IPAManager()\n> */\n> IPAManager *IPAManager::instance()\n> {\n> -\tstatic IPAManager ipaManager;\n> -\treturn &ipaManager;\n> +\treturn self_;\n> }\n> \n> /**\n> diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\n> index 2f02af49..153493ba 100644\n> --- a/test/ipa/ipa_interface_test.cpp\n> +++ b/test/ipa/ipa_interface_test.cpp\n> @@ -39,11 +39,15 @@ public:\n> \t~IPAInterfaceTest()\n> \t{\n> \t\tdelete notifier_;\n> +\t\tipa_.reset();\n> +\t\tipaManager_.reset();\n> \t}\n> \n> protected:\n> \tint init() override\n> \t{\n> +\t\tipaManager_ = make_unique();\n> +\n> \t\t/* Create a pipeline handler for vimc. */\n> \t\tstd::vector &factories =\n> \t\t\tPipelineHandlerFactory::factories();\n> @@ -161,6 +165,7 @@ private:\n> \n> \tstd::shared_ptr pipe_;\n> \tstd::unique_ptr ipa_;\n> +\tstd::unique_ptr ipaManager_;\n> \tenum IPAOperationCode trace_;\n> \tEventNotifier *notifier_;\n> \tint fd_;\n> -- \n> 2.20.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lf1-x143.google.com (mail-lf1-x143.google.com\n\t[IPv6:2a00:1450:4864:20::143])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8249A603C6\n\tfor ;\n\tFri, 5 Jun 2020 20:08:42 +0200 (CEST)","by mail-lf1-x143.google.com with SMTP id x27so6334530lfg.9\n\tfor ;\n\tFri, 05 Jun 2020 11:08:42 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\ti22sm1062997ljb.50.2020.06.05.11.08.40\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 05 Jun 2020 11:08:40 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"e+3U9sfu\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=RBHe1Bbn+SjsXTPAkmkNZmJzoetJNIXWN2+eoQBZsCo=;\n\tb=e+3U9sfuXWOfjoQdHPM4s9lB7rdTPh+bi/zqqBDtHmCx01OFKmbmUrwxsl6oQs3k1g\n\t8dLAYKeMQSLqdN7pWPPuoTSDes3aYSkOdpNUsGDS1mUyYwliOIjcs+GRYZsFwRBzmpGh\n\tbflT3gYuhiB777wCHW6GTFTQewK8tl2WfPKMa4GpQ0eeTmiiUIu0mhv+BrdGF9skugQX\n\txOOLF+S7WEWLNiPTlNUq5uRS6czkieMRzKpcUWMwOL29uf6CcwEOYbzFmjI+S4itRIzn\n\tpHPQHYMTDTPqUkM/OQv35UUJRYvA7OHOw9hY/aPkLOlscA1yLvlbgJgddAyIROUUpXuu\n\t5Lng==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=RBHe1Bbn+SjsXTPAkmkNZmJzoetJNIXWN2+eoQBZsCo=;\n\tb=leFBPWEY1WYhBG7sAkZ9kM744zXHIAvrP2UXdFNpX54bpF+AT6DM7WjdADmRf8chX/\n\t7lwLqorEOVbkvoCZ/nwtnyNbJzhmTVrvpmLXBTxn0f2GwKSNMoseTYPbx2YAz6Lnm4O4\n\tdYtjpLtD6nj3LcGAD8PX3Np5yEt7YihEPhsMNg1hqf4mSeCYKEDVImflpeErIfF1yc3o\n\tK7H6tj6hsBkCeau+Ye4o3ZlJxFtnqy/rHmvPAg4b47PBsakaP5KiCRPdgb/snJZml/WN\n\tOAIbzkTdkO/5E/YZwylp2hSLaAA1w2FbHjSnzmzt7/ZUggqGJjDhhtHHygzXVq6blSKZ\n\tXwbg==","X-Gm-Message-State":"AOAM532llHi11cj+LffI5ziWmdy6bzJ71OCtIyGpFM+2oumeM3cnkkQk\n\tB6BX1V3HJ+TSzEfekojt0rnXdnfI8YceiQ==","X-Google-Smtp-Source":"ABdhPJzdV0GkmdsvpKAe7fLf7yi/0v/IV9beEFqB1TlvzlJSdULCM2LLTFMyF+DaQ4GSS3pWFeQ9sg==","X-Received":"by 2002:ac2:4641:: with SMTP id s1mr5971155lfo.147.1591380521761;\n\tFri, 05 Jun 2020 11:08:41 -0700 (PDT)","Date":"Fri, 5 Jun 2020 20:08:39 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200605180839.GD5864@oden.dyn.berto.se>","References":"<20200605090106.15424-1-paul.elder@ideasonboard.com>\n\t<20200605090106.15424-2-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200605090106.15424-2-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 1/7] IPAManager: make IPAManager\n\tlifetime 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","X-List-Received-Date":"Fri, 05 Jun 2020 18:08:42 -0000"}}]