v3: - copy dsl_cpe_ubus.c from ltq-adsl-app to ltq-vdsl-app instead of using a symlink - squash PKG_RELEASE patches - move feed patches to PRs: https://github.com/openwrt/packages/pull/14572 https://github.com/openwrt/luci/pull/4749
v2: - drop 0002-ltq-vdsl-app-fix-Wundef-warnings.patch - use "/dev/dsl_cpe_api" without the "0" suffix for the adsl daemon: package/kernel/lantiq/ltq-adsl/patches/100-dsl_compat.patch:+ device_create(dsl_class, NULL, MKDEV(DRV_DSL_CPE_API_DEV_MAJOR, 0), NULL, "dsl_cpe_api"); package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch:+ device_create(dsl_class, NULL, dsl_devt, NULL, "dsl_cpe_api0"); - use callDSLMetrics() for luci, per jo - add Tested-by tags This is to significantly speed up the generation of the metrics. The motivation comes from the fact that ~2.6s is just way too ineffcient for interval based metric collectors like prometheus or collectd. The luci status page also loads/refreshes alot faster. $ time /etc/init.d/dsl_control dslstat real 0m 2.66s user 0m 0.90s sys 0m 1.76s $ time ubus call dsl metrics real 0m 0.02s user 0m 0.00s sys 0m 0.01s The ltq-adsl-app changes are only compile time tested. Andre Heider (6): ltq-vdsl-app: shutdown upon sigterm ltq-vdsl-app: add ubus support to get metrics ltq-adsl-app: add ubus support to get metrics ltq-vdsl-app: use ubus to provide metrics ltq-adsl-app: use ubus to provide metrics ltq-dsl-base: remove usused lantiq_dsl.sh package/network/config/ltq-adsl-app/Makefile | 9 +- .../config/ltq-adsl-app/files/dsl_control | 7 +- .../ltq-adsl-app/patches/300-ubus.patch | 50 ++ package/network/config/ltq-vdsl-app/Makefile | 5 +- .../config/ltq-vdsl-app/files/dsl_control | 9 +- .../ltq-vdsl-app/patches/201-sigterm.patch | 19 + .../ltq-vdsl-app/patches/300-ubus.patch | 50 ++ .../ltq-vdsl-app/src/src/dsl_cpe_ubus.c | 807 ++++++++++++++++++ package/network/utils/ltq-dsl-base/Makefile | 2 +- .../files/lib/functions/lantiq_dsl.sh | 749 ---------------- 10 files changed, 945 insertions(+), 762 deletions(-) create mode 100644 package/network/config/ltq-adsl-app/patches/300-ubus.patch create mode 100644 package/network/config/ltq-vdsl-app/patches/201-sigterm.patch create mode 100644 package/network/config/ltq-vdsl-app/patches/300-ubus.patch create mode 100644 package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c delete mode 100755 package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh -- 2.29.2 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel