From patchwork Tue Oct 11 00:29:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 614959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E87C7C433FE for ; Tue, 11 Oct 2022 00:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229487AbiJKAaF (ORCPT ); Mon, 10 Oct 2022 20:30:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbiJKAaD (ORCPT ); Mon, 10 Oct 2022 20:30:03 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 442A712D11 for ; Mon, 10 Oct 2022 17:29:59 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id i3so2537307pfc.11 for ; Mon, 10 Oct 2022 17:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iboE3+k8gtZGWal31nSM+sUPqm/UMn0VFkh0qr9BOgQ=; b=TfW8p5w6Z8zw9TeKxqamzIxndjfrizpluYdvpzgkjD7BMw9Cc5ib6+D7B5vkfHZyz8 rSY16+AcO0NXj21KM53TReSa+k8nC54e7Ogur+89C/6weQYiYFROzzwHFaMiaQsBAYkA vJJg9mNrPiyRVQpfHrhCSd7jWarLI8wp/e2EE1lIbhKI8LlnADeL83cE/CENLLxXEGvZ okWI/PMUoZ43NnO9yHSpq7djm9KDZRAQFlQWQJhTDLruO+SR1NVvrabipkhHs1vkRssI d/sWi4NABxlGks9SbbNeTMBqbR0UG0xB4gLLRk+N1JjmsEI+OdB6wDeHw4nyH6ROfCmm Jqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iboE3+k8gtZGWal31nSM+sUPqm/UMn0VFkh0qr9BOgQ=; b=72rnav9NUc49MX8OYNtIalq9Ga8hAIKdb3ECVLmtCKxBpl8gBOWcprGsHsa1WWj0yi mAIxDCdQc9jqI8jOqGuVDVsOpKZuU+VKmpJJf90VRj8JZvMqbfa2YY/sSzvI0M165+44 R2inNzGicbudAvkXCbJlt5krmRlahYa7GGp0drX88ugJ2ePUbmF2kq7VjdiZQqPUmn9w UHhc4U1klwz6+zA3gSgfsNzQ5NF6xdmV24THioPGaaCr5oLjyU0mTbIZ/GcuInPGGJjI gt0Syq8AZLNRf8XJrCb89r7l93UgDBlUNtTo/6bUr5v0x+bW64Xueh9PQy9kYtUXZufe 8kTQ== X-Gm-Message-State: ACrzQf3EiFle75PKTet+Q0MWeftDcfly05Rjqfwf8ke8P6S+rcTKygI1 sJgMq791ITtUDo5Unwl3vjNBTF1kZwk= X-Google-Smtp-Source: AMsMyM5qwQL7DsNFlAKcUsyKSH3kshSRDOkJ7Q+TPF13riaYsxo/TXsF/AIZ0LXNQ/yvVCdwcyqlnw== X-Received: by 2002:a63:814a:0:b0:460:9025:6e4a with SMTP id t71-20020a63814a000000b0046090256e4amr11765280pgd.135.1665448198159; Mon, 10 Oct 2022 17:29:58 -0700 (PDT) Received: from sol.home.arpa (110-174-58-111.static.tpgi.com.au. [110.174.58.111]) by smtp.gmail.com with ESMTPSA id y69-20020a62ce48000000b005377c74c409sm7541351pfg.4.2022.10.10.17.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 17:29:57 -0700 (PDT) From: Kent Gibson To: linux-gpio@vger.kernel.org, brgl@bgdev.pl Cc: Kent Gibson Subject: [libgpiod v2][PATCH v3 4/5] tools: add gpiowatch Date: Tue, 11 Oct 2022 08:29:08 +0800 Message-Id: <20221011002909.26987-5-warthog618@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221011002909.26987-1-warthog618@gmail.com> References: <20221011002909.26987-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add a gpiowatch tool, based on gpiomon, to report line info change events read from chip file descriptors. Inspired by the gpio-watch tool in the linux kernel, but with gpiomon features such as custom formatted output, filtering events of interest and exiting after a number of events, so more useful for scripting. Default output is minimalist, so just time, event type and line id. Full event details are available using the custom formatted output. Signed-off-by: Kent Gibson --- Changes v2 -> v3: - Minimise the default output to more closely match gpiomon. - Add --format option for when more detail is required. - Add --num-events option to exit after a number of events. - Add --event option to report only specific event types. - Add --quiet option to not print events. - fix monotonic to realtime conversion on 32 bit platforms. man/Makefile.am | 2 +- tools/.gitignore | 1 + tools/Makefile.am | 4 +- tools/gpiowatch.c | 433 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 438 insertions(+), 2 deletions(-) create mode 100644 tools/gpiowatch.c diff --git a/man/Makefile.am b/man/Makefile.am index 8d1d9b3..032ed4e 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -3,7 +3,7 @@ if WITH_MANPAGES -dist_man1_MANS = gpiodetect.man gpioinfo.man gpioget.man gpioset.man gpiomon.man +dist_man1_MANS = gpiodetect.man gpioinfo.man gpioget.man gpioset.man gpiomon.man gpiowatch.man %.man: $(top_builddir)/tools/$(*F) help2man $(top_builddir)/tools/$(*F) --include=$(srcdir)/template --output=$(builddir)/$@ --no-info diff --git a/tools/.gitignore b/tools/.gitignore index d6b2f44..ad0800b 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -6,3 +6,4 @@ gpioinfo gpioget gpioset gpiomon +gpiowatch diff --git a/tools/Makefile.am b/tools/Makefile.am index c956314..1097fea 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,7 +9,7 @@ libtools_common_la_SOURCES = tools-common.c tools-common.h LDADD = libtools-common.la $(top_builddir)/lib/libgpiod.la $(LIBEDIT_LIBS) -bin_PROGRAMS = gpiodetect gpioinfo gpioget gpioset gpiomon +bin_PROGRAMS = gpiodetect gpioinfo gpioget gpioset gpiomon gpiowatch gpiodetect_SOURCES = gpiodetect.c @@ -21,6 +21,8 @@ gpioset_SOURCES = gpioset.c gpiomon_SOURCES = gpiomon.c +gpiowatch_SOURCES = gpiowatch.c + EXTRA_DIST = gpio-tools-test gpio-tools-test.bats if WITH_TESTS diff --git a/tools/gpiowatch.c b/tools/gpiowatch.c new file mode 100644 index 0000000..dfcf14a --- /dev/null +++ b/tools/gpiowatch.c @@ -0,0 +1,433 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2022 Kent Gibson + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "tools-common.h" + +static void print_help(void) +{ + printf("Usage: %s [OPTIONS] ...\n", get_progname()); + printf("\n"); + printf("Wait for changes to info on GPIO lines and print them to standard output.\n"); + printf("\n"); + printf("Lines are specified by name, or optionally by offset if the chip option\n"); + printf("is provided.\n"); + printf("\n"); + printf("Options:\n"); + printf(" --banner\t\tdisplay a banner on successful startup\n"); + printf(" --by-name\t\ttreat lines as names even if they would parse as an offset\n"); + printf(" -c, --chip \trestrict scope to a particular chip\n"); + printf(" -e, --event \tspecify the events to monitor.\n"); + printf("\t\t\tPossible values: 'requested', 'released', 'reconfigured'.\n"); + printf("\t\t\t(default is all events)\n"); + printf(" -h, --help\t\tdisplay this help and exit\n"); + printf(" -F, --format \tspecify a custom output format\n"); + printf(" --localtime\tconvert event timestamps to local time\n"); + printf(" -n, --num-events \n"); + printf("\t\t\texit after processing num events\n"); + printf(" -q, --quiet\t\tdon't generate any output\n"); + printf(" -s, --strict\t\tabort if requested line names are not unique\n"); + printf(" --utc\t\tconvert event timestamps to UTC\n"); + printf(" -v, --version\t\toutput version information and exit\n"); + print_chip_help(); + printf("\n"); + printf("Format specifiers:\n"); + printf(" %%o GPIO line offset\n"); + printf(" %%l GPIO line name\n"); + printf(" %%c GPIO chip name\n"); + printf(" %%e numeric info event type ('1' - requested, '2' - released or '3' - reconfigured)\n"); + printf(" %%E info event type ('requested', 'released' or 'reconfigured')\n"); + printf(" %%a line attributes\n"); + printf(" %%C consumer\n"); + printf(" %%S event timestamp as seconds\n"); + printf(" %%U event timestamp as UTC\n"); + printf(" %%L event timestamp as local time\n"); +} + +static int parse_event_type_or_die(const char *option) +{ + if (strcmp(option, "requested") == 0) + return GPIOD_INFO_EVENT_LINE_REQUESTED; + if (strcmp(option, "released") == 0) + return GPIOD_INFO_EVENT_LINE_RELEASED; + if (strcmp(option, "reconfigured") != 0) + die("invalid edge: %s", option); + return GPIOD_INFO_EVENT_LINE_CONFIG_CHANGED; +} + +struct config { + bool quiet; + bool strict; + int event_type; + int events_wanted; + const char *chip_id; + const char *fmt; + int by_name; + int timestamp_fmt; + int banner; +}; + +int parse_config(int argc, char **argv, struct config *cfg) +{ + int opti, optc; + const char *const shortopts = "+b:c:C:e:hF:ln:p:qshv"; + const struct option longopts[] = { + { "banner", no_argument, &cfg->banner, 1 }, + { "by-name", no_argument, &cfg->by_name, 1 }, + { "chip", required_argument, NULL, 'c' }, + { "event", required_argument, NULL, 'e' }, + { "format", required_argument, NULL, 'F' }, + { "help", no_argument, NULL, 'h' }, + { "localtime", no_argument, &cfg->timestamp_fmt, 2 }, + { "num-events", required_argument, NULL, 'n' }, + { "quiet", no_argument, NULL, 'q' }, + { "silent", no_argument, NULL, 'q' }, + { "strict", no_argument, NULL, 's' }, + { "utc", no_argument, &cfg->timestamp_fmt, 1 }, + { "version", no_argument, NULL, 'v' }, + { GETOPT_NULL_LONGOPT }, + }; + + memset(cfg, 0, sizeof(*cfg)); + + for (;;) { + optc = getopt_long(argc, argv, shortopts, longopts, &opti); + if (optc < 0) + break; + + switch (optc) { + case 'c': + cfg->chip_id = optarg; + break; + case 'e': + cfg->event_type = parse_event_type_or_die(optarg); + break; + case 'F': + cfg->fmt = optarg; + break; + case 'n': + cfg->events_wanted = parse_uint_or_die(optarg); + break; + case 'q': + cfg->quiet = true; + break; + case 's': + cfg->strict = true; + break; + case 'h': + print_help(); + exit(EXIT_SUCCESS); + case 'v': + print_version(); + exit(EXIT_SUCCESS); + case '?': + die("try %s --help", get_progname()); + case 0: + break; + default: + abort(); + } + } + + return optind; +} + +static void print_banner(int num_lines, char **lines) +{ + int i; + + if (num_lines > 1) { + printf("Watching lines "); + + for (i = 0; i < num_lines - 1; i++) + printf("%s, ", lines[i]); + + printf("and %s...\n", lines[i]); + } else { + printf("Watching line %s...\n", lines[0]); + } +} + +static void print_event_type(int evtype) +{ + switch (evtype) { + case GPIOD_INFO_EVENT_LINE_REQUESTED: + fputs("requested", stdout); + break; + case GPIOD_INFO_EVENT_LINE_RELEASED: + fputs("released", stdout); + break; + case GPIOD_INFO_EVENT_LINE_CONFIG_CHANGED: + fputs("reconfigured", stdout); + break; + default: + fputs("unknown", stdout); + break; + } +} + +/* + * A convenience function to map clock monotonic to realtime, as uAPI only + * supports CLOCK_MONOTONIC. + * + * Samples the realtime clock on either side of a monotonic sample and averages + * the realtime samples to estimate the offset between the two clocks. + * Any time shifts between the two realtime samples will result in the + * monotonic time being mapped to the average of the before and after, so + * half way between the old and new times. + * + * Any CPU suspension between the event being generated and converted will + * result in the returned time being shifted by the period of suspension. + */ +static uint64_t monotonic_to_realtime(uint64_t evtime) +{ + struct timespec ts; + uint64_t before, after, mono; + + clock_gettime(CLOCK_REALTIME, &ts); + before = ts.tv_nsec + ((uint64_t)ts.tv_sec) * 1000000000; + + clock_gettime(CLOCK_MONOTONIC, &ts); + mono = ts.tv_nsec + ((uint64_t)ts.tv_sec) * 1000000000; + + clock_gettime(CLOCK_REALTIME, &ts); + after = ts.tv_nsec + ((uint64_t)ts.tv_sec) * 1000000000; + + evtime += (after/2 - mono + before/2); + return evtime; +} + +static void event_print_formatted(struct gpiod_info_event *event, + struct line_resolver *resolver, int chip_num, + struct config *cfg) +{ + struct gpiod_line_info *info; + const char *lname, *prev, *curr, *consumer; + char fmt; + uint64_t evtime; + int evtype; + unsigned int offset; + + info = gpiod_info_event_get_line_info(event); + evtime = gpiod_info_event_get_timestamp_ns(event); + evtype = gpiod_info_event_get_event_type(event); + offset = gpiod_line_info_get_offset(info); + + for (prev = curr = cfg->fmt;;) { + curr = strchr(curr, '%'); + if (!curr) { + fputs(prev, stdout); + break; + } + + if (prev != curr) + fwrite(prev, curr - prev, 1, stdout); + + fmt = *(curr + 1); + + switch (fmt) { + case 'a': + print_line_attributes(info); + break; + case 'c': + fputs(get_chip_name(resolver, chip_num), stdout); + break; + case 'C': + if (!gpiod_line_info_is_used(info)) { + consumer = "unused"; + } else { + consumer = gpiod_line_info_get_consumer(info); + if (!consumer) + consumer = "kernel"; + } + fputs(consumer, stdout); + break; + case 'e': + printf("%d", evtype); + break; + case 'E': + print_event_type(evtype); + break; + case 'l': + lname = gpiod_line_info_get_name(info); + if (!lname) + lname = "unnamed"; + fputs(lname, stdout); + break; + case 'L': + print_event_time(monotonic_to_realtime(evtime), 2); + break; + case 'o': + printf("%u", offset); + break; + case 'S': + print_event_time(evtime, 0); + break; + case 'U': + print_event_time(monotonic_to_realtime(evtime), 1); + break; + case '%': + fputc('%', stdout); + break; + case '\0': + fputc('%', stdout); + goto end; + default: + fwrite(curr, 2, 1, stdout); + break; + } + + curr += 2; + prev = curr; + } + +end: + fputc('\n', stdout); +} + +static void event_print_human_readable(struct gpiod_info_event *event, + struct line_resolver *resolver, int chip_num, + struct config *cfg) +{ + struct gpiod_line_info *info; + uint64_t evtime; + int evtype; + unsigned int offset; + char *evname; + + info = gpiod_info_event_get_line_info(event); + evtime = gpiod_info_event_get_timestamp_ns(event); + evtype = gpiod_info_event_get_event_type(event); + offset = gpiod_line_info_get_offset(info); + + switch (evtype) { + case GPIOD_INFO_EVENT_LINE_REQUESTED: + evname = "requested"; + break; + case GPIOD_INFO_EVENT_LINE_RELEASED: + evname = "released"; + break; + case GPIOD_INFO_EVENT_LINE_CONFIG_CHANGED: + evname = "reconfigured"; + break; + default: + evname = "unknown"; + } + + if (cfg->timestamp_fmt) + evtime = monotonic_to_realtime(evtime); + + print_event_time(evtime, cfg->timestamp_fmt); + printf("\t%s\t", evname); + print_line_id(resolver, chip_num, offset, cfg->chip_id); + fputc('\n', stdout); +} + +static void event_print(struct gpiod_info_event *event, + struct line_resolver *resolver, int chip_num, + struct config *cfg) +{ + if (cfg->quiet) + return; + + if (cfg->fmt) + event_print_formatted(event, resolver, chip_num, cfg); + else + event_print_human_readable(event, resolver, chip_num, cfg); +} + +int main(int argc, char **argv) +{ + int i, j, events_done = 0, evtype; + struct gpiod_chip **chips; + struct pollfd *pollfds; + struct gpiod_chip *chip; + struct line_resolver *resolver; + struct gpiod_info_event *event; + struct config cfg; + + i = parse_config(argc, argv, &cfg); + argc -= optind; + argv += optind; + + if (argc < 1) + die("at least one GPIO line must be specified"); + + if (argc > 64) + die("too many lines given"); + + resolver = resolve_lines(argc, argv, cfg.chip_id, cfg.strict, + cfg.by_name); + validate_resolution(resolver, cfg.chip_id); + chips = calloc(resolver->num_chips, sizeof(*chips)); + pollfds = calloc(resolver->num_chips, sizeof(*pollfds)); + if (!pollfds) + die("out of memory"); + + for (i = 0; i < resolver->num_chips; i++) { + chip = gpiod_chip_open(resolver->chips[i].path); + if (!chip) + die_perror("unable to open chip '%s'", + resolver->chips[i].path); + + for (j = 0; j < resolver->num_lines; j++) + if ((resolver->lines[j].chip_num == i) && + !gpiod_chip_watch_line_info( + chip, resolver->lines[j].offset)) + die_perror("unable to watch line on chip '%s'", + resolver->chips[i].path); + + chips[i] = chip; + pollfds[i].fd = gpiod_chip_get_fd(chip); + pollfds[i].events = POLLIN; + } + + if (cfg.banner) + print_banner(argc, argv); + + for (;;) { + fflush(stdout); + + if (poll(pollfds, resolver->num_chips, -1) < 0) + die_perror("error polling for events"); + + for (i = 0; i < resolver->num_chips; i++) { + if (pollfds[i].revents == 0) + continue; + + event = gpiod_chip_read_info_event(chips[i]); + if (!event) + die_perror("unable to retrieve chip event"); + + if (cfg.event_type) { + evtype = gpiod_info_event_get_event_type(event); + if (evtype != cfg.event_type) + continue; + } + + event_print(event, resolver, i, &cfg); + + events_done++; + + if (cfg.events_wanted && + events_done >= cfg.events_wanted) + goto done; + } + } +done: + for (i = 0; i < resolver->num_chips; i++) + gpiod_chip_close(chips[i]); + + free(chips); + free_line_resolver(resolver); + + return EXIT_SUCCESS; +}