From nobody Sun Feb 20 05:33:11 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 09E9319D09C8; Sun, 20 Feb 2022 05:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K1YxM6njdz3NvZ; Sun, 20 Feb 2022 05:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645335192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7v1SRzVThC6g/l4ovd+yKMezldN7kjKyiB1mWxVEHg=; b=KauVjynJ54ZhIMheR9Nz2s3oYHypYEo0ygG1miAplmiavgQavJb74KzY/YfuNp1JL7F5vs ytMQDa3l1yQdWqvPfatXr5jnEt4Oqg17y/xxk5Rx6Bg3P7UzGuHyH74UgU4/GySli1VmsN j161lAOQqTzPVD+tBp3pR2qIRvWEYbeDrF3zOtcF1VyleZ5aLIEwSbQosEYXCWDWIPpAuI cPWoBjyiLqNTWH39xClHitL2IXaenBg/hzWDr4SHTg+zntLcfZV+3pGcnTMjKWlSt0S94d i5VrDS1Q/Kz8WuxNi7geRHWjneWS21a+3zJISMg0wiz3BuTeS2eQBpGQnn+McA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C91BD169E6; Sun, 20 Feb 2022 05:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21K5XB8X091891; Sun, 20 Feb 2022 05:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21K5XBRD091890; Sun, 20 Feb 2022 05:33:11 GMT (envelope-from git) Date: Sun, 20 Feb 2022 05:33:11 GMT Message-Id: <202202200533.21K5XBRD091890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: c8cc568961df - main - Provide an interface that allows GEOM modules to return multiple messages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8cc568961dfccf3d91821f06f7072437b04edf5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645335192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7v1SRzVThC6g/l4ovd+yKMezldN7kjKyiB1mWxVEHg=; b=ktFIaqMYHpBR4nlM9H4EEQxKkOaKybGT61hK6CMGpu0nu+RK3WSKhL66oPKbhH3bvhGEi8 ViVRC3BbDSqPe3xIWVq1pq+uBbH2/dezhalzY5nSo+LyZAdOf22L/vyzxb2JxBbyKcRmQc g6Ntzom8OfB2/PkdG/N+7LLFvsrc37AcCa8oa22QmGmv7NAIR6bKZt+NA1PMFCgjmwVEp/ X7vdLpyWafwcpfXF4z/vDVyp+TyKUvjz/SYzW4R8YKK0mPr4zIfH8EmhFwQ8EFTdfjtDcW eUEUkgrzHBmXEwYyPyLQvDl4Aybxc6/KRX63guEW5tXBMG3xyNyOz894fNRmcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645335192; a=rsa-sha256; cv=none; b=yNTnM0LXPmBMBnLGA3lOc6WoiSXCfcp+8kYqjTQen9UbSJqe0wJEG/slA3RJcJxnAISl9/ nf9oBCrGHUVkLw7CLX6lD6IRnolqcC2vMzh+3a73CCB8dCmBSecElEMfelIHGw/sZkodp4 tRa4IZbmwusRLMl7YsI8hZ6gF50TC+VXGm601cC1zcepcPHozlWK3/t4ypSB7c0eaMjmh8 79mdQvZNQP6UIJ2uC8limSMpsFXq5HS/7a6g8CgCWIVvcW0jwYaSrbHdjcohSTD8EyBZm0 0HuJp/du0IJ82wRNQj5O5lDSoOcrGIvWc4OsO9R9yCPZ861M+roSv4OioFaEVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c8cc568961dfccf3d91821f06f7072437b04edf5 commit c8cc568961dfccf3d91821f06f7072437b04edf5 Author: Kirk McKusick AuthorDate: 2022-02-20 05:30:37 +0000 Commit: Kirk McKusick CommitDate: 2022-02-20 05:33:02 +0000 Provide an interface that allows GEOM modules to return multiple messages. The gctl_error() function provides GEOM modules with the ability to report only a single message. When running with the verbose flag, commands that handle multiple devices may want to report a message for each of the devices on which it operates. This commit adds the gctl_msg() function that can be called multiple times to post messages. When finished issuing messages, the application must either call gctl_post_messages() or call gctl_error() to cause the messages to be reported to the calling process. Tested by: Peter Holm --- sys/geom/geom.h | 2 ++ sys/geom/geom_ctl.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom.h b/sys/geom/geom.h index d48deb0e0ae4..fbd9336b2e50 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -435,6 +435,8 @@ char const *gctl_get_asciiparam(struct gctl_req *req, const char *param); void *gctl_get_paraml(struct gctl_req *req, const char *param, int len); void *gctl_get_paraml_opt(struct gctl_req *req, const char *param, int len); int gctl_error(struct gctl_req *req, const char *fmt, ...) __printflike(2, 3); +void gctl_msg(struct gctl_req *req, const char *fmt, ...) __printflike(2, 3); +void gctl_post_messages(struct gctl_req *req); struct g_class *gctl_get_class(struct gctl_req *req, char const *arg); struct g_geom *gctl_get_geom(struct gctl_req *req, struct g_class *mp, char const *arg); struct g_provider *gctl_get_provider(struct gctl_req *req, char const *arg); diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index b0e2673bdc42..c387b9e5102c 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -91,18 +91,71 @@ gctl_error(struct gctl_req *req, const char *fmt, ...) if (sbuf_done(req->serror)) { if (!req->nerror) req->nerror = EEXIST; +#ifdef DIAGNOSTIC + printf("gctl_error: buffer closed, message discarded.\n"); +#endif return (req->nerror); } if (!req->nerror) req->nerror = EINVAL; + /* If this is the last of several messages, indent it on a new line */ + if (sbuf_len(req->serror) > 0) + sbuf_cat(req->serror, "\n\t"); va_start(ap, fmt); sbuf_vprintf(req->serror, fmt, ap); va_end(ap); + gctl_post_messages(req); + return (req->nerror); +} + +/* + * The gctl_error() function will only report a single message. + * Commands that handle multiple devices may want to report a + * message for each of the devices. The gctl_msg() function + * can be called multiple times to post messages. When done + * the application must either call gctl_post_messages() or + * call gctl_error() to cause the messages to be reported to + * the calling process. + */ +void +gctl_msg(struct gctl_req *req, const char *fmt, ...) +{ + va_list ap; + + if (req == NULL) + return; + if (sbuf_done(req->serror)) { +#ifdef DIAGNOSTIC + printf("gctl_msg: buffer closed, message discarded.\n"); +#endif + return; + } + /* Put second and later messages indented on a new line */ + if (sbuf_len(req->serror) > 0) + sbuf_cat(req->serror, "\n\t"); + va_start(ap, fmt); + sbuf_vprintf(req->serror, fmt, ap); + va_end(ap); +} + +/* + * Post the messages to the user. + */ +void +gctl_post_messages(struct gctl_req *req) +{ + + if (sbuf_done(req->serror)) { +#ifdef DIAGNOSTIC + printf("gctl_post_messages: message buffer already closed.\n"); +#endif + return; + } sbuf_finish(req->serror); if (g_debugflags & G_F_CTLDUMP) - printf("gctl %p error \"%s\"\n", req, sbuf_data(req->serror)); - return (req->nerror); + printf("gctl %p message(s) \"%s\"\n", req, + sbuf_data(req->serror)); } /*