From 7088041a805d3be8a1d8b7d4c28cc1cecccf4396 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jan 2020 22:58:35 +0200 Subject: v4l2: compat_manager: Move file operations to new struct FileOperations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a new FileOperations structure to hold all the dynamically-loaded C library file operations. The file operations are now exposed publicly, to prepare for usage of mmap in the V4L2CameraProxy. A new template helper function is added to retrieve a symbol with dlsym() with proper casting to simplify the V4L2CompatManager constructor. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/v4l2/v4l2_compat_manager.h | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'src/v4l2/v4l2_compat_manager.h') diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h index dd9d3210..d51b5953 100644 --- a/src/v4l2/v4l2_compat_manager.h +++ b/src/v4l2/v4l2_compat_manager.h @@ -26,11 +26,30 @@ using namespace libcamera; class V4L2CompatManager : public Thread { public: + struct FileOperations { + using openat_func_t = int (*)(int dirfd, const char *path, + int oflag, ...); + using dup_func_t = int (*)(int oldfd); + using close_func_t = int (*)(int fd); + using ioctl_func_t = int (*)(int fd, unsigned long request, ...); + using mmap_func_t = void *(*)(void *addr, size_t length, int prot, + int flags, int fd, off_t offset); + using munmap_func_t = int (*)(void *addr, size_t length); + + openat_func_t openat; + dup_func_t dup; + close_func_t close; + ioctl_func_t ioctl; + mmap_func_t mmap; + munmap_func_t munmap; + }; + static V4L2CompatManager *instance(); int init(); V4L2CameraProxy *getProxy(int fd); + const FileOperations &fops() const { return fops_; } int openat(int dirfd, const char *path, int oflag, mode_t mode); @@ -48,20 +67,7 @@ private: void run() override; int getCameraIndex(int fd); - typedef int (*openat_func_t)(int dirfd, const char *path, int oflag, ...); - typedef int (*dup_func_t)(int oldfd); - typedef int (*close_func_t)(int fd); - typedef int (*ioctl_func_t)(int fd, unsigned long request, ...); - typedef void *(*mmap_func_t)(void *addr, size_t length, int prot, - int flags, int fd, off_t offset); - typedef int (*munmap_func_t)(void *addr, size_t length); - - openat_func_t openat_func_; - dup_func_t dup_func_; - close_func_t close_func_; - ioctl_func_t ioctl_func_; - mmap_func_t mmap_func_; - munmap_func_t munmap_func_; + FileOperations fops_; CameraManager *cm_; -- cgit v1.2.1