summaryrefslogtreecommitdiff
path: root/src/v4l2/v4l2_compat_manager.cpp
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-28 23:33:28 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-01-14 14:02:49 +0200
commitfc96573697fddabd951483b902caaa41adb31214 (patch)
tree23e339bebd7fa9b6ac0f8284d5eaffa60f4c3509 /src/v4l2/v4l2_compat_manager.cpp
parentc006f964858b44487a7fe07b300fccca7943f775 (diff)
v4l2: v4l2_compat_manager: Store V4L2CameraFile in mmaps_
The mmaps_ map stores a pointer to the V4L2CameraProxy to avoid increasing the reference count on the V4L2CameraFile shared pointer needlessly. While this provides a small optimization, it prevents accessing the V4L2CameraFile from the munmap() function which doesn't take an fd as argument. To prepare for improved debugging that will require access to V4L2CameraFile in munmap(), store the V4L2CameraFile pointer in mmaps_. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Diffstat (limited to 'src/v4l2/v4l2_compat_manager.cpp')
-rw-r--r--src/v4l2/v4l2_compat_manager.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp
index 585046e9..ded568be 100644
--- a/src/v4l2/v4l2_compat_manager.cpp
+++ b/src/v4l2/v4l2_compat_manager.cpp
@@ -198,11 +198,7 @@ void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags,
if (map == MAP_FAILED)
return map;
- /*
- * Map to V4L2CameraProxy directly to prevent adding more references
- * to V4L2CameraFile.
- */
- mmaps_[map] = file->proxy();
+ mmaps_[map] = file;
return map;
}
@@ -212,9 +208,9 @@ int V4L2CompatManager::munmap(void *addr, size_t length)
if (device == mmaps_.end())
return fops_.munmap(addr, length);
- V4L2CameraProxy *proxy = device->second;
+ V4L2CameraFile *file = device->second.get();
- int ret = proxy->munmap(addr, length);
+ int ret = file->proxy()->munmap(addr, length);
if (ret < 0)
return ret;