[{"id":3324,"web_url":"https://patchwork.libcamera.org/comment/3324/","msgid":"","date":"2020-01-06T16:53:31","subject":"Re: [libcamera-devel] [PATCH 1/4] v4l2: compat_manager: Move file\n\toperations to new struct FileOperations","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 06/01/2020 16:14, Laurent Pinchart wrote:\n> Create a new FileOperations structure to hold all the dynamically-loaded\n> C library file operations. The file operations are now exposed publicly,\n> to prepare for usage of mmap in the V4L2CameraProxy.\n> \n> A new template helper function is added to retrieve a symbol with\n> dlsym() with proper casting to simplify the V4L2CompatManager\n> constructor.\n\nI like this,\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/v4l2/v4l2_compat_manager.cpp | 34 ++++++++++++++++++++------------\n> src/v4l2/v4l2_compat_manager.h | 34 +++++++++++++++++++-------------\n> 2 files changed, 41 insertions(+), 27 deletions(-)\n> \n> diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp\n> index a3d693745dd6..fe453445a9fb 100644\n> --- a/src/v4l2/v4l2_compat_manager.cpp\n> +++ b/src/v4l2/v4l2_compat_manager.cpp\n> @@ -28,15 +28,23 @@ using namespace libcamera;\n> \n> LOG_DEFINE_CATEGORY(V4L2Compat)\n> \n> +namespace {\n> +template\n> +void get_symbol(T &func, const char *name)\n> +{\n> +\tfunc = reinterpret_cast(dlsym(RTLD_NEXT, name));\n> +}\n> +} /* namespace */\n> +\n> V4L2CompatManager::V4L2CompatManager()\n> \t: cm_(nullptr), initialized_(false)\n> {\n> -\topenat_func_ = (openat_func_t)dlsym(RTLD_NEXT, \"openat\");\n> -\tdup_func_ = (dup_func_t )dlsym(RTLD_NEXT, \"dup\");\n> -\tclose_func_ = (close_func_t )dlsym(RTLD_NEXT, \"close\");\n> -\tioctl_func_ = (ioctl_func_t )dlsym(RTLD_NEXT, \"ioctl\");\n> -\tmmap_func_ = (mmap_func_t )dlsym(RTLD_NEXT, \"mmap\");\n> -\tmunmap_func_ = (munmap_func_t)dlsym(RTLD_NEXT, \"munmap\");\n> +\tget_symbol(fops_.openat, \"openat\");\n> +\tget_symbol(fops_.dup, \"dup\");\n> +\tget_symbol(fops_.close, \"close\");\n> +\tget_symbol(fops_.ioctl, \"ioctl\");\n> +\tget_symbol(fops_.mmap, \"mmap\");\n> +\tget_symbol(fops_.munmap, \"munmap\");\n> }\n> \n> V4L2CompatManager::~V4L2CompatManager()\n> @@ -141,7 +149,7 @@ int V4L2CompatManager::getCameraIndex(int fd)\n> \n> int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mode)\n> {\n> -\tint fd = openat_func_(dirfd, path, oflag, mode);\n> +\tint fd = fops_.openat(dirfd, path, oflag, mode);\n> \tif (fd < 0)\n> \t\treturn fd;\n> \n> @@ -160,7 +168,7 @@ int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mod\n> \t\treturn fd;\n> \t}\n> \n> -\tclose_func_(fd);\n> +\tfops_.close(fd);\n> \n> \tunsigned int camera_index = static_cast(ret);\n> \n> @@ -182,7 +190,7 @@ int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mod\n> \n> int V4L2CompatManager::dup(int oldfd)\n> {\n> -\tint newfd = dup_func_(oldfd);\n> +\tint newfd = fops_.dup(oldfd);\n> \tif (newfd < 0)\n> \t\treturn newfd;\n> \n> @@ -205,7 +213,7 @@ int V4L2CompatManager::close(int fd)\n> \t\treturn 0;\n> \t}\n> \n> -\treturn close_func_(fd);\n> +\treturn fops_.close(fd);\n> }\n> \n> void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags,\n> @@ -213,7 +221,7 @@ void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags,\n> {\n> \tV4L2CameraProxy *proxy = getProxy(fd);\n> \tif (!proxy)\n> -\t\treturn mmap_func_(addr, length, prot, flags, fd, offset);\n> +\t\treturn fops_.mmap(addr, length, prot, flags, fd, offset);\n> \n> \tvoid *map = proxy->mmap(length, prot, flags, offset);\n> \tif (map == MAP_FAILED)\n> @@ -227,7 +235,7 @@ int V4L2CompatManager::munmap(void *addr, size_t length)\n> {\n> \tauto device = mmaps_.find(addr);\n> \tif (device == mmaps_.end())\n> -\t\treturn munmap_func_(addr, length);\n> +\t\treturn fops_.munmap(addr, length);\n> \n> \tV4L2CameraProxy *proxy = device->second;\n> \n> @@ -244,7 +252,7 @@ int V4L2CompatManager::ioctl(int fd, unsigned long request, void *arg)\n> {\n> \tV4L2CameraProxy *proxy = getProxy(fd);\n> \tif (!proxy)\n> -\t\treturn ioctl_func_(fd, request, arg);\n> +\t\treturn fops_.ioctl(fd, request, arg);\n> \n> \treturn proxy->ioctl(request, arg);\n> }\n> diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h\n> index dd9d321078e4..d51b5953d930 100644\n> --- a/src/v4l2/v4l2_compat_manager.h\n> +++ b/src/v4l2/v4l2_compat_manager.h\n> @@ -26,11 +26,30 @@ using namespace libcamera;\n> class V4L2CompatManager : public Thread\n> {\n> public:\n> +\tstruct FileOperations {\n> +\t\tusing openat_func_t = int (*)(int dirfd, const char *path,\n> +\t\t\t\t\t int oflag, ...);\n> +\t\tusing dup_func_t = int (*)(int oldfd);\n> +\t\tusing close_func_t = int (*)(int fd);\n> +\t\tusing ioctl_func_t = int (*)(int fd, unsigned long request, ...);\n> +\t\tusing mmap_func_t = void *(*)(void *addr, size_t length, int prot,\n> +\t\t\t\t\t int flags, int fd, off_t offset);\n> +\t\tusing munmap_func_t = int (*)(void *addr, size_t length);\n> +\n> +\t\topenat_func_t openat;\n> +\t\tdup_func_t dup;\n> +\t\tclose_func_t close;\n> +\t\tioctl_func_t ioctl;\n> +\t\tmmap_func_t mmap;\n> +\t\tmunmap_func_t munmap;\n> +\t};\n> +\n> \tstatic V4L2CompatManager *instance();\n> \n> \tint init();\n> \n> \tV4L2CameraProxy *getProxy(int fd);\n> +\tconst FileOperations &fops() const { return fops_; }\n> \n> \tint openat(int dirfd, const char *path, int oflag, mode_t mode);\n> \n> @@ -48,20 +67,7 @@ private:\n> \tvoid run() override;\n> \tint getCameraIndex(int fd);\n> \n> -\ttypedef int (*openat_func_t)(int dirfd, const char *path, int oflag, ...);\n> -\ttypedef int (*dup_func_t)(int oldfd);\n> -\ttypedef int (*close_func_t)(int fd);\n> -\ttypedef int (*ioctl_func_t)(int fd, unsigned long request, ...);\n> -\ttypedef void *(*mmap_func_t)(void *addr, size_t length, int prot,\n> -\t\t\t\t int flags, int fd, off_t offset);\n> -\ttypedef int (*munmap_func_t)(void *addr, size_t length);\n> -\n> -\topenat_func_t openat_func_;\n> -\tdup_func_t dup_func_;\n> -\tclose_func_t close_func_;\n> -\tioctl_func_t ioctl_func_;\n> -\tmmap_func_t mmap_func_;\n> -\tmunmap_func_t munmap_func_;\n> +\tFileOperations fops_;\n> \n> \tCameraManager *cm_;\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 B092960612\n\tfor ;\n\tMon, 6 Jan 2020 17:53:34 +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 4203E52F;\n\tMon, 6 Jan 2020 17:53:34 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578329614;\n\tbh=NUSXvmNxEh6/edqhTID7NA70QPBaW8QvGDi4wHUpAXA=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=jRqvBEycuNZTC5AI/JEf6pgTW+JWJ55TS8+3VunX8j/R3VnRC/36G9U4de7CNm3AO\n\t4IR7mMUjOJz14cThTBt+rJs6N7ciefS4dh61lbSANfHCLGk1q6SHhwbQX8oRCtXvM4\n\tqTH8IiVFbceGOnZVogx/G5uO4TtrGpj7Ig1raqFw=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>\n\t<20200106161417.19150-2-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Mon, 6 Jan 2020 16:53:31 +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":"<20200106161417.19150-2-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/4] v4l2: compat_manager: Move file\n\toperations to new struct FileOperations","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, 06 Jan 2020 16:53:34 -0000"}},{"id":3356,"web_url":"https://patchwork.libcamera.org/comment/3356/","msgid":"<20200107172141.GA533370@oden.dyn.berto.se>","date":"2020-01-07T17:21:41","subject":"Re: [libcamera-devel] [PATCH 1/4] v4l2: compat_manager: Move file\n\toperations to new struct FileOperations","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-06 18:14:14 +0200, Laurent Pinchart wrote:\n> Create a new FileOperations structure to hold all the dynamically-loaded\n> C library file operations. The file operations are now exposed publicly,\n> to prepare for usage of mmap in the V4L2CameraProxy.\n> \n> A new template helper function is added to retrieve a symbol with\n> dlsym() with proper casting to simplify the V4L2CompatManager\n> constructor.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/v4l2/v4l2_compat_manager.cpp | 34 ++++++++++++++++++++------------\n> src/v4l2/v4l2_compat_manager.h | 34 +++++++++++++++++++-------------\n> 2 files changed, 41 insertions(+), 27 deletions(-)\n> \n> diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp\n> index a3d693745dd6..fe453445a9fb 100644\n> --- a/src/v4l2/v4l2_compat_manager.cpp\n> +++ b/src/v4l2/v4l2_compat_manager.cpp\n> @@ -28,15 +28,23 @@ using namespace libcamera;\n> \n> LOG_DEFINE_CATEGORY(V4L2Compat)\n> \n> +namespace {\n> +template\n> +void get_symbol(T &func, const char *name)\n> +{\n> +\tfunc = reinterpret_cast(dlsym(RTLD_NEXT, name));\n> +}\n> +} /* namespace */\n> +\n> V4L2CompatManager::V4L2CompatManager()\n> \t: cm_(nullptr), initialized_(false)\n> {\n> -\topenat_func_ = (openat_func_t)dlsym(RTLD_NEXT, \"openat\");\n> -\tdup_func_ = (dup_func_t )dlsym(RTLD_NEXT, \"dup\");\n> -\tclose_func_ = (close_func_t )dlsym(RTLD_NEXT, \"close\");\n> -\tioctl_func_ = (ioctl_func_t )dlsym(RTLD_NEXT, \"ioctl\");\n> -\tmmap_func_ = (mmap_func_t )dlsym(RTLD_NEXT, \"mmap\");\n> -\tmunmap_func_ = (munmap_func_t)dlsym(RTLD_NEXT, \"munmap\");\n> +\tget_symbol(fops_.openat, \"openat\");\n> +\tget_symbol(fops_.dup, \"dup\");\n> +\tget_symbol(fops_.close, \"close\");\n> +\tget_symbol(fops_.ioctl, \"ioctl\");\n> +\tget_symbol(fops_.mmap, \"mmap\");\n> +\tget_symbol(fops_.munmap, \"munmap\");\n> }\n> \n> V4L2CompatManager::~V4L2CompatManager()\n> @@ -141,7 +149,7 @@ int V4L2CompatManager::getCameraIndex(int fd)\n> \n> int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mode)\n> {\n> -\tint fd = openat_func_(dirfd, path, oflag, mode);\n> +\tint fd = fops_.openat(dirfd, path, oflag, mode);\n> \tif (fd < 0)\n> \t\treturn fd;\n> \n> @@ -160,7 +168,7 @@ int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mod\n> \t\treturn fd;\n> \t}\n> \n> -\tclose_func_(fd);\n> +\tfops_.close(fd);\n> \n> \tunsigned int camera_index = static_cast(ret);\n> \n> @@ -182,7 +190,7 @@ int V4L2CompatManager::openat(int dirfd, const char *path, int oflag, mode_t mod\n> \n> int V4L2CompatManager::dup(int oldfd)\n> {\n> -\tint newfd = dup_func_(oldfd);\n> +\tint newfd = fops_.dup(oldfd);\n> \tif (newfd < 0)\n> \t\treturn newfd;\n> \n> @@ -205,7 +213,7 @@ int V4L2CompatManager::close(int fd)\n> \t\treturn 0;\n> \t}\n> \n> -\treturn close_func_(fd);\n> +\treturn fops_.close(fd);\n> }\n> \n> void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags,\n> @@ -213,7 +221,7 @@ void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags,\n> {\n> \tV4L2CameraProxy *proxy = getProxy(fd);\n> \tif (!proxy)\n> -\t\treturn mmap_func_(addr, length, prot, flags, fd, offset);\n> +\t\treturn fops_.mmap(addr, length, prot, flags, fd, offset);\n> \n> \tvoid *map = proxy->mmap(length, prot, flags, offset);\n> \tif (map == MAP_FAILED)\n> @@ -227,7 +235,7 @@ int V4L2CompatManager::munmap(void *addr, size_t length)\n> {\n> \tauto device = mmaps_.find(addr);\n> \tif (device == mmaps_.end())\n> -\t\treturn munmap_func_(addr, length);\n> +\t\treturn fops_.munmap(addr, length);\n> \n> \tV4L2CameraProxy *proxy = device->second;\n> \n> @@ -244,7 +252,7 @@ int V4L2CompatManager::ioctl(int fd, unsigned long request, void *arg)\n> {\n> \tV4L2CameraProxy *proxy = getProxy(fd);\n> \tif (!proxy)\n> -\t\treturn ioctl_func_(fd, request, arg);\n> +\t\treturn fops_.ioctl(fd, request, arg);\n> \n> \treturn proxy->ioctl(request, arg);\n> }\n> diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h\n> index dd9d321078e4..d51b5953d930 100644\n> --- a/src/v4l2/v4l2_compat_manager.h\n> +++ b/src/v4l2/v4l2_compat_manager.h\n> @@ -26,11 +26,30 @@ using namespace libcamera;\n> class V4L2CompatManager : public Thread\n> {\n> public:\n> +\tstruct FileOperations {\n> +\t\tusing openat_func_t = int (*)(int dirfd, const char *path,\n> +\t\t\t\t\t int oflag, ...);\n> +\t\tusing dup_func_t = int (*)(int oldfd);\n> +\t\tusing close_func_t = int (*)(int fd);\n> +\t\tusing ioctl_func_t = int (*)(int fd, unsigned long request, ...);\n> +\t\tusing mmap_func_t = void *(*)(void *addr, size_t length, int prot,\n> +\t\t\t\t\t int flags, int fd, off_t offset);\n> +\t\tusing munmap_func_t = int (*)(void *addr, size_t length);\n> +\n> +\t\topenat_func_t openat;\n> +\t\tdup_func_t dup;\n> +\t\tclose_func_t close;\n> +\t\tioctl_func_t ioctl;\n> +\t\tmmap_func_t mmap;\n> +\t\tmunmap_func_t munmap;\n> +\t};\n> +\n> \tstatic V4L2CompatManager *instance();\n> \n> \tint init();\n> \n> \tV4L2CameraProxy *getProxy(int fd);\n> +\tconst FileOperations &fops() const { return fops_; }\n> \n> \tint openat(int dirfd, const char *path, int oflag, mode_t mode);\n> \n> @@ -48,20 +67,7 @@ private:\n> \tvoid run() override;\n> \tint getCameraIndex(int fd);\n> \n> -\ttypedef int (*openat_func_t)(int dirfd, const char *path, int oflag, ...);\n> -\ttypedef int (*dup_func_t)(int oldfd);\n> -\ttypedef int (*close_func_t)(int fd);\n> -\ttypedef int (*ioctl_func_t)(int fd, unsigned long request, ...);\n> -\ttypedef void *(*mmap_func_t)(void *addr, size_t length, int prot,\n> -\t\t\t\t int flags, int fd, off_t offset);\n> -\ttypedef int (*munmap_func_t)(void *addr, size_t length);\n> -\n> -\topenat_func_t openat_func_;\n> -\tdup_func_t dup_func_;\n> -\tclose_func_t close_func_;\n> -\tioctl_func_t ioctl_func_;\n> -\tmmap_func_t mmap_func_;\n> -\tmunmap_func_t munmap_func_;\n> +\tFileOperations fops_;\n> \n> \tCameraManager *cm_;\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-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5C14A6063B\n\tfor ;\n\tTue, 7 Jan 2020 18:21:43 +0100 (CET)","by mail-lf1-x144.google.com with SMTP id v201so268576lfa.11\n\tfor ;\n\tTue, 07 Jan 2020 09:21:43 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\tg85sm148939lfd.66.2020.01.07.09.21.41\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 07 Jan 2020 09:21:41 -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=4I7Pq7sLmaRXBA8jjiaEG0mbW46+hh5BHY2n2ZrTg34=;\n\tb=oG68usXRPZJWLsKI2Cnk968zJuRUgXQQ9SRdXPdNAbmxfY/DxBqBoEymHIcY9DXvnB\n\tinfrQCjHc3/t/72Yb0TqhXE35ju+ObpNeE851sbjZeccpRfkV1n35mqjjEzJAz8aPJdF\n\t1DoO2g+5SWLHaj750Xyl7bA6ixqJY7482F8dFvpWXUrnfEAj6oYgyjlpJKXYVUMkyyGb\n\t3oqkb2Kzbl/LAJqez6lLM6yfvSz0yYknImQAdjK70S6dueB/A3vkBXaNbo8BmTH1eRMx\n\tVdYuIQPj1SFYJiJtNvsyAJPCUB7603um8QO6CSQbdyiLJCcf1lhqeBYHKAgHK4x4GX43\n\to8xg==","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=4I7Pq7sLmaRXBA8jjiaEG0mbW46+hh5BHY2n2ZrTg34=;\n\tb=UBocUjm3jS6yI8Hp0ThhcG/xSV+A6RqKGbJlNB5KPDQ+5o8q0HfIvxp+B3zE2STQH4\n\tK/KX83nfbqeuPnYZ1COZLeaxu1KddabXDuljKl2WUI9q8izSNjRdJhO7FdhBI3ik9Dgz\n\tRWyrmN6hkN7sM9bMv0mSpfHb1p+RJI8TFdN0UEPGbLRDgUnejW9dq0aRBUAsLh65WWvH\n\tnS9Hm4wtqNgZTe4OI4sc9/Gtc1xPTLVuvpiUgWUR8N33Top5PUdy5mOF/xCeMCN2CmkN\n\tR7xFuz3RDUjv275K8OYPFizhXZZXcU29kslDRs9HWxGzU393+SkBdB/i+OduT+7E3aSD\n\tocMA==","X-Gm-Message-State":"APjAAAXmfQUcJ4ZxCDLJa6kXkxF46cttUM+sZWXOvG/DVs0Wb25J5pvT\n\t34eb0bcHaUU86I7oPvOICwzeDQ==","X-Google-Smtp-Source":"APXvYqyV6ILNgen68ul5pebCroLADZXXGsTFufOUSgoVOmds6EyrQp68qWQ/P9TnCPjxGeC4jJu53g==","X-Received":"by 2002:a19:4ac2:: with SMTP id\n\tx185mr312821lfa.131.1578417702502; \n\tTue, 07 Jan 2020 09:21:42 -0800 (PST)","Date":"Tue, 7 Jan 2020 18:21:41 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200107172141.GA533370@oden.dyn.berto.se>","References":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>\n\t<20200106161417.19150-2-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":"<20200106161417.19150-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/4] v4l2: compat_manager: Move file\n\toperations to new struct FileOperations","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":"Tue, 07 Jan 2020 17:21:43 -0000"}}]