{"id":1151,"url":"https://patchwork.libcamera.org/api/patches/1151/?format=json","web_url":"https://patchwork.libcamera.org/patch/1151/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190503000303.17940-1-paul.elder@ideasonboard.com>","date":"2019-05-03T00:03:03","name":"[libcamera-devel,v3] libcamera: device_enumerator: add DeviceEnumeratorSysfs class","commit_ref":"977cfbd526f2da1cfce5c5c2b187c83af3d3efdc","pull_url":null,"state":"accepted","archived":false,"hash":"9e0bbf5ace592ef645d25b38379df2f2f87ab215","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1151/mbox/","series":[{"id":291,"url":"https://patchwork.libcamera.org/api/series/291/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=291","date":"2019-05-03T00:03:03","name":"[libcamera-devel,v3] libcamera: device_enumerator: add DeviceEnumeratorSysfs class","version":3,"mbox":"https://patchwork.libcamera.org/series/291/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1151/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1151/checks/","tags":{},"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 1DFB460E61\n\tfor ;\n\tFri, 3 May 2019 02:03:22 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1A0BA2D1;\n\tFri, 3 May 2019 02:03:20 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556841801;\n\tbh=jZeQ+VMqJottMqHaYXuY4nOO2c1hC1tnOJ9TiBoydGg=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=OTI5RXmnG9L85KG1sX12a8r19KdGBrKxIookbUFo7oPyuIKWY+7PejCIEKFqlYht3\n\tEnrH1OJ1LJi5sYyDo1mLidr8//R3XWWLfi5RF/cNMU59XGhosU9nDPi0UAKwWx/ZgR\n\tzcAece4dN44F8RglptNabZ9U/Weqo0w7hNmw9ONM=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 2 May 2019 20:03:03 -0400","Message-Id":"<20190503000303.17940-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 v3] libcamera: device_enumerator: add\n\tDeviceEnumeratorSysfs class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 03 May 2019 00:03:22 -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 \n---\nChanges in v3:\n- remove empty constructor and destructor\n- make sysfs_dirs constant\n- C++ization style changes\n- add error output if no valid sysfs directory found\n\nChanges in v2:\n- style changes\n- change sysfs directory checking list to remove block and add subsystem\n- add warning output to alert if media device (/dev/media*) should exist\n based on sysfs but doesn't\n\n Documentation/Doxyfile.in | 4 +-\n src/libcamera/device_enumerator.cpp | 6 +-\n src/libcamera/device_enumerator_sysfs.cpp | 105 ++++++++++++++++++\n .../include/device_enumerator_sysfs.h | 28 +++++\n src/libcamera/meson.build | 2 +\n 5 files changed, 142 insertions(+), 3 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..381f777 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -833,7 +833,9 @@ RECURSIVE = YES\n # Note that relative paths are relative to the directory from which doxygen is\n # run.\n \n-EXCLUDE = ../src/libcamera/device_enumerator_udev.cpp \\\n+EXCLUDE = ../src/libcamera/device_enumerator_sysfs.cpp \\\n+\t\t\t ../src/libcamera/device_enumerator_udev.cpp \\\n+\t\t\t ../src/libcamera/include/device_enumerator_sysfs.h \\\n \t\t\t ../src/libcamera/include/device_enumerator_udev.h \\\n \t\t\t ../src/libcamera/pipeline/\n \ndiff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\nindex f6878b3..259eec4 100644\n--- a/src/libcamera/device_enumerator.cpp\n+++ b/src/libcamera/device_enumerator.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include \"device_enumerator.h\"\n+#include \"device_enumerator_sysfs.h\"\n #include \"device_enumerator_udev.h\"\n \n #include \n@@ -153,8 +154,9 @@ std::unique_ptr 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();\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..f3054d5\n--- /dev/null\n+++ b/src/libcamera/device_enumerator_sysfs.cpp\n@@ -0,0 +1,105 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * device_enumerator_sysfs.cpp - sysfs-based device enumerator\n+ */\n+\n+#include \"device_enumerator_sysfs.h\"\n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#include \"log.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(DeviceEnumerator)\n+\n+int DeviceEnumeratorSysfs::init()\n+{\n+\treturn 0;\n+}\n+\n+int DeviceEnumeratorSysfs::enumerate()\n+{\n+\tstruct dirent *ent;\n+\tDIR *dir;\n+\n+\tstatic const char * const sysfs_dirs[] = {\n+\t\t\"/sys/subsystem/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+\tif (!dir) {\n+\t\tLOG(DeviceEnumerator, Error)\n+\t\t\t<< \"No valid sysfs media device directory\";\n+\t\treturn -ENODEV;\n+\t}\n+\n+\twhile ((ent = readdir(dir)) != nullptr) {\n+\t\tif (strncmp(ent->d_name, \"media\", 5))\n+\t\t\tcontinue;\n+\n+\t\tchar *end;\n+\t\tunsigned int idx = strtoul(ent->d_name + 5, &end, 10);\n+\t\tif (*end != '\\0')\n+\t\t\tcontinue;\n+\n+\t\tstd::string devnode = \"/dev/media\" + std::to_string(idx);\n+\n+\t\t/* Verify that the device node exists. */\n+\t\tstruct stat devstat;\n+\t\tif (stat(devnode.c_str(), &devstat) < 0) {\n+\t\t\tLOG(DeviceEnumerator, Warning)\n+\t\t\t\t<< \"Device node /dev/media\" << idx\n+\t\t\t\t<< \" should exist but doesn't\";\n+\t\t\tcontinue;\n+\t\t}\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;\n+\tstd::string line;\n+\tstd::ifstream ueventFile;\n+\n+\tueventFile.open(\"/sys/dev/char/\" + std::to_string(major) + \":\" +\n+\t\t\tstd::to_string(minor) + \"/uevent\");\n+\tif (!ueventFile)\n+\t\treturn std::string();\n+\n+\twhile (ueventFile >> line) {\n+\t\tif (line.find(\"DEVNAME=\") == 0) {\n+\t\t\tdeviceNode = \"/dev/\" + line.substr(strlen(\"DEVNAME=\"));\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tueventFile.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..8d3adc9\n--- /dev/null\n+++ b/src/libcamera/include/device_enumerator_sysfs.h\n@@ -0,0 +1,28 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 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 \n+\n+#include \"device_enumerator.h\"\n+\n+namespace libcamera {\n+\n+class DeviceEnumeratorSysfs final : public DeviceEnumerator\n+{\n+public:\n+\tint init();\n+\tint enumerate();\n+\n+private:\n+\tstd::string lookupDeviceNode(int major, int minor);\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..8796f49 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@@ -26,6 +27,7 @@ libcamera_sources = files([\n libcamera_headers = files([\n 'include/camera_sensor.h',\n 'include/device_enumerator.h',\n+ 'include/device_enumerator_sysfs.h',\n 'include/device_enumerator_udev.h',\n 'include/event_dispatcher_poll.h',\n 'include/formats.h',\n","prefixes":["libcamera-devel","v3"]}