[{"id":1033,"web_url":"https://patchwork.libcamera.org/comment/1033/","msgid":"<20190310134135.GI4814@pendragon.ideasonboard.com>","date":"2019-03-10T13:41:35","subject":"Re: [libcamera-devel] [PATCH 5/5] test: camera: Add state machine\n\ttest","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Wed, Mar 06, 2019 at 03:47:55AM +0100, Niklas Söderlund wrote:\n> Add a test of the different access level enforced by the state machine\n> inside the camera. The state machine aims to limit operations on the\n> camera to the cameras state.\n> \n> The test exercises all states of the camera and verifies that only the\n> intended operations are possible at each stage.\n> \n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nNice work !\n\n> ---\n>  test/camera/meson.build      |   1 +\n>  test/camera/statemachine.cpp | 275 +++++++++++++++++++++++++++++++++++\n>  2 files changed, 276 insertions(+)\n>  create mode 100644 test/camera/statemachine.cpp\n> \n> diff --git a/test/camera/meson.build b/test/camera/meson.build\n> index 6da297714f34a4e3..8f1cfe5a7a5c2884 100644\n> --- a/test/camera/meson.build\n> +++ b/test/camera/meson.build\n> @@ -3,6 +3,7 @@\n>  camera_tests = [\n>    [ 'format_default',        'format_default.cpp' ],\n>    [ 'format_set',            'format_set.cpp' ],\n> +  [ 'statemachine',          'statemachine.cpp' ],\n>    [ 'capture',               'capture.cpp' ],\n>  ]\n>  \n> diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp\n> new file mode 100644\n> index 0000000000000000..f4395f2b1bfed698\n> --- /dev/null\n> +++ b/test/camera/statemachine.cpp\n> @@ -0,0 +1,275 @@\n> +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * libcamera Camera API tests\n> + */\n> +\n> +#include <iostream>\n> +\n> +#include \"camera_test.h\"\n> +\n> +using namespace std;\n> +\n> +namespace {\n> +\n> +class Statemachine : public CameraTest\n> +{\n> +protected:\n> +\tint testAvailable()\n> +\t{\n> +\t\t/* Test operations which should fail. */\n> +\t\tif (camera_->configureStreams(defconf_) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->freeBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->createRequest())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->start() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tRequest request(camera_.get());\n> +\t\tif (camera_->queueRequest(&request) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->stop() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test operations which should pass. */\n> +\t\tif (camera_->release())\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test valid state transitions, end in Acquired state. */\n> +\t\tif (camera_->acquire())\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tint testAcquired()\n> +\t{\n> +\t\t/* Test operations which should fail. */\n> +\t\tif (camera_->acquire() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->freeBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->createRequest())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->start() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tRequest request(camera_.get());\n> +\t\tif (camera_->queueRequest(&request) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->stop() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test valid state transitions, end in Configured state. */\n> +\t\tif (camera_->release())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->acquire())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->configureStreams(defconf_))\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tint testConfigured()\n> +\t{\n> +\t\t/* Test operations which should fail. */\n> +\t\tif (camera_->acquire() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->freeBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->createRequest())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tRequest request(camera_.get());\n> +\t\tif (camera_->queueRequest(&request) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->start() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->stop() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test operations which should pass. */\n> +\t\tif (camera_->configureStreams(defconf_))\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test valid state transitions, end in Prepared state. */\n> +\t\tif (camera_->release())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->acquire())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->configureStreams(defconf_))\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers())\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tint testPrepared()\n> +\t{\n> +\t\t/* Test operations which should fail. */\n> +\t\tif (camera_->acquire() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->release() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->configureStreams(defconf_) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tRequest request1(camera_.get());\n> +\t\tif (camera_->queueRequest(&request1) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->stop() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test operations which should pass. */\n> +\t\tRequest *request2 = camera_->createRequest();\n> +\t\tif (!request2)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Never handed to hardware so need to manually delete it. */\n> +\t\tdelete request2;\n> +\n> +\t\t/* Test valid state transitions, end in Running state. */\n> +\t\tif (camera_->freeBuffers())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->release())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->acquire())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->configureStreams(defconf_))\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->start())\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tint testRuning()\n> +\t{\n> +\t\t/* Test operations which should fail. */\n> +\t\tif (camera_->acquire() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->release() != -EBUSY)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->configureStreams(defconf_) != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->allocateBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->freeBuffers() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->start() != -EACCES)\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test operations which should pass. */\n> +\t\tRequest *request = camera_->createRequest();\n> +\t\tif (!request)\n> +\t\t\treturn TestFail;\n> +\n> +\t\tStream *stream = *camera_->streams().begin();\n> +\t\tBufferPool &pool = stream->bufferPool();\n> +\t\tBuffer &buffer = pool.buffers().front();\n> +\t\tstd::map<Stream *, Buffer *> map = { { stream, &buffer } };\n> +\t\tif (request->setBuffers(map))\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->queueRequest(request))\n> +\t\t\treturn TestFail;\n> +\n> +\t\t/* Test valid state transitions, end in Available state. */\n> +\t\tif (camera_->stop())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->freeBuffers())\n> +\t\t\treturn TestFail;\n> +\n> +\t\tif (camera_->release())\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tint run()\n> +\t{\n> +\t\tStream *stream = *camera_->streams().begin();\n> +\t\tstd::set<Stream *> streams = { stream };\n> +\t\tdefconf_ = camera_->streamConfiguration(streams);\n> +\n> +\t\tif (testAvailable() != TestPass) {\n> +\t\t\tcout << \"State machine in Available state failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (testAcquired() != TestPass) {\n> +\t\t\tcout << \"State machine in Acquired state failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (testConfigured() != TestPass) {\n> +\t\t\tcout << \"State machine in Configured state failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (testPrepared() != TestPass) {\n> +\t\t\tcout << \"State machine in Prepared state failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (testRuning() != TestPass) {\n> +\t\t\tcout << \"State machine in Running state failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tstd::map<Stream *, StreamConfiguration> defconf_;\n> +};\n> +\n> +} /* namespace */\n> +\n> +TEST_REGISTER(Statemachine);","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F12CA600CB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 10 Mar 2019 14:41:41 +0100 (CET)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6F651255;\n\tSun, 10 Mar 2019 14:41:41 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1552225301;\n\tbh=iLhaJlioOE0japA1+n/L2vxd6vB1/9CuFHnDUWrmmYk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Zvbt5uLh1KfL92N9Ue8Oi6AeezTPukQLrtABzowX96FHFl9UhyjbPOKBgYxFhppwZ\n\tf/nmMvEI1PCq4FL1IqOw8Y/frIWkZLhzmqqSlADvtKr++1/U61L+liDU7p1XpBPRrF\n\tL22p7QNSWW73aqeVrWyd7HTQPuA/1wJAkjaetYwo=","Date":"Sun, 10 Mar 2019 15:41:35 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190310134135.GI4814@pendragon.ideasonboard.com>","References":"<20190306024755.28726-1-niklas.soderlund@ragnatech.se>\n\t<20190306024755.28726-6-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190306024755.28726-6-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 5/5] test: camera: Add state machine\n\ttest","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","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":"Sun, 10 Mar 2019 13:41:42 -0000"}}]