[{"id":3585,"web_url":"https://patchwork.libcamera.org/comment/3585/","msgid":"","date":"2020-01-23T10:10:01","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: thread: Support\n\ttimeout in wait() function","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent\n\nOn 23/01/2020 02:55, Laurent Pinchart wrote:\n> Add a parameter to the Thread::wait() function to wait with a timeout.\n> The delay value waits forever.\n\nI presume you mean\n\n\"No delay value waits forever\"\n or\n\"The delay value utils::duration::max() waits forever.\"\n\n\nWith that fixed up,\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/include/thread.h | 4 +++-\n> src/libcamera/thread.cpp | 28 +++++++++++++++++++++++++---\n> 2 files changed, 28 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/include/thread.h b/src/libcamera/include/thread.h\n> index 819a9879ac56..d700f111a3ae 100644\n> --- a/src/libcamera/include/thread.h\n> +++ b/src/libcamera/include/thread.h\n> @@ -14,6 +14,8 @@\n> \n> #include \n> \n> +#include \"utils.h\"\n> +\n> namespace libcamera {\n> \n> class EventDispatcher;\n> @@ -33,7 +35,7 @@ public:\n> \n> \tvoid start();\n> \tvoid exit(int code = 0);\n> -\tvoid wait();\n> +\tbool wait(utils::duration duration = utils::duration::max());\n> \n> \tbool isRunning();\n> \n> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\n> index fe32cd677596..22ab41f847db 100644\n> --- a/src/libcamera/thread.cpp\n> +++ b/src/libcamera/thread.cpp\n> @@ -8,6 +8,7 @@\n> #include \"thread.h\"\n> \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -71,6 +72,7 @@ private:\n> \n> \tstd::atomic dispatcher_;\n> \n> +\tstd::condition_variable cv_;\n> \tstd::atomic exit_;\n> \tint exitCode_;\n> \n> @@ -248,6 +250,7 @@ void Thread::finishThread()\n> \tdata_->mutex_.unlock();\n> \n> \tfinished.emit(this);\n> +\tdata_->cv_.notify_all();\n> }\n> \n> /**\n> @@ -274,14 +277,33 @@ void Thread::exit(int code)\n> \n> /**\n> * \\brief Wait for the thread to finish\n> + * \\param[in] duration Maximum wait duration\n> *\n> - * This method waits until the thread finishes, or returns immediately if the\n> - * thread is not running.\n> + * This function waits until the thread finishes or the \\a duration has\n> + * elapsed, whichever happens first. If \\a duration is equal to\n> + * utils::duration::max(), the wait never times out. If the thread is not\n> + * running the function returns immediately.\n> + *\n> + * \\return True if the thread has finished, or false if the wait timed out\n> */\n> -void Thread::wait()\n> +bool Thread::wait(utils::duration duration)\n> {\n> +\tbool timeout = false;\n> +\n> +\t{\n> +\t\tMutexLocker locker(data_->mutex_);\n> +\n> +\t\tif (duration == utils::duration::max())\n> +\t\t\tdata_->cv_.wait(locker, [&]() { return !data_->running_; });\n> +\t\telse\n> +\t\t\ttimeout = !data_->cv_.wait_for(locker, duration,\n> +\t\t\t\t\t\t [&]() { return !data_->running_; });\n> +\t}\n> +\n> \tif (thread_.joinable())\n> \t\tthread_.join();\n> +\n> +\treturn timeout;\n> }\n> \n> /**\n>","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 895786044F\n\tfor ;\n\tThu, 23 Jan 2020 11:10:05 +0100 (CET)","from [192.168.0.65]\n\t(cpc85452-aztw29-2-0-cust211.18-1.cable.virginm.net [82.38.172.212])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D91E42E5;\n\tThu, 23 Jan 2020 11:10:04 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1579774205;\n\tbh=5/F+loUt8q4ousOk0xRFTltSf6cWaGVkphHY0TlqG7A=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=sGAYf39DLb44KJOn7L7fd2epJ6vB8drL7Xy63phwsMMqjP7NI7KF2aGL/UpkorZkw\n\tHdv1z8J85Av//eyl3EGy5qy3+U//WIcYgKmu62dtvcxCmXIU3qACDOS0gB3I6RGhN9\n\tbRPAIZvXiYG00fCBfFcs8JCBEsRfteQxSfmvJjhs=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200123025520.12149-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 23 Jan 2020 10:10:01 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.0","MIME-Version":"1.0","In-Reply-To":"<20200123025520.12149-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: thread: Support\n\ttimeout in wait() function","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 10:10:05 -0000"}},{"id":3644,"web_url":"https://patchwork.libcamera.org/comment/3644/","msgid":"<20200210210959.GA2429426@oden.dyn.berto.se>","date":"2020-02-10T21:09:59","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: thread: Support\n\ttimeout in wait() function","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 your patch.\n\nOn 2020-01-23 04:55:19 +0200, Laurent Pinchart wrote:\n> Add a parameter to the Thread::wait() function to wait with a timeout.\n> The delay value waits forever.\n> \n> Signed-off-by: Laurent Pinchart \n\nWith the commit message fixed as pointer out by Kieran,\n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/include/thread.h | 4 +++-\n> src/libcamera/thread.cpp | 28 +++++++++++++++++++++++++---\n> 2 files changed, 28 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/include/thread.h b/src/libcamera/include/thread.h\n> index 819a9879ac56..d700f111a3ae 100644\n> --- a/src/libcamera/include/thread.h\n> +++ b/src/libcamera/include/thread.h\n> @@ -14,6 +14,8 @@\n> \n> #include \n> \n> +#include \"utils.h\"\n> +\n> namespace libcamera {\n> \n> class EventDispatcher;\n> @@ -33,7 +35,7 @@ public:\n> \n> \tvoid start();\n> \tvoid exit(int code = 0);\n> -\tvoid wait();\n> +\tbool wait(utils::duration duration = utils::duration::max());\n> \n> \tbool isRunning();\n> \n> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\n> index fe32cd677596..22ab41f847db 100644\n> --- a/src/libcamera/thread.cpp\n> +++ b/src/libcamera/thread.cpp\n> @@ -8,6 +8,7 @@\n> #include \"thread.h\"\n> \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -71,6 +72,7 @@ private:\n> \n> \tstd::atomic dispatcher_;\n> \n> +\tstd::condition_variable cv_;\n> \tstd::atomic exit_;\n> \tint exitCode_;\n> \n> @@ -248,6 +250,7 @@ void Thread::finishThread()\n> \tdata_->mutex_.unlock();\n> \n> \tfinished.emit(this);\n> +\tdata_->cv_.notify_all();\n> }\n> \n> /**\n> @@ -274,14 +277,33 @@ void Thread::exit(int code)\n> \n> /**\n> * \\brief Wait for the thread to finish\n> + * \\param[in] duration Maximum wait duration\n> *\n> - * This method waits until the thread finishes, or returns immediately if the\n> - * thread is not running.\n> + * This function waits until the thread finishes or the \\a duration has\n> + * elapsed, whichever happens first. If \\a duration is equal to\n> + * utils::duration::max(), the wait never times out. If the thread is not\n> + * running the function returns immediately.\n> + *\n> + * \\return True if the thread has finished, or false if the wait timed out\n> */\n> -void Thread::wait()\n> +bool Thread::wait(utils::duration duration)\n> {\n> +\tbool timeout = false;\n> +\n> +\t{\n> +\t\tMutexLocker locker(data_->mutex_);\n> +\n> +\t\tif (duration == utils::duration::max())\n> +\t\t\tdata_->cv_.wait(locker, [&]() { return !data_->running_; });\n> +\t\telse\n> +\t\t\ttimeout = !data_->cv_.wait_for(locker, duration,\n> +\t\t\t\t\t\t [&]() { return !data_->running_; });\n> +\t}\n> +\n> \tif (thread_.joinable())\n> \t\tthread_.join();\n> +\n> +\treturn timeout;\n> }\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-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3680D60990\n\tfor ;\n\tMon, 10 Feb 2020 22:10:02 +0100 (CET)","by mail-lj1-x243.google.com with SMTP id f25so9005524ljg.12\n\tfor ;\n\tMon, 10 Feb 2020 13:10:02 -0800 (PST)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\tw9sm885556ljh.106.2020.02.10.13.09.59\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 10 Feb 2020 13:10:00 -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=yQBvupVXCkcokZTdaaO3flnV4QfC6Si85oltIQUirN4=;\n\tb=JeYhkZaCv1YnnEn92AQ6o7fTvpkPr1/Z6lyCSRCYNVDOCiRSeiTexlDTG2fvotCIq5\n\tOATSDd5hSAajGjQFwtyGL6Bp+qUn/3yBBg7uxlATMjLjKaaUHfktSI3MQUqsNjS/JB/K\n\tgW9qtFWw1X/meCAEPLA77x/yZWICgf5faoaevedbOF3BYraWR1GGEkMBM1X2U8Zqcu5i\n\t7LHSU1x0zRygbhpWN1lBcbUtBESr8SIACmEPDC9vSDefSyXKpqs+zlbeyFRM94Ja2rvG\n\tlepuleVYSnqo70zTSCXfXQWr6Xq1cXNJ21DApVArCOYXOoCbAZdLcJljluQwgXz9eMOn\n\ti5WA==","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=yQBvupVXCkcokZTdaaO3flnV4QfC6Si85oltIQUirN4=;\n\tb=mscoW5WxsBPpMDYY7BIi94NQd4cyVCntrejMu54EkFdjFKIYVZ9MEk3bPyyyMNKLQq\n\tw6MsyxxiP75UAJz9I4/+wbAyjTo0lbTPt2PLI4tuzMXS+s+0j5l+YIF++PKzdxcA/a4E\n\tLCTqG1hJHvvqqjqtrdFS0UHAcgE78ozuT+AZV4b4pObckJNTbCjQoKLNKgQK0i5JniLS\n\tsuf1KLMaVPWmi/6NLDqWEbT96N762MKM7RFmhZ1+JL185Ppli63I3OjSW/tXp+YPk9Ni\n\tZoj9kcD9CdLOfbBS+1eFFD1rsU9qnF0mTTpsbTawQq1jUSGqdKeiXDKr1UptDcmSSyr/\n\t60vg==","X-Gm-Message-State":"APjAAAVk/l6mXeosTuomb7yTebYaSkETXQiU6xCGWftC5Pli+vCw/tcJ\n\t5BMj6vrJh+n1oq6Gx2dCzav9iw==","X-Google-Smtp-Source":"APXvYqxywIfH2+CDEb752f5UXzG3D28mXSZKvzR8NLZSWXYGSqEYg9Kzl7MDfYv8wmWOTiqlpfSbbg==","X-Received":"by 2002:a2e:95c4:: with SMTP id y4mr2081828ljh.38.1581369000934; \n\tMon, 10 Feb 2020 13:10:00 -0800 (PST)","Date":"Mon, 10 Feb 2020 22:09:59 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200210210959.GA2429426@oden.dyn.berto.se>","References":"<20200123025520.12149-1-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":"<20200123025520.12149-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: thread: Support\n\ttimeout in wait() function","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":"Mon, 10 Feb 2020 21:10:02 -0000"}}]