Patch Detail
Show a patch.
GET /api/1.1/patches/1149/?format=api
{ "id": 1149, "url": "https://patchwork.libcamera.org/api/1.1/patches/1149/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1149/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190502212651.4279-1-paul.elder@ideasonboard.com>", "date": "2019-05-02T21:26:51", "name": "[libcamera-devel] libcamera: device_enumerator: add DeviceEnumeratorSysfs class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "710b6a21826069c5de0e23ae54c68bb477e57849", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1149/mbox/", "series": [ { "id": 289, "url": "https://patchwork.libcamera.org/api/1.1/series/289/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=289", "date": "2019-05-02T21:26:51", "name": "[libcamera-devel] libcamera: device_enumerator: add DeviceEnumeratorSysfs class", "version": 1, "mbox": "https://patchwork.libcamera.org/series/289/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1149/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1149/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@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 E3E6360E5F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 2 May 2019 23:27:33 +0200 (CEST)", "from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DEF8C2D1;\n\tThu, 2 May 2019 23:27:32 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556832453;\n\tbh=dby128YADk13VoY1VwZO/VIxKMW25HG2iYDyD5LVnDA=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=t3l3PvERfaScb5EHi1ZEzHMVIeeeahJax+N5LJRndbKfgOo0/H274db3/O8Cbf2A1\n\tT6Tj4mxLHx6UaurC2R1VPmd9RAtnt02szi9ertE8roYcY/C7WFQ3RTrInRClYFNpd9\n\tA0pfsouPy240ViHb3wYc3PsUoJ7FArc/ksZGcO7Y=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 2 May 2019 17:26:51 -0400", "Message-Id": "<20190502212651.4279-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] libcamera: device_enumerator: add\n\tDeviceEnumeratorSysfs class", "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": "Thu, 02 May 2019 21:27:34 -0000" }, "content": "A udev-based device enumerator is not sufficient, since libudev is an\noptional dependency, or udev might fail. In these cases, we should fall\nback to using sysfs to enumerate devices.\n\nAdd a DeviceEnumeratorSysfs class which is a specialization of\nDeviceEnumerator that uses sysfs to enumerate media devices on the\nsystem.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n Documentation/Doxyfile.in | 2 +\n src/libcamera/device_enumerator.cpp | 6 +-\n src/libcamera/device_enumerator_sysfs.cpp | 109 ++++++++++++++++++\n .../include/device_enumerator_sysfs.h | 31 +++++\n src/libcamera/meson.build | 2 +\n 5 files changed, 148 insertions(+), 2 deletions(-)\n create mode 100644 src/libcamera/device_enumerator_sysfs.cpp\n create mode 100644 src/libcamera/include/device_enumerator_sysfs.h", "diff": "diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex 950ad4f..5dd4445 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -835,6 +835,8 @@ RECURSIVE = YES\n \n EXCLUDE = ../src/libcamera/device_enumerator_udev.cpp \\\n \t\t\t ../src/libcamera/include/device_enumerator_udev.h \\\n+\t\t\t ../src/libcamera/device_enumerator_sysfs.cpp \\\n+\t\t\t ../src/libcamera/include/device_enumerator_sysfs.h \\\n \t\t\t ../src/libcamera/pipeline/\n \n # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or\ndiff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\nindex f6878b3..5c44eb1 100644\n--- a/src/libcamera/device_enumerator.cpp\n+++ b/src/libcamera/device_enumerator.cpp\n@@ -7,6 +7,7 @@\n \n #include \"device_enumerator.h\"\n #include \"device_enumerator_udev.h\"\n+#include \"device_enumerator_sysfs.h\"\n \n #include <string.h>\n \n@@ -153,8 +154,9 @@ std::unique_ptr<DeviceEnumerator> DeviceEnumerator::create()\n \t * Either udev is not available or udev initialization failed. Fall back\n \t * on the sysfs enumerator.\n \t */\n-\n-\t/** \\todo Add a sysfs-based enumerator. */\n+\tenumerator = utils::make_unique<DeviceEnumeratorSysfs>();\n+\tif (!enumerator->init())\n+\t\treturn enumerator;\n \n \treturn nullptr;\n }\ndiff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp\nnew file mode 100644\nindex 0000000..6dd04e8\n--- /dev/null\n+++ b/src/libcamera/device_enumerator_sysfs.cpp\n@@ -0,0 +1,109 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2018-2019, Google Inc.\n+ *\n+ * device_enumerator_sysfs.cpp - udev-based device enumerator\n+ */\n+\n+#include \"device_enumerator_sysfs.h\"\n+\n+#include <dirent.h>\n+#include <fcntl.h>\n+#include <fstream>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <sys/ioctl.h>\n+#include <sys/stat.h>\n+#include <sys/types.h>\n+#include <unistd.h>\n+\n+#include \"log.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(DeviceEnumerator)\n+\n+DeviceEnumeratorSysfs::DeviceEnumeratorSysfs()\n+{\n+}\n+\n+DeviceEnumeratorSysfs::~DeviceEnumeratorSysfs()\n+{\n+}\n+\n+int DeviceEnumeratorSysfs::init()\n+{\n+\treturn 0;\n+}\n+\n+int DeviceEnumeratorSysfs::enumerate()\n+{\n+\tstruct dirent *ent;\n+\tstruct stat devstat;\n+\tchar *end;\n+\tDIR *dir;\n+\n+\tstatic const char *sysfs_dirs[] = {\n+\t\t\"/sys/media/devices\",\n+\t\t\"/sys/block/media/devices\",\n+\t\t\"/sys/bus/media/devices\",\n+\t\t\"/sys/class/media/devices\",\n+\t};\n+\n+\tfor (const char *dirname : sysfs_dirs) {\n+\t\tdir = opendir(dirname);\n+\t\tif (dir)\n+\t\t\tbreak;\n+\t}\n+\n+\twhile ((ent = readdir(dir)) != nullptr) {\n+\t\tunsigned int idx;\n+\t\tstd::string devnode = std::string();\n+\n+\t\tif (strncmp(ent->d_name, \"media\", 5))\n+\t\t\tcontinue;\n+\n+\t\tidx = strtoul(ent->d_name + 5, &end, 10);\n+\t\tif (*end != '\\0')\n+\t\t\tcontinue;\n+\n+\t\tdevnode = \"/dev/media\" + std::to_string(idx);\n+\n+\t\t/* Verify that the device node exists. */\n+\t\tif (stat(devnode.c_str(), &devstat) < 0)\n+\t\t\tcontinue;\n+\n+\t\taddDevice(devnode);\n+\t}\n+\n+\tclosedir(dir);\n+\n+\treturn 0;\n+}\n+\n+std::string DeviceEnumeratorSysfs::lookupDeviceNode(int major, int minor)\n+{\n+\tstd::string deviceNode = std::string();\n+\tstd::string line = std::string();\n+\tstd::ifstream uevent_file;\n+\tsize_t c_cnt;\n+\n+\tuevent_file.open(\"/sys/dev/char/\" + std::to_string(major) + \":\" +\n+\t\t\t std::to_string(minor) + \"/uevent\");\n+\tif (!uevent_file)\n+\t\treturn std::string();\n+\n+\twhile (uevent_file >> line) {\n+\t\tif (line.find(\"DEVNAME\") != std::string::npos) {\n+\t\t\tc_cnt = line.find(\"=\");\n+\t\t\tdeviceNode = \"/dev/\" + line.substr(c_cnt + 1);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tuevent_file.close();\n+\n+\treturn deviceNode;\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/include/device_enumerator_sysfs.h b/src/libcamera/include/device_enumerator_sysfs.h\nnew file mode 100644\nindex 0000000..f32d6ae\n--- /dev/null\n+++ b/src/libcamera/include/device_enumerator_sysfs.h\n@@ -0,0 +1,31 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2018-2019, Google Inc.\n+ *\n+ * device_enumerator_sysfs.h - sysfs-based device enumerator\n+ */\n+#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n+#define __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__\n+\n+#include <string>\n+\n+#include \"device_enumerator.h\"\n+\n+namespace libcamera {\n+\n+class DeviceEnumeratorSysfs : public DeviceEnumerator\n+{\n+public:\n+\tDeviceEnumeratorSysfs();\n+\t~DeviceEnumeratorSysfs();\n+\n+\tint init() final;\n+\tint enumerate() final;\n+\n+private:\n+\tstd::string lookupDeviceNode(int major, int minor) final;\n+};\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__ */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 2b67823..ca9ed7a 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -4,6 +4,7 @@ libcamera_sources = files([\n 'camera_manager.cpp',\n 'camera_sensor.cpp',\n 'device_enumerator.cpp',\n+ 'device_enumerator_sysfs.cpp',\n 'event_dispatcher.cpp',\n 'event_dispatcher_poll.cpp',\n 'event_notifier.cpp',\n@@ -27,6 +28,7 @@ libcamera_headers = files([\n 'include/camera_sensor.h',\n 'include/device_enumerator.h',\n 'include/device_enumerator_udev.h',\n+ 'include/device_enumerator_sysfs.h',\n 'include/event_dispatcher_poll.h',\n 'include/formats.h',\n 'include/log.h',\n", "prefixes": [ "libcamera-devel" ] }