Patch Detail
Show a patch.
GET /api/patches/2294/?format=api
{ "id": 2294, "url": "https://patchwork.libcamera.org/api/patches/2294/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2294/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<39c4470d6fa04c17828f49a9afc8ffd9@mtkmbs07n1.mediatek.inc>", "date": "2019-11-08T04:22:33", "name": "[libcamera-devel,1/1] libcamera: replaced Meyer's singleton", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "08b032233d7ea3aa5dc91989130538084921d0bf", "submitter": { "id": 26, "url": "https://patchwork.libcamera.org/api/people/26/?format=api", "name": "Rynn Wu (吳育恩)", "email": "Rynn.Wu@mediatek.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2294/mbox/", "series": [ { "id": 566, "url": "https://patchwork.libcamera.org/api/series/566/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=566", "date": "2019-11-08T04:22:33", "name": "[libcamera-devel,1/1] libcamera: replaced Meyer's singleton", "version": 1, "mbox": "https://patchwork.libcamera.org/series/566/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2294/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2294/checks/", "tags": {}, "headers": { "Return-Path": "<rynn.wu@mediatek.com>", "Received": [ "from mailgw01.mediatek.com (unknown [210.61.82.183])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 98E4461373\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 8 Nov 2019 05:22:43 +0100 (CET)", "from mtkexhb01.mediatek.inc [(172.21.101.102)] by\n\tmailgw01.mediatek.com (envelope-from <rynn.wu@mediatek.com>)\n\t(Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS)\n\twith ESMTP id 1405119247; Fri, 08 Nov 2019 12:22:36 +0800", "from mtkmbs07n1.mediatek.inc (172.21.101.16) by\n\tmtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Fri, 8 Nov 2019 12:22:33 +0800", "from mtkmbs07n1.mediatek.inc ([fe80::70f1:d3df:c909:49f2]) by\n\tmtkmbs07n1.mediatek.inc ([fe80::70f1:d3df:c909:49f2%18]) with mapi id\n\t15.00.1395.000; Fri, 8 Nov 2019 12:22:33 +0800" ], "X-UUID": [ "2807a044bbe7423a968ff0bb323d5b5a-20191108", "2807a044bbe7423a968ff0bb323d5b5a-20191108" ], "DomainKey-Signature": "a=rsa-sha1; q=dns; c=simple; s=DK; d=mediatek.com;\n\th=X-UUID:From:Subject:Thread-Topic:Thread-Index:Date:Message-ID:Accept-Language:Content-Language:X-MS-Has-Attach:X-MS-TNEF-Correlator:x-dg-ref:x-ms-exchange-transport-fromentityheader:x-originating-ip:Content-Type:MIME-Version;\n\tb=C569qrZ7Wg06jbOjsEQnqfn+KOuMY4lvpSc3bzCwU8l9w64ZrJqaksRALwby7JupCnSyZyJ5gqfVp8MQKDqXXbPMRk6dd7UO7e/rc8GY3vt31Pac6+1zy51kbqAZY4241vqcTpcoHk5770uAzck3NIDr7sHrHoiOSWW7t2TUbRU=;", "From": "=?big5?b?UnlubiBXdSAop2SofK6mKQ==?= <Rynn.Wu@mediatek.com>", "To": "\"libcamera-devel@lists.libcamera.org\"\n\t<libcamera-devel@lists.libcamera.org>", "Thread-Topic": "[PATCH 1/1] libcamera: replaced Meyer's singleton", "Thread-Index": "AdWV7BDaGrd3SKe3QCCnzy8M3pI6Yw==", "Date": "Fri, 8 Nov 2019 04:22:33 +0000", "Message-ID": "<39c4470d6fa04c17828f49a9afc8ffd9@mtkmbs07n1.mediatek.inc>", "Accept-Language": "en-US", "Content-Language": "zh-TW", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "x-dg-ref": "PG1ldGE+PGF0IG5tPSJib2R5Lmh0bWwiIHA9ImM6XHVzZXJzXG10azEwMDExXGFwcGRhdGFccm9hbWluZ1wwOWQ4NDliNi0zMmQzLTRhNDAtODVlZS02Yjg0YmEyOWUzNWJcbXNnc1xtc2ctNjFiNjVjYzYtMDFkZi0xMWVhLTljZDQtNWNmMzcwNjRlYjA1XGFtZS10ZXN0XDYxYjY1Y2M4LTAxZGYtMTFlYS05Y2Q0LTVjZjM3MDY0ZWIwNWJvZHkuaHRtbCIgc3o9Ijk1OTciIHQ9IjEzMjE3NjYwNTUyNjk5NzQ3OCIgaD0iYWEyY1hkdlZzR3hwMVhXaElOU0hjU283NDgwPSIgaWQ9IiIgYmw9IjAiIGJvPSIxIi8+PC9tZXRhPg==", "x-ms-exchange-transport-fromentityheader": "Hosted", "x-originating-ip": "[172.21.101.239]", "Content-Type": "multipart/alternative;\n\tboundary=\"_000_39c4470d6fa04c17828f49a9afc8ffd9mtkmbs07n1mediatekinc_\"", "MIME-Version": "1.0", "X-Mailman-Approved-At": "Fri, 08 Nov 2019 12:14:59 +0100", "Subject": "[libcamera-devel] [PATCH 1/1] libcamera: replaced Meyer's singleton", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Fri, 08 Nov 2019 04:22:44 -0000" }, "content": "Hi there,\n\nI found a Meyer’s singleton in IPAManager, basically Meyer’s singleton is supposed to be removed since it causes some unexpected exceptions in Android platforms while destroying the process.\n\nI replaced it by std::call_once and std::unique_ptr, here is the patch, please kindly help to review it, thanks :-)\n\n\nRynn.\n\n\nFrom 7efdb2e21263ff559cda8af3ec49721967ba8c60 Mon Sep 17 00:00:00 2001\nFrom: Rynn Wu <rynn.wu@mediatek.com>\nDate: Fri, 8 Nov 2019 12:05:55 +0800\nSubject: [PATCH] libcamera: replaced Meyer's singleton\n\nSince destroying order of Meyer's singleton is not guarantee and\nthere were some unexpected behaviors in Android platforms, it's better\nto replace it by other ways.\n\nChange-Id: Id2da20ea641f580cb3566f034cc9958bc391eac7\nSigned-off-by: Rynn Wu <rynn.wu@mediatek.com>\n---\nsrc/libcamera/include/ipa_manager.h | 8 ++++++++\nsrc/libcamera/ipa_manager.cpp | 12 ++++++++++--\n2 files changed, 18 insertions(+), 2 deletions(-)\n\n}\n+std::unique_ptr<IPAManager, std::function<void(IPAManager*)>> IPAManager::singleton_;\n+std::once_flag IPAManager:: singletonFlag_;\n+\n/**\n * \\brief Retrieve the IPA manager instance\n *\n@@ -90,8 +94,12 @@ IPAManager::~IPAManager()\n */\nIPAManager *IPAManager::instance()\n{\n- static IPAManager ipaManager;\n- return &ipaManager;\n+ std::call_once(IPAManager::singletonFlag_, [](){\n+ /* never release, give an empty customized deleter */\n+ IPAManager::singleton_ = std::unique_ptr<IPAManager, std::function<void(IPAManager*)>>(\n+ new IPAManager, [](IPAManager*){});\n+ });\n+ return IPAManager::singleton_.get();\n}\n /**\n--\n2.18.0", "diff": "diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\r\nindex 126f8ba..edaedf9 100644\r\n--- a/src/libcamera/include/ipa_manager.h\r\n+++ b/src/libcamera/include/ipa_manager.h\r\n@@ -7,6 +7,9 @@\r\n#ifndef __LIBCAMERA_IPA_MANAGER_H__\r\n#define __LIBCAMERA_IPA_MANAGER_H__\r\n+#include <functional>\r\n+#include <memory>\r\n+#include <mutex>\r\n#include <vector>\r\n #include <ipa/ipa_interface.h>\r\n@@ -33,6 +36,11 @@ private:\r\n ~IPAManager();\r\n int addDir(const char *libDir);\r\n+\r\n+private:\r\n+ static std::unique_ptr<IPAManager, std::function<void(IPAManager*)>> singleton_;\r\n+ static std::once_flag singletonFlag_;\r\n+\r\n};\r\n } /* namespace libcamera */\r\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\r\nindex f3180c0..8f60be4 100644\r\n--- a/src/libcamera/ipa_manager.cpp\r\n+++ b/src/libcamera/ipa_manager.cpp\r\n@@ -9,6 +9,7 @@\r\n #include <algorithm>\r\n#include <dirent.h>\r\n+#include <memory>\r\n#include <string.h>\r\n#include <sys/types.h>\r\n@@ -79,6 +80,9 @@ IPAManager::~IPAManager()\r\n delete module;\r\n", "prefixes": [ "libcamera-devel", "1/1" ] }