[{"id":3592,"web_url":"https://patchwork.libcamera.org/comment/3592/","msgid":"<20200123204431.GA286344@oden.dyn.berto.se>","date":"2020-01-23T20:44:31","subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: camera_manager:\n\tRun the camera manager in a thread","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for breaking this apart.\n\nOn 2020-01-22 22:57:19 +0200, Laurent Pinchart wrote:\n> Relying on the application event loop to process all our internal events\n> is a bad idea for multiple reasons. In many cases the user of libcamera\n> can't provide an event loop, for instance when running through one of\n> the adaptation layers. The Android camera HAL and V4L2 compatibility\n> layer create a thread for this reason, and the GStreamer element would\n> need to do so as well. Furthermore, relying on the application event\n> loop pushes libcamera's realtime constraints to the application, which\n> isn't manageable.\n> \n> For these reasons it's desirable to always run the camera manager, the\n> pipeline handlers and the cameras in a separate thread. Doing so isn't\n> too complicated, it only involves creating the thread internally when\n> starting the camera manager, and synchronizing a few methods of the\n> Camera class. Do so as a first step towards defining the threading model\n> of libcamera.\n> \n> The event dispatcher interface is still exposed to applications, to\n> enable cross-thread signal delivery if desired.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> Changes since v1:\n> \n> - Move \"libcamera: camera_manager: Move private data members to private\n> implementation\" and \"libcamera: camera_manager: Return a copy of the\n> vector from cameras()\" to separate patches\n> ---\n> src/libcamera/camera_manager.cpp | 94 ++++++++++++++++++++++++++++++--\n> 1 file changed, 88 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 5fc1bba974c6..11c333ccb4e0 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -7,6 +7,7 @@\n> \n> #include \n> \n> +#include \n> #include \n> \n> #include \n> @@ -28,33 +29,89 @@ namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(Camera)\n> \n> -class CameraManager::Private\n> +class CameraManager::Private : public Thread\n> {\n> public:\n> \tPrivate(CameraManager *cm);\n> \n> \tint start();\n> -\tvoid stop();\n> -\n> \tvoid addCamera(std::shared_ptr &camera, dev_t devnum);\n> \tvoid removeCamera(Camera *camera);\n> \n> +\t/*\n> +\t * This mutex protects\n> +\t *\n> +\t * - initialized_ and status_ during initialization\n> +\t * - cameras_ and camerasByDevnum_ after initialization\n> +\t */\n> +\tMutex mutex_;\n> \tstd::vector> cameras_;\n> \tstd::map> camerasByDevnum_;\n> \n> +protected:\n> +\tvoid run() override;\n> +\n> private:\n> +\tint init();\n> +\tvoid cleanup();\n> +\n> \tCameraManager *cm_;\n> \n> +\tstd::condition_variable cv_;\n> +\tbool initialized_;\n> +\tint status_;\n> +\n> \tstd::vector> pipes_;\n> \tstd::unique_ptr enumerator_;\n> };\n> \n> CameraManager::Private::Private(CameraManager *cm)\n> -\t: cm_(cm)\n> +\t: cm_(cm), initialized_(false)\n> {\n> }\n> \n> int CameraManager::Private::start()\n> +{\n> +\t/* Start the thread and wait for initialization to complete. */\n> +\tThread::start();\n> +\n> +\t{\n> +\t\tMutexLocker locker(mutex_);\n> +\t\tcv_.wait(locker, [&] { return initialized_; });\n> +\t}\n\nDo you not wish to copy status_ and use it bellow while the mutex is \nstill locked?\n\nWith this issue resolved,\n\nReviewed-by: Niklas Söderlund \n\n> +\n> +\t/* If a failure happened during initialization, stop the thread. */\n> +\tif (status_ < 0) {\n> +\t\texit();\n> +\t\twait();\n> +\t\treturn status_;\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> +void CameraManager::Private::run()\n> +{\n> +\tLOG(Camera, Debug) << \"Starting camera manager\";\n> +\n> +\tint ret = init();\n> +\n> +\tmutex_.lock();\n> +\tstatus_ = ret;\n> +\tinitialized_ = true;\n> +\tmutex_.unlock();\n> +\tcv_.notify_one();\n> +\n> +\tif (ret < 0)\n> +\t\treturn;\n> +\n> +\t/* Now start processing events and messages. */\n> +\texec();\n> +\n> +\tcleanup();\n> +}\n> +\n> +int CameraManager::Private::init()\n> {\n> \tenumerator_ = DeviceEnumerator::create();\n> \tif (!enumerator_ || enumerator_->enumerate())\n> @@ -89,7 +146,7 @@ int CameraManager::Private::start()\n> \treturn 0;\n> }\n> \n> -void CameraManager::Private::stop()\n> +void CameraManager::Private::cleanup()\n> {\n> \t/* TODO: unregister hot-plug callback here */\n> \n> @@ -107,6 +164,8 @@ void CameraManager::Private::stop()\n> void CameraManager::Private::addCamera(std::shared_ptr &camera,\n> \t\t\t\t dev_t devnum)\n> {\n> +\tMutexLocker locker(mutex_);\n> +\n> \tfor (std::shared_ptr c : cameras_) {\n> \t\tif (c->name() == camera->name()) {\n> \t\t\tLOG(Camera, Warning)\n> @@ -126,6 +185,8 @@ void CameraManager::Private::addCamera(std::shared_ptr &camera,\n> \n> void CameraManager::Private::removeCamera(Camera *camera)\n> {\n> +\tMutexLocker locker(mutex_);\n> +\n> \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> \t\t\t\t [camera](std::shared_ptr &c) {\n> \t\t\t\t\t return c.get() == camera;\n> @@ -232,7 +293,8 @@ int CameraManager::start()\n> */\n> void CameraManager::stop()\n> {\n> -\tp_->stop();\n> +\tp_->exit();\n> +\tp_->wait();\n> }\n> \n> /**\n> @@ -242,10 +304,14 @@ void CameraManager::stop()\n> * Before calling this function the caller is responsible for ensuring that\n> * the camera manager is running.\n> *\n> + * \\context This function is \\threadsafe.\n> + *\n> * \\return List of all available cameras\n> */\n> std::vector> CameraManager::cameras() const\n> {\n> +\tMutexLocker locker(p_->mutex_);\n> +\n> \treturn p_->cameras_;\n> }\n> \n> @@ -256,10 +322,14 @@ std::vector> CameraManager::cameras() const\n> * Before calling this function the caller is responsible for ensuring that\n> * the camera manager is running.\n> *\n> + * \\context This function is \\threadsafe.\n> + *\n> * \\return Shared pointer to Camera object or nullptr if camera not found\n> */\n> std::shared_ptr CameraManager::get(const std::string &name)\n> {\n> +\tMutexLocker locker(p_->mutex_);\n> +\n> \tfor (std::shared_ptr camera : p_->cameras_) {\n> \t\tif (camera->name() == name)\n> \t\t\treturn camera;\n> @@ -279,11 +349,15 @@ std::shared_ptr CameraManager::get(const std::string &name)\n> * Before calling this function the caller is responsible for ensuring that\n> * the camera manager is running.\n> *\n> + * \\context This function is \\threadsafe.\n> + *\n> * \\return Shared pointer to Camera object, which is empty if the camera is\n> * not found\n> */\n> std::shared_ptr CameraManager::get(dev_t devnum)\n> {\n> +\tMutexLocker locker(p_->mutex_);\n> +\n> \tauto iter = p_->camerasByDevnum_.find(devnum);\n> \tif (iter == p_->camerasByDevnum_.end())\n> \t\treturn nullptr;\n> @@ -302,9 +376,12 @@ std::shared_ptr CameraManager::get(dev_t devnum)\n> *\n> * \\a devnum is used by the V4L2 compatibility layer to map V4L2 device nodes\n> * to Camera instances.\n> + *\n> + * \\context This function shall be called from the CameraManager thread.\n> */\n> void CameraManager::addCamera(std::shared_ptr camera, dev_t devnum)\n> {\n> +\tASSERT(Thread::current() == p_.get());\n> \n> \tp_->addCamera(camera, devnum);\n> }\n> @@ -316,15 +393,20 @@ void CameraManager::addCamera(std::shared_ptr camera, dev_t devnum)\n> * This function is called by pipeline handlers to unregister cameras from the\n> * camera manager. Unregistered cameras won't be reported anymore by the\n> * cameras() and get() calls, but references may still exist in applications.\n> + *\n> + * \\context This function shall be called from the CameraManager thread.\n> */\n> void CameraManager::removeCamera(Camera *camera)\n> {\n> +\tASSERT(Thread::current() == p_.get());\n> +\n> \tp_->removeCamera(camera);\n> }\n> \n> /**\n> * \\fn const std::string &CameraManager::version()\n> * \\brief Retrieve the libcamera version string\n> + * \\context This function is \\a threadsafe.\n> * \\return The libcamera version string\n> */\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart\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-lj1-x232.google.com (mail-lj1-x232.google.com\n\t[IPv6:2a00:1450:4864:20::232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C803607EF\n\tfor ;\n\tThu, 23 Jan 2020 21:44:33 +0100 (CET)","by mail-lj1-x232.google.com with SMTP id v17so45077ljg.4\n\tfor ;\n\tThu, 23 Jan 2020 12:44:33 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\tm16sm1950521ljb.47.2020.01.23.12.44.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 23 Jan 2020 12:44:31 -0800 (PST)"],"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=1pn09QyRm9Orkmp9Mq5EjAlN8gzWffX09lwpwwBcVnM=;\n\tb=1WxQye5RoCW/MFf4pCk4AWpsY+v5CT8NwbqupNzhYfu99WjE2MmTSMX0TBE7SbXxYe\n\tLX2XnOmbsbHSKeJGyaXn7W5NnpT4hMHOdRWqX5y4gaIxMmM3xQBm0YmI1Ley9CJK8wTb\n\tIXc/LhRUzVM0itm0Dpq2YGDn4NDjxN7HMNhvBdAIvqwflRya6Z4Hk81Nc4hNtrFKa6aj\n\tR9pVKMWcZ1jgURXeJoKiqcYN+++rM3KJ7oUEoQdPWfqgcOmFSFGQY6sdWeMaDzH+E+75\n\tXKWno7qZ2tQwjj97PgnS7p2CbbEKpzed/0kfqdyKcjmwS3IyRLumJCtMt0LRHSddb9md\n\tmkPQ==","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=1pn09QyRm9Orkmp9Mq5EjAlN8gzWffX09lwpwwBcVnM=;\n\tb=SxvO9/YRCgMoqaxhI+1JXlEZr5+lHznOo+7UPq4APeQMRyN40fSDsqkG4W2g1R+18+\n\tpjoM6E0J1QY3tL/EdLYdw10s0Ssawkm5YA85HOHXyv32tQeUr0bvIerz7/Rwg8D0DekJ\n\tnpy8sB6zCmHv+SzyycQ5wZopT7KDDwAn1ZNI2/tBDkE5y0Sw6GVLjG1yryvw9D/WEe95\n\t7xlPtS0R8Y+GiYd58AM5eSFq9bW+QxHKFrJTkI+gaNY4XkPNPSci0L0moKx/QHOCNNUz\n\tEMzgpXM+iKBx1x1Zw8TjRgsd9U9M7Ll9RbTd78ACR5EMsEXOWB3K11a/332wNvKhHFxj\n\t09Bw==","X-Gm-Message-State":"APjAAAVKTI65LNsQYT5gSREzAiv/m/ztLOsVSPLDvHBOAtuvnjWpC8o2\n\t+zYfGNKbrGN9npAel+APp5mClmzuM1Q=","X-Google-Smtp-Source":"APXvYqxFhuyyNd7Khh8d+iVTzG3RV8AAfZRjAxP3IDVTdnNgnnJxcGyAtTknP69I6VagxbpvWZ7wUQ==","X-Received":"by 2002:a2e:9090:: with SMTP id l16mr110216ljg.281.1579812272355;\n\tThu, 23 Jan 2020 12:44:32 -0800 (PST)","Date":"Thu, 23 Jan 2020 21:44:31 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200123204431.GA286344@oden.dyn.berto.se>","References":"<20200122205723.8865-1-laurent.pinchart@ideasonboard.com>\n\t<20200122205723.8865-10-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200122205723.8865-10-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: camera_manager:\n\tRun the camera manager in a thread","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":"Thu, 23 Jan 2020 20:44:33 -0000"}},{"id":3594,"web_url":"https://patchwork.libcamera.org/comment/3594/","msgid":"<20200123205717.GB29589@pendragon.ideasonboard.com>","date":"2020-01-23T20:57:17","subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: camera_manager:\n\tRun the camera manager in a thread","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nOn Thu, Jan 23, 2020 at 09:44:31PM +0100, Niklas Söderlund wrote:\n> On 2020-01-22 22:57:19 +0200, Laurent Pinchart wrote:\n> > Relying on the application event loop to process all our internal events\n> > is a bad idea for multiple reasons. In many cases the user of libcamera\n> > can't provide an event loop, for instance when running through one of\n> > the adaptation layers. The Android camera HAL and V4L2 compatibility\n> > layer create a thread for this reason, and the GStreamer element would\n> > need to do so as well. Furthermore, relying on the application event\n> > loop pushes libcamera's realtime constraints to the application, which\n> > isn't manageable.\n> > \n> > For these reasons it's desirable to always run the camera manager, the\n> > pipeline handlers and the cameras in a separate thread. Doing so isn't\n> > too complicated, it only involves creating the thread internally when\n> > starting the camera manager, and synchronizing a few methods of the\n> > Camera class. Do so as a first step towards defining the threading model\n> > of libcamera.\n> > \n> > The event dispatcher interface is still exposed to applications, to\n> > enable cross-thread signal delivery if desired.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > Changes since v1:\n> > \n> > - Move \"libcamera: camera_manager: Move private data members to private\n> > implementation\" and \"libcamera: camera_manager: Return a copy of the\n> > vector from cameras()\" to separate patches\n> > ---\n> > src/libcamera/camera_manager.cpp | 94 ++++++++++++++++++++++++++++++--\n> > 1 file changed, 88 insertions(+), 6 deletions(-)\n> > \n> > diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> > index 5fc1bba974c6..11c333ccb4e0 100644\n> > --- a/src/libcamera/camera_manager.cpp\n> > +++ b/src/libcamera/camera_manager.cpp\n> > @@ -7,6 +7,7 @@\n> > \n> > #include \n> > \n> > +#include \n> > #include \n> > \n> > #include \n> > @@ -28,33 +29,89 @@ namespace libcamera {\n> > \n> > LOG_DEFINE_CATEGORY(Camera)\n> > \n> > -class CameraManager::Private\n> > +class CameraManager::Private : public Thread\n> > {\n> > public:\n> > \tPrivate(CameraManager *cm);\n> > \n> > \tint start();\n> > -\tvoid stop();\n> > -\n> > \tvoid addCamera(std::shared_ptr &camera, dev_t devnum);\n> > \tvoid removeCamera(Camera *camera);\n> > \n> > +\t/*\n> > +\t * This mutex protects\n> > +\t *\n> > +\t * - initialized_ and status_ during initialization\n> > +\t * - cameras_ and camerasByDevnum_ after initialization\n> > +\t */\n> > +\tMutex mutex_;\n> > \tstd::vector> cameras_;\n> > \tstd::map> camerasByDevnum_;\n> > \n> > +protected:\n> > +\tvoid run() override;\n> > +\n> > private:\n> > +\tint init();\n> > +\tvoid cleanup();\n> > +\n> > \tCameraManager *cm_;\n> > \n> > +\tstd::condition_variable cv_;\n> > +\tbool initialized_;\n> > +\tint status_;\n> > +\n> > \tstd::vector> pipes_;\n> > \tstd::unique_ptr enumerator_;\n> > };\n> > \n> > CameraManager::Private::Private(CameraManager *cm)\n> > -\t: cm_(cm)\n> > +\t: cm_(cm), initialized_(false)\n> > {\n> > }\n> > \n> > int CameraManager::Private::start()\n> > +{\n> > +\t/* Start the thread and wait for initialization to complete. */\n> > +\tThread::start();\n> > +\n> > +\t{\n> > +\t\tMutexLocker locker(mutex_);\n> > +\t\tcv_.wait(locker, [&] { return initialized_; });\n> > +\t}\n> \n> Do you not wish to copy status_ and use it bellow while the mutex is \n> still locked?\n\nI'm not sure it's required, but I'll do it nonetheless. Unlocking the\nmutex will prevent the compiler from moving the status_ read before the\nlock (as it's an externally defined function), and I *think* that the\nmutex unlock will contain the necessary memory barriers.\n\n> With this issue resolved,\n> \n> Reviewed-by: Niklas Söderlund \n> \n> > +\n> > +\t/* If a failure happened during initialization, stop the thread. */\n> > +\tif (status_ < 0) {\n> > +\t\texit();\n> > +\t\twait();\n> > +\t\treturn status_;\n> > +\t}\n> > +\n> > +\treturn 0;\n> > +}\n> > +\n> > +void CameraManager::Private::run()\n> > +{\n> > +\tLOG(Camera, Debug) << \"Starting camera manager\";\n> > +\n> > +\tint ret = init();\n> > +\n> > +\tmutex_.lock();\n> > +\tstatus_ = ret;\n> > +\tinitialized_ = true;\n> > +\tmutex_.unlock();\n> > +\tcv_.notify_one();\n> > +\n> > +\tif (ret < 0)\n> > +\t\treturn;\n> > +\n> > +\t/* Now start processing events and messages. */\n> > +\texec();\n> > +\n> > +\tcleanup();\n> > +}\n> > +\n> > +int CameraManager::Private::init()\n> > {\n> > \tenumerator_ = DeviceEnumerator::create();\n> > \tif (!enumerator_ || enumerator_->enumerate())\n> > @@ -89,7 +146,7 @@ int CameraManager::Private::start()\n> > \treturn 0;\n> > }\n> > \n> > -void CameraManager::Private::stop()\n> > +void CameraManager::Private::cleanup()\n> > {\n> > \t/* TODO: unregister hot-plug callback here */\n> > \n> > @@ -107,6 +164,8 @@ void CameraManager::Private::stop()\n> > void CameraManager::Private::addCamera(std::shared_ptr &camera,\n> > \t\t\t\t dev_t devnum)\n> > {\n> > +\tMutexLocker locker(mutex_);\n> > +\n> > \tfor (std::shared_ptr c : cameras_) {\n> > \t\tif (c->name() == camera->name()) {\n> > \t\t\tLOG(Camera, Warning)\n> > @@ -126,6 +185,8 @@ void CameraManager::Private::addCamera(std::shared_ptr &camera,\n> > \n> > void CameraManager::Private::removeCamera(Camera *camera)\n> > {\n> > +\tMutexLocker locker(mutex_);\n> > +\n> > \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> > \t\t\t\t [camera](std::shared_ptr &c) {\n> > \t\t\t\t\t return c.get() == camera;\n> > @@ -232,7 +293,8 @@ int CameraManager::start()\n> > */\n> > void CameraManager::stop()\n> > {\n> > -\tp_->stop();\n> > +\tp_->exit();\n> > +\tp_->wait();\n> > }\n> > \n> > /**\n> > @@ -242,10 +304,14 @@ void CameraManager::stop()\n> > * Before calling this function the caller is responsible for ensuring that\n> > * the camera manager is running.\n> > *\n> > + * \\context This function is \\threadsafe.\n> > + *\n> > * \\return List of all available cameras\n> > */\n> > std::vector> CameraManager::cameras() const\n> > {\n> > +\tMutexLocker locker(p_->mutex_);\n> > +\n> > \treturn p_->cameras_;\n> > }\n> > \n> > @@ -256,10 +322,14 @@ std::vector> CameraManager::cameras() const\n> > * Before calling this function the caller is responsible for ensuring that\n> > * the camera manager is running.\n> > *\n> > + * \\context This function is \\threadsafe.\n> > + *\n> > * \\return Shared pointer to Camera object or nullptr if camera not found\n> > */\n> > std::shared_ptr CameraManager::get(const std::string &name)\n> > {\n> > +\tMutexLocker locker(p_->mutex_);\n> > +\n> > \tfor (std::shared_ptr camera : p_->cameras_) {\n> > \t\tif (camera->name() == name)\n> > \t\t\treturn camera;\n> > @@ -279,11 +349,15 @@ std::shared_ptr CameraManager::get(const std::string &name)\n> > * Before calling this function the caller is responsible for ensuring that\n> > * the camera manager is running.\n> > *\n> > + * \\context This function is \\threadsafe.\n> > + *\n> > * \\return Shared pointer to Camera object, which is empty if the camera is\n> > * not found\n> > */\n> > std::shared_ptr CameraManager::get(dev_t devnum)\n> > {\n> > +\tMutexLocker locker(p_->mutex_);\n> > +\n> > \tauto iter = p_->camerasByDevnum_.find(devnum);\n> > \tif (iter == p_->camerasByDevnum_.end())\n> > \t\treturn nullptr;\n> > @@ -302,9 +376,12 @@ std::shared_ptr CameraManager::get(dev_t devnum)\n> > *\n> > * \\a devnum is used by the V4L2 compatibility layer to map V4L2 device nodes\n> > * to Camera instances.\n> > + *\n> > + * \\context This function shall be called from the CameraManager thread.\n> > */\n> > void CameraManager::addCamera(std::shared_ptr camera, dev_t devnum)\n> > {\n> > +\tASSERT(Thread::current() == p_.get());\n> > \n> > \tp_->addCamera(camera, devnum);\n> > }\n> > @@ -316,15 +393,20 @@ void CameraManager::addCamera(std::shared_ptr camera, dev_t devnum)\n> > * This function is called by pipeline handlers to unregister cameras from the\n> > * camera manager. Unregistered cameras won't be reported anymore by the\n> > * cameras() and get() calls, but references may still exist in applications.\n> > + *\n> > + * \\context This function shall be called from the CameraManager thread.\n> > */\n> > void CameraManager::removeCamera(Camera *camera)\n> > {\n> > +\tASSERT(Thread::current() == p_.get());\n> > +\n> > \tp_->removeCamera(camera);\n> > }\n> > \n> > /**\n> > * \\fn const std::string &CameraManager::version()\n> > * \\brief Retrieve the libcamera version string\n> > + * \\context This function is \\a threadsafe.\n> > * \\return The libcamera version string\n> > */\n> >","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6635E607EF\n\tfor ;\n\tThu, 23 Jan 2020 21:57:36 +0100 (CET)","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 614722E5;\n\tThu, 23 Jan 2020 21:57:35 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1579813056;\n\tbh=wJC8hLSmd/xihnSRJ5YOZYVrSfJDLx5GyNZuyUK0nVQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=c+PNS35E8jHR3P6wbZ/1zoSh7Iy1ekYGXWDWU0OXn7wr6GxDRHJVdXXcZ+Q8419tb\n\tF/vz8808cXeyOGUU4LEmZEBykoYh2XEScwvBH40JUd/4pPwBWUEglYFHA4UXww6j3A\n\tWFljFQODY2KQVIkGL5SMBsHH9E3RtRPY1NCTihNw=","Date":"Thu, 23 Jan 2020 22:57:17 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200123205717.GB29589@pendragon.ideasonboard.com>","References":"<20200122205723.8865-1-laurent.pinchart@ideasonboard.com>\n\t<20200122205723.8865-10-laurent.pinchart@ideasonboard.com>\n\t<20200123204431.GA286344@oden.dyn.berto.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200123204431.GA286344@oden.dyn.berto.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: camera_manager:\n\tRun the camera manager in a thread","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":"Thu, 23 Jan 2020 20:57:36 -0000"}}]