[{"id":3895,"web_url":"https://patchwork.libcamera.org/comment/3895/","msgid":"<20200302163848.GS11960@pendragon.ideasonboard.com>","date":"2020-03-02T16:38:48","subject":"Re: [libcamera-devel] [PATCH] libcamera: Move generated control and\n\tproperry ids to the API","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Mon, Mar 02, 2020 at 04:35:50PM +0000, Kieran Bingham wrote:\n> As part of updating controls to support properties, the commit\n> f870591a9bf5 (\"libcamera: properties: Add location property\")\n> inadvertently moved the generated headers out of the libcamera_api\n> dependency generation.\n> \n> This allowed a race condition to occur in builds where objects are\n> attempted to be built before the API definitions had been generated.\n> \n> Move the headers out of the libcamera_sources variable and into the\n> libcamera_api variable to match the other headers in this location.\n> \n> Fixes: f870591a9bf5 (\"libcamera: properties: Add location property\")\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> include/libcamera/meson.build | 2 ++\n> src/libcamera/meson.build | 1 -\n> 2 files changed, 2 insertions(+), 1 deletion(-)\n> \n> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> index f58c02d2cf35..c02e1d250aff 100644\n> --- a/include/libcamera/meson.build\n> +++ b/include/libcamera/meson.build\n> @@ -43,6 +43,8 @@ foreach header : control_source_files\n> install_dir : join_paths('include', include_dir))\n> endforeach\n> \n> +libcamera_api += control_headers\n> +\n> gen_header = files('gen-header.sh')\n> \n> libcamera_h = custom_target('gen-header',\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 88658ac563f7..b3a6a1aad659 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -80,7 +80,6 @@ foreach source : control_source_files\n> command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n> endforeach\n> \n> -libcamera_sources += control_headers\n> libcamera_sources += control_sources\n\ncontrol_ids_h used to be in both libcamera_api and libcamera_sources. Is\nthe latter not needed ?\n\n> \n> gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')","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 BBB9E62710\n\tfor ;\n\tMon, 2 Mar 2020 17:39:13 +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 29A8A9D0;\n\tMon, 2 Mar 2020 17:39:13 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583167153;\n\tbh=fhU5Kd4GkQR6tf36emWZolZVJ8tm1QsU3Ygr40gd7kk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=OPtmpRvmL3WP2qfhAjDDSaZWFpcHf9N2XsXTgx0e4neDyi6npPXIchHggGULUIT6G\n\tc8341KqfishgHGp+PnaA7LMts4SpWLjFrgq+ohfujNjfw6Fukz6PI5iQ/W5dMSESK6\n\tORYL3AQ6aKAUp7Z04OXABSAgMUIa8JrM1j+DYk4A=","Date":"Mon, 2 Mar 2020 18:38:48 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera devel ","Message-ID":"<20200302163848.GS11960@pendragon.ideasonboard.com>","References":"<20200302163550.11640-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200302163550.11640-1-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] libcamera: Move generated control and\n\tproperry ids to the API","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, 02 Mar 2020 16:39:13 -0000"}},{"id":3898,"web_url":"https://patchwork.libcamera.org/comment/3898/","msgid":"<877d700f-38e6-f53d-9696-5cfdc391697f@ideasonboard.com>","date":"2020-03-02T17:14:58","subject":"Re: [libcamera-devel] [PATCH] libcamera: Move generated control and\n\tproperry ids to the API","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 02/03/2020 16:38, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Mon, Mar 02, 2020 at 04:35:50PM +0000, Kieran Bingham wrote:\n>> As part of updating controls to support properties, the commit\n>> f870591a9bf5 (\"libcamera: properties: Add location property\")\n>> inadvertently moved the generated headers out of the libcamera_api\n>> dependency generation.\n>>\n>> This allowed a race condition to occur in builds where objects are\n>> attempted to be built before the API definitions had been generated.\n>>\n>> Move the headers out of the libcamera_sources variable and into the\n>> libcamera_api variable to match the other headers in this location.\n>>\n>> Fixes: f870591a9bf5 (\"libcamera: properties: Add location property\")\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> include/libcamera/meson.build | 2 ++\n>> src/libcamera/meson.build | 1 -\n>> 2 files changed, 2 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n>> index f58c02d2cf35..c02e1d250aff 100644\n>> --- a/include/libcamera/meson.build\n>> +++ b/include/libcamera/meson.build\n>> @@ -43,6 +43,8 @@ foreach header : control_source_files\n>> install_dir : join_paths('include', include_dir))\n>> endforeach\n>> \n>> +libcamera_api += control_headers\n>> +\n>> gen_header = files('gen-header.sh')\n>> \n>> libcamera_h = custom_target('gen-header',\n>> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n>> index 88658ac563f7..b3a6a1aad659 100644\n>> --- a/src/libcamera/meson.build\n>> +++ b/src/libcamera/meson.build\n>> @@ -80,7 +80,6 @@ foreach source : control_source_files\n>> command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n>> endforeach\n>> \n>> -libcamera_sources += control_headers\n>> libcamera_sources += control_sources\n> \n> control_ids_h used to be in both libcamera_api and libcamera_sources. Is\n> the latter not needed ?\n\nlibcamera_api contains all of the public api headers generated in\ninclude/libcamera/meson.build.\n\nNo other header from that list is explicitly added to libcamera_sources,\nso, no I do not believe these headers should be added to libcamera_sources.\n\nI've tested that the headers still get installed (because of being in\nthe libcamera_api variable) ... however I have since hit this race again\nwith the RKISP1 pipeline handler, thus where I believed this was an\nissue of the headers not being in the libcamera_api was wrong.\n\nWe likely need to create a separate dependency declaration to make sure\nthose headers are created early on.\n\nI'll look at this again later.. but for now this patch isn't a solution.\n\n\n> \n>> \n>> gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')\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 AA767627B6\n\tfor ;\n\tMon, 2 Mar 2020 18:15:03 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F6829D0;\n\tMon, 2 Mar 2020 18:15:03 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583169303;\n\tbh=FPwwdE9Kr9HA7GUpT5OoOqDCacZab4OKtTfUQb8v96A=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=qRhoO98ns/uElZGDDjzL9LhiveEwDVZl+J1REywlravTKDGkU+E2P98+UU8JwTTbA\n\t3BV1BzvLj2QiatONeuQKFxJciJlegb9YmZdVPARX1B0CtgUWNRK2JEa6PJxNvyASqR\n\t8PIr4CAjv4ebzhW3mCQejO1cueUVr6L6Y59PI8Ds=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"libcamera devel ","References":"<20200302163550.11640-1-kieran.bingham@ideasonboard.com>\n\t<20200302163848.GS11960@pendragon.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":"<877d700f-38e6-f53d-9696-5cfdc391697f@ideasonboard.com>","Date":"Mon, 2 Mar 2020 17:14:58 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200302163848.GS11960@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH] libcamera: Move generated control and\n\tproperry ids to the API","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, 02 Mar 2020 17:15:03 -0000"}}]