Patch Detail
Show a patch.
GET /api/1.1/patches/14925/?format=api
{ "id": 14925, "url": "https://patchwork.libcamera.org/api/1.1/patches/14925/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14925/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20211130233634.34173-12-jacopo@jmondi.org>", "date": "2021-11-30T23:36:34", "name": "[libcamera-devel,v3,11/11] android: Remove CameraWorker", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "131a82985d86c22ce0a14956d2ff437ea8ab0d9b", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14925/mbox/", "series": [ { "id": 2788, "url": "https://patchwork.libcamera.org/api/1.1/series/2788/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2788", "date": "2021-11-30T23:36:23", "name": "libcamera: Add support for Fence", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2788/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14925/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14925/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 7BC28C3250\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Nov 2021 23:36:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0457E6072B;\n\tWed, 1 Dec 2021 00:36:01 +0100 (CET)", "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DF8326072E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 00:35:59 +0100 (CET)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 95C2D1BF206;\n\tTue, 30 Nov 2021 23:35:58 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Dec 2021 00:36:34 +0100", "Message-Id": "<20211130233634.34173-12-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.33.1", "In-Reply-To": "<20211130233634.34173-1-jacopo@jmondi.org>", "References": "<20211130233634.34173-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 11/11] android: Remove CameraWorker", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The CameraWorker class purpose was to handle acquire fences for incoming\ncapture requests directed to libcamera.\n\nNow that fences are handled by the core library, it is not required to\nhandle them in the HAL and the CameraWorker and CaptureRequest classes\ncan be dropped.\n\nUpdate the core in CameraDevice class accordingly to queue Requests\ndirectly to the libcamera::Camera and set the release_fence to the\nvalue of the FrameBuffer::fence() for streams of type ::Direct.\n\nWhile at it make CameraRequest::StreamBuffer::fence a UniqueFD to ease\nthe management of the fences file descriptor values.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 46 ++++++------\n src/android/camera_device.h | 3 -\n src/android/camera_request.cpp | 8 +-\n src/android/camera_request.h | 6 +-\n src/android/camera_stream.cpp | 10 +--\n src/android/camera_worker.cpp | 129 ---------------------------------\n src/android/camera_worker.h | 70 ------------------\n src/android/meson.build | 1 -\n 8 files changed, 36 insertions(+), 237 deletions(-)\n delete mode 100644 src/android/camera_worker.cpp\n delete mode 100644 src/android/camera_worker.h", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 1938b10509fa..b7114c615733 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -15,10 +15,12 @@\n \n #include <libcamera/base/log.h>\n #include <libcamera/base/thread.h>\n+#include <libcamera/base/unique_fd.h>\n #include <libcamera/base/utils.h>\n \n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n+#include <libcamera/fence.h>\n #include <libcamera/formats.h>\n #include <libcamera/property_ids.h>\n \n@@ -406,7 +408,6 @@ void CameraDevice::flush()\n \t\tstate_ = State::Flushing;\n \t}\n \n-\tworker_.stop();\n \tcamera_->stop();\n \n \tMutexLocker stateLock(stateMutex_);\n@@ -419,7 +420,6 @@ void CameraDevice::stop()\n \tif (state_ == State::Stopped)\n \t\treturn;\n \n-\tworker_.stop();\n \tcamera_->stop();\n \n \tdescriptors_ = {};\n@@ -912,13 +912,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \n \t\t/*\n \t\t * Inspect the camera stream type, create buffers opportunely\n-\t\t * and add them to the Request if required. Only acquire fences\n-\t\t * for streams of type Direct are handled by the CameraWorker,\n-\t\t * while fences for streams of type Internal and Mapped are\n-\t\t * handled at post-processing time.\n+\t\t * and add them to the Request if required.\n \t\t */\n \t\tFrameBuffer *frameBuffer = nullptr;\n-\t\tint acquireFence = -1;\n \t\tswitch (cameraStream->type()) {\n \t\tcase CameraStream::Type::Mapped:\n \t\t\t/*\n@@ -943,7 +939,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t\t\t\t cameraStream->configuration().pixelFormat,\n \t\t\t\t\t\t cameraStream->configuration().size);\n \t\t\tframeBuffer = buffer.frameBuffer.get();\n-\t\t\tacquireFence = buffer.fence;\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n \n@@ -970,12 +965,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t}\n \n \t\tdescriptor->request_->addBuffer(cameraStream->stream(),\n-\t\t\t\t\t\tframeBuffer, acquireFence);\n+\t\t\tframeBuffer, std::make_unique<Fence>(std::move(buffer.fence)));\n \t}\n \n \t/*\n \t * Translate controls from Android to libcamera and queue the request\n-\t * to the CameraWorker thread.\n+\t * to the camera.\n \t */\n \tint ret = processControls(descriptor.get());\n \tif (ret)\n@@ -1001,26 +996,23 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t}\n \n \tif (state_ == State::Stopped) {\n-\t\tworker_.start();\n-\n \t\tret = camera_->start();\n \t\tif (ret) {\n \t\t\tLOG(HAL, Error) << \"Failed to start camera\";\n-\t\t\tworker_.stop();\n \t\t\treturn ret;\n \t\t}\n \n \t\tstate_ = State::Running;\n \t}\n \n-\tCaptureRequest *request = descriptor->request_.get();\n+\tRequest *request = descriptor->request_.get();\n \n \t{\n \t\tMutexLocker descriptorsLock(descriptorsMutex_);\n \t\tdescriptors_.push(std::move(descriptor));\n \t}\n \n-\tworker_.queueRequest(request);\n+\tcamera_->queueRequest(request);\n \n \treturn 0;\n }\n@@ -1042,16 +1034,24 @@ void CameraDevice::requestComplete(Request *request)\n \t\t/*\n \t\t * Streams of type Direct have been queued to the\n \t\t * libcamera::Camera and their acquire fences have\n-\t\t * already been waited on by the CameraWorker.\n+\t\t * already been waited on by the library.\n \t\t *\n \t\t * Acquire fences of streams of type Internal and Mapped\n \t\t * will be handled during post-processing.\n-\t\t *\n-\t\t * \\todo Instrument the CameraWorker to set the acquire\n-\t\t * fence to -1 once it has handled it and remove this check.\n \t\t */\n-\t\tif (stream->type() == CameraStream::Type::Direct)\n-\t\t\tbuffer.fence = -1;\n+\t\tif (stream->type() == CameraStream::Type::Direct) {\n+\t\t\t/* If the fence has been closed, send -1 to the framework. */\n+\t\t\tstd::unique_ptr<Fence> fence = buffer.frameBuffer->resetFence();\n+\t\t\tif (!fence || !fence->isValid())\n+\t\t\t\tbreak;\n+\n+\t\t\t/*\n+\t\t\t * If handling of the fence has failed, send to the\n+\t\t\t * framework the acquire_fence fd as release_fence so\n+\t\t\t * it can close it.\n+\t\t\t */\n+\t\t\tbuffer.fence = std::move(fence->reset());\n+\t\t}\n \t\tbuffer.status = Camera3RequestDescriptor::Status::Success;\n \t}\n \n@@ -1172,7 +1172,7 @@ void CameraDevice::sendCaptureResults()\n \t\tstd::vector<camera3_stream_buffer_t> resultBuffers;\n \t\tresultBuffers.reserve(descriptor->buffers_.size());\n \n-\t\tfor (const auto &buffer : descriptor->buffers_) {\n+\t\tfor (auto &buffer : descriptor->buffers_) {\n \t\t\tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_ERROR;\n \n \t\t\tif (buffer.status == Camera3RequestDescriptor::Status::Success)\n@@ -1186,7 +1186,7 @@ void CameraDevice::sendCaptureResults()\n \t\t\t */\n \t\t\tresultBuffers.push_back({ buffer.stream->camera3Stream(),\n \t\t\t\t\t\t buffer.camera3Buffer, status,\n-\t\t\t\t\t\t -1, buffer.fence });\n+\t\t\t\t\t\t -1, buffer.fence.release() });\n \t\t}\n \n \t\tcaptureResult.num_output_buffers = resultBuffers.size();\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 51fe7da2cb47..494d79d2a3ea 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -30,7 +30,6 @@\n #include \"camera_capabilities.h\"\n #include \"camera_metadata.h\"\n #include \"camera_stream.h\"\n-#include \"camera_worker.h\"\n #include \"jpeg/encoder.h\"\n \n class Camera3RequestDescriptor;\n@@ -105,8 +104,6 @@ private:\n \tunsigned int id_;\n \tcamera3_device_t camera3Device_;\n \n-\tCameraWorker worker_;\n-\n \tlibcamera::Mutex stateMutex_; /* Protects access to the camera state. */\n \tState state_;\n \ndiff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\nindex 8162aa78e953..c46689a52d6d 100644\n--- a/src/android/camera_request.cpp\n+++ b/src/android/camera_request.cpp\n@@ -47,8 +47,7 @@ Camera3RequestDescriptor::Camera3RequestDescriptor(\n \t * Create the CaptureRequest, stored as a unique_ptr<> to tie its\n \t * lifetime to the descriptor.\n \t */\n-\trequest_ = std::make_unique<CaptureRequest>(camera,\n-\t\t\t\t\t\t reinterpret_cast<uint64_t>(this));\n+\trequest_ = camera->createRequest(reinterpret_cast<uint64_t>(this));\n }\n \n Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n@@ -57,8 +56,11 @@ Camera3RequestDescriptor::StreamBuffer::StreamBuffer(\n \tCameraStream *cameraStream, const camera3_stream_buffer_t &buffer,\n \tCamera3RequestDescriptor *requestDescriptor)\n \t: stream(cameraStream), camera3Buffer(buffer.buffer),\n-\t fence(buffer.acquire_fence), request(requestDescriptor)\n+\t request(requestDescriptor)\n {\n+\t/* Do not reset buffer.acquire_fence by moving it to fence. */\n+\tint fenceFd = buffer.acquire_fence;\n+\tfence = UniqueFD(std::move(fenceFd));\n }\n \n Camera3RequestDescriptor::StreamBuffer::~StreamBuffer() = default;\ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex f3cb6d643961..4372ad775c19 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -13,6 +13,7 @@\n #include <vector>\n \n #include <libcamera/base/class.h>\n+#include <libcamera/base/unique_fd.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/framebuffer.h>\n@@ -20,7 +21,6 @@\n #include <hardware/camera3.h>\n \n #include \"camera_metadata.h\"\n-#include \"camera_worker.h\"\n \n class CameraBuffer;\n class CameraStream;\n@@ -45,7 +45,7 @@ public:\n \t\tCameraStream *stream;\n \t\tbuffer_handle_t *camera3Buffer;\n \t\tstd::unique_ptr<libcamera::FrameBuffer> frameBuffer;\n-\t\tint fence;\n+\t\tlibcamera::UniqueFD fence;\n \t\tStatus status = Status::Success;\n \t\tlibcamera::FrameBuffer *internalBuffer = nullptr;\n \t\tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n@@ -71,7 +71,7 @@ public:\n \tstd::vector<StreamBuffer> buffers_;\n \n \tCameraMetadata settings_;\n-\tstd::unique_ptr<CaptureRequest> request_;\n+\tstd::unique_ptr<libcamera::Request> request_;\n \tstd::unique_ptr<CameraMetadata> resultMetadata_;\n \n \tbool complete_ = false;\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 9023c13c40f0..08252341e9cf 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -169,16 +169,16 @@ int CameraStream::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n \tASSERT(type_ != Type::Direct);\n \n \t/* Handle waiting on fences on the destination buffer. */\n-\tif (streamBuffer->fence != -1) {\n-\t\tint ret = waitFence(streamBuffer->fence);\n+\tif (streamBuffer->fence.isValid()) {\n+\t\tint ret = waitFence(streamBuffer->fence.get());\n \t\tif (ret < 0) {\n \t\t\tLOG(HAL, Error) << \"Failed waiting for fence: \"\n-\t\t\t\t\t<< streamBuffer->fence << \": \" << strerror(-ret);\n+\t\t\t\t\t<< streamBuffer->fence.get() << \": \"\n+\t\t\t\t\t<< strerror(-ret);\n \t\t\treturn ret;\n \t\t}\n \n-\t\t::close(streamBuffer->fence);\n-\t\tstreamBuffer->fence = -1;\n+\t\tstreamBuffer->fence.reset();\n \t}\n \n \tconst StreamConfiguration &output = configuration();\ndiff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp\ndeleted file mode 100644\nindex dabb305407a2..000000000000\n--- a/src/android/camera_worker.cpp\n+++ /dev/null\n@@ -1,129 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2020, Google Inc.\n- *\n- * camera_worker.cpp - Process capture requests on behalf of the Camera HAL\n- */\n-\n-#include \"camera_worker.h\"\n-\n-#include <errno.h>\n-#include <string.h>\n-#include <sys/poll.h>\n-#include <unistd.h>\n-\n-#include \"camera_device.h\"\n-\n-using namespace libcamera;\n-\n-LOG_DECLARE_CATEGORY(HAL)\n-\n-/*\n- * \\class CaptureRequest\n- * \\brief Wrap a libcamera::Request associated with buffers and fences\n- *\n- * A CaptureRequest is constructed by the CameraDevice, filled with\n- * buffers and fences provided by the camera3 framework and then processed\n- * by the CameraWorker which queues it to the libcamera::Camera after handling\n- * fences.\n- */\n-CaptureRequest::CaptureRequest(Camera *camera, uint64_t cookie)\n-\t: camera_(camera)\n-{\n-\trequest_ = camera_->createRequest(cookie);\n-}\n-\n-void CaptureRequest::addBuffer(Stream *stream, FrameBuffer *buffer, int fence)\n-{\n-\trequest_->addBuffer(stream, buffer);\n-\tacquireFences_.push_back(fence);\n-}\n-\n-void CaptureRequest::queue()\n-{\n-\tcamera_->queueRequest(request_.get());\n-}\n-\n-/*\n- * \\class CameraWorker\n- * \\brief Process a CaptureRequest on an internal thread\n- *\n- * The CameraWorker class wraps a Worker that runs on an internal thread\n- * and schedules processing of CaptureRequest through it.\n- */\n-CameraWorker::CameraWorker()\n-{\n-\tworker_.moveToThread(this);\n-}\n-\n-void CameraWorker::start()\n-{\n-\tThread::start();\n-}\n-\n-void CameraWorker::stop()\n-{\n-\texit();\n-\twait();\n-}\n-\n-void CameraWorker::run()\n-{\n-\texec();\n-\tdispatchMessages(Message::Type::InvokeMessage);\n-}\n-\n-void CameraWorker::queueRequest(CaptureRequest *request)\n-{\n-\t/* Async process the request on the worker which runs its own thread. */\n-\tworker_.invokeMethod(&Worker::processRequest, ConnectionTypeQueued,\n-\t\t\t request);\n-}\n-\n-/*\n- * \\class CameraWorker::Worker\n- * \\brief Process a CaptureRequest handling acquisition fences\n- */\n-int CameraWorker::Worker::waitFence(int fence)\n-{\n-\t/*\n-\t * \\todo Better characterize the timeout. Currently equal to the one\n-\t * used by the Rockchip Camera HAL on ChromeOS.\n-\t */\n-\tconstexpr unsigned int timeoutMs = 300;\n-\tstruct pollfd fds = { fence, POLLIN, 0 };\n-\n-\tdo {\n-\t\tint ret = poll(&fds, 1, timeoutMs);\n-\t\tif (ret == 0)\n-\t\t\treturn -ETIME;\n-\n-\t\tif (ret > 0) {\n-\t\t\tif (fds.revents & (POLLERR | POLLNVAL))\n-\t\t\t\treturn -EINVAL;\n-\n-\t\t\treturn 0;\n-\t\t}\n-\t} while (errno == EINTR || errno == EAGAIN);\n-\n-\treturn -errno;\n-}\n-\n-void CameraWorker::Worker::processRequest(CaptureRequest *request)\n-{\n-\t/* Wait on all fences before queuing the Request. */\n-\tfor (int fence : request->fences()) {\n-\t\tif (fence == -1)\n-\t\t\tcontinue;\n-\n-\t\tint ret = waitFence(fence);\n-\t\tclose(fence);\n-\t\tif (ret < 0) {\n-\t\t\tLOG(HAL, Error) << \"Failed waiting for fence: \"\n-\t\t\t\t\t<< fence << \": \" << strerror(-ret);\n-\t\t\treturn;\n-\t\t}\n-\t}\n-\n-\trequest->queue();\n-}\ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\ndeleted file mode 100644\nindex 26ecc2732046..000000000000\n--- a/src/android/camera_worker.h\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2020, Google Inc.\n- *\n- * camera_worker.h - Process capture requests on behalf of the Camera HAL\n- */\n-\n-#pragma once\n-\n-#include <memory>\n-#include <stdint.h>\n-\n-#include <libcamera/base/object.h>\n-#include <libcamera/base/thread.h>\n-\n-#include <libcamera/camera.h>\n-#include <libcamera/framebuffer.h>\n-#include <libcamera/request.h>\n-#include <libcamera/stream.h>\n-\n-class CameraDevice;\n-\n-class CaptureRequest\n-{\n-public:\n-\tCaptureRequest(libcamera::Camera *camera, uint64_t cookie);\n-\n-\tconst std::vector<int> &fences() const { return acquireFences_; }\n-\tlibcamera::ControlList &controls() { return request_->controls(); }\n-\tconst libcamera::ControlList &metadata() const\n-\t{\n-\t\treturn request_->metadata();\n-\t}\n-\tunsigned long cookie() const { return request_->cookie(); }\n-\n-\tvoid addBuffer(libcamera::Stream *stream,\n-\t\t libcamera::FrameBuffer *buffer, int fence);\n-\tvoid queue();\n-\n-private:\n-\tlibcamera::Camera *camera_;\n-\tstd::vector<int> acquireFences_;\n-\tstd::unique_ptr<libcamera::Request> request_;\n-};\n-\n-class CameraWorker : private libcamera::Thread\n-{\n-public:\n-\tCameraWorker();\n-\n-\tvoid start();\n-\tvoid stop();\n-\n-\tvoid queueRequest(CaptureRequest *request);\n-\n-protected:\n-\tvoid run() override;\n-\n-private:\n-\tclass Worker : public libcamera::Object\n-\t{\n-\tpublic:\n-\t\tvoid processRequest(CaptureRequest *request);\n-\n-\tprivate:\n-\t\tint waitFence(int fence);\n-\t};\n-\n-\tWorker worker_;\n-};\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 332b177ca805..75b4bf207085 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -47,7 +47,6 @@ android_hal_sources = files([\n 'camera_ops.cpp',\n 'camera_request.cpp',\n 'camera_stream.cpp',\n- 'camera_worker.cpp',\n 'jpeg/encoder_libjpeg.cpp',\n 'jpeg/exif.cpp',\n 'jpeg/post_processor_jpeg.cpp',\n", "prefixes": [ "libcamera-devel", "v3", "11/11" ] }